From f3dd4cdd0a540eb36880b48c8c690dae3c4facaa Mon Sep 17 00:00:00 2001 From: David Horwitz Date: Mon, 16 Oct 2017 19:38:36 +0200 Subject: [PATCH 01/19] AssignmentService API raw type (#4872) List, Collect raw type public .. Generate Element Comment --- .../assignment/api/AssignmentService.java | 124 ++++++++++++++---- .../impl/AssignmentServiceImpl.java | 10 +- 2 files changed, 107 insertions(+), 27 deletions(-) diff --git a/assignment/api/src/java/org/sakaiproject/assignment/api/AssignmentService.java b/assignment/api/src/java/org/sakaiproject/assignment/api/AssignmentService.java index e57c26974130..8fa835c4d328 100644 --- a/assignment/api/src/java/org/sakaiproject/assignment/api/AssignmentService.java +++ b/assignment/api/src/java/org/sakaiproject/assignment/api/AssignmentService.java @@ -71,7 +71,11 @@ public interface AssignmentService extends EntityProducer { */ public List allowReceiveSubmissionNotificationUsers(String context); - Collection getGroupsAllowRemoveAssignment(String context); + /** + * @param context + * @return + */ + public Collection getGroupsAllowRemoveAssignment(String context); /** * Check permissions for adding an Assignment. @@ -116,7 +120,7 @@ public interface AssignmentService extends EntityProducer { * Describes the portlet context - generated with DefaultId.getChannel(). * @return The Collection (Group) of groups defined for the context of this site that the end user has add assignment permissions in, empty if none. */ - Collection getGroupsAllowAddAssignment(String context); + public Collection getGroupsAllowAddAssignment(String context); /** * Get the collection of Groups defined for the context of this site that the end user has grade assignment permissions in. @@ -125,7 +129,7 @@ public interface AssignmentService extends EntityProducer { * Describes the portlet context - generated with DefaultId.getChannel(). * @return The Collection (Group) of groups defined for the context of this site that the end user has grade assignment permissions in, empty if none. */ - Collection getGroupsAllowGradeAssignment(String context, String assignmentReference); + public Collection getGroupsAllowGradeAssignment(String context, String assignmentReference); /** * Check permissions for updating an Assignment. @@ -184,7 +188,7 @@ public interface AssignmentService extends EntityProducer { * @param context the context string * @return the list of user (ids) */ - public List allowAddAnySubmissionUsers(String context); + public List allowAddAnySubmissionUsers(String context); /** * Get the List of Users who can add assignment @@ -193,7 +197,7 @@ public interface AssignmentService extends EntityProducer { * Describes the portlet context - generated with DefaultId.getChannel(). * @return the List (User) of users who can add assignment */ - public List allowAddAssignmentUsers(String context); + public List allowAddAssignmentUsers(String context); /** * Check permissions for reading a Submission. @@ -317,11 +321,25 @@ public interface AssignmentService extends EntityProducer { */ public void removeSubmission(AssignmentSubmission submission) throws PermissionException; - void updateAssignment(Assignment assignment) throws PermissionException; + /** + * @param assignment + * @throws PermissionException + */ + public void updateAssignment(Assignment assignment) throws PermissionException; - void updateSubmission(AssignmentSubmission submission) throws PermissionException; + /** + * @param submission + * @throws PermissionException + */ + public void updateSubmission(AssignmentSubmission submission) throws PermissionException; - Assignment getAssignment(Reference reference) throws IdUnusedException, PermissionException; + /** + * @param reference + * @return + * @throws IdUnusedException + * @throws PermissionException + */ + public Assignment getAssignment(Reference reference) throws IdUnusedException, PermissionException; /** * Access the Assignment with the specified id. @@ -404,7 +422,8 @@ public interface AssignmentService extends EntityProducer { * The User who's Submission you would like. * @return AssignmentSubmission The user's submission for that Assignment, or null if one does not exist. */ - public AssignmentSubmission getSubmission(List submissions, User person); + @Deprecated + public AssignmentSubmission getSubmission(List submissions, User person); /** * Get the submissions for an assignment. @@ -415,14 +434,22 @@ public interface AssignmentService extends EntityProducer { */ public Set getSubmissions(Assignment assignment); - String getAssignmentStatus(String assignmentId); + /** + * @param assignmentId + * @return + */ + public String getAssignmentStatus(String assignmentId); - String getSubmissionStatus(String submissionId); + /** + * @param submissionId + * @return + */ + public String getSubmissionStatus(String submissionId); /** * Return a sorted list of users representing a group. */ - public List getSortedGroupUsers(Group g); + public List getSortedGroupUsers(Group g); /** * Get the number of submissions which has been submitted. @@ -507,15 +534,30 @@ public interface AssignmentService extends EntityProducer { /** * Whether a specific user can submit + * @param context + * @param a + * @param userId + * @return */ public boolean canSubmit(String context, Assignment a, String userId); /** * Whether the current user can submit + * @param context + * @param a + * @return */ public boolean canSubmit(String context, Assignment a); + /** + * @param searchFilterOnly + * @param allOrOneGroup + * @param searchString + * @param aRef + * @param contextString + * @return + */ public Collection getSubmitterGroupList(String searchFilterOnly, String allOrOneGroup, String searchString, String aRef, String contextString); /** @@ -547,9 +589,13 @@ public interface AssignmentService extends EntityProducer { */ public Map getSubmitterMap(String searchFilterOnly, String allOrOneGroup, String search, String aRef, String contextString); + /** + * @param accentedString + * @return + */ public String escapeInvalidCharsEntry(String accentedString); - /* + /** * If the assignment uses anonymous grading returns true, else false * * Params: AssignmentSubmission s @@ -563,7 +609,7 @@ public interface AssignmentService extends EntityProducer { */ public Integer getScaleFactor(); - /* + /** * This method allows you to know if there are submissions submitted * * Params: AssignmentSubmission s @@ -602,17 +648,45 @@ public String getDeepLinkWithPermissions(String context, String assignmentId, bo */ public String getCsvSeparator(); - String getXmlAssignment(Assignment assignment); + /** + * @param assignment + * @return + */ + public String getXmlAssignment(Assignment assignment); - String getGradeForUserInGradeBook(String assignmentId, String userId); + /** + * @param assignmentId + * @param userId + * @return + */ + public String getGradeForUserInGradeBook(String assignmentId, String userId); - String getGradeDisplay(String grade, Assignment.GradeType typeOfGrade, Integer scaleFactor); + /** + * @param grade + * @param typeOfGrade + * @param scaleFactor + * @return + */ + public String getGradeDisplay(String grade, Assignment.GradeType typeOfGrade, Integer scaleFactor); - String getMaxPointGradeDisplay(int factor, int maxGradePoint); + /** + * @param factor + * @param maxGradePoint + * @return + */ + public String getMaxPointGradeDisplay(int factor, int maxGradePoint); - Optional getSubmissionSubmittee(AssignmentSubmission submission); + /** + * @param submission + * @return + */ + public Optional getSubmissionSubmittee(AssignmentSubmission submission); - Collection getSubmissionSubmittersAsUsers(AssignmentSubmission submission); + /** + * @param submission + * @return + */ + public Collection getSubmissionSubmittersAsUsers(AssignmentSubmission submission); /** * peer assessment is set for this assignment and the current time @@ -637,9 +711,15 @@ public String getDeepLinkWithPermissions(String context, String assignmentId, bo */ public boolean isPeerAssessmentClosed(Assignment assignment); - void resetAssignment(Assignment assignment); + /** + * @param assignment + */ + public void resetAssignment(Assignment assignment); - void postReviewableSubmissonAttachments(String submissionId); + /** + * @param submissionId + */ + public void postReviewableSubmissonAttachments(String submissionId); /** * This will return the internationalized title of the tool. diff --git a/assignment/impl/src/java/org/sakaiproject/assignment/impl/AssignmentServiceImpl.java b/assignment/impl/src/java/org/sakaiproject/assignment/impl/AssignmentServiceImpl.java index 8d7e3d5a5464..65a6c6e11c18 100644 --- a/assignment/impl/src/java/org/sakaiproject/assignment/impl/AssignmentServiceImpl.java +++ b/assignment/impl/src/java/org/sakaiproject/assignment/impl/AssignmentServiceImpl.java @@ -452,7 +452,7 @@ public boolean allowGetAssignment(String context) { } @Override - public Collection getGroupsAllowAddAssignment(String context) { + public Collection getGroupsAllowAddAssignment(String context) { return getGroupsAllowFunction(SECURE_ACCESS_ASSIGNMENT, context, null); } @@ -472,7 +472,7 @@ public boolean allowRemoveAssignment(String assignmentReference) { } @Override - public Collection getGroupsAllowRemoveAssignment(String context) { + public Collection getGroupsAllowRemoveAssignment(String context) { return getGroupsAllowFunction(SECURE_REMOVE_ASSIGNMENT, context, null); } @@ -546,7 +546,7 @@ public List allowGradeAssignmentUsers(String assignmentReference) { } @Override - public List allowAddAnySubmissionUsers(String context) { + public List allowAddAnySubmissionUsers(String context) { List rv = new ArrayList<>(); try { @@ -568,7 +568,7 @@ public List allowAddAnySubmissionUsers(String context) { } @Override - public List allowAddAssignmentUsers(String context) { + public List allowAddAssignmentUsers(String context) { String resourceString = AssignmentReferenceReckoner.reckoner().context(context).reckon().getReference(); return securityService.unlockUsers(SECURE_ADD_ASSIGNMENT, resourceString); } @@ -1220,7 +1220,7 @@ private Map getUserSubmissionMap(Assignment assignme // } @Override - public AssignmentSubmission getSubmission(List submissions, User person) { + public AssignmentSubmission getSubmission(List submissions, User person) { throw new UnsupportedOperationException("Method is deprecated, remove"); } From 1d747e436afa867712a57eb0f3ef763e696145a5 Mon Sep 17 00:00:00 2001 From: "Code Hugger (Matthew Jones)" Date: Mon, 16 Oct 2017 17:13:32 -0400 Subject: [PATCH 02/19] KNL-1541 - Missing fields initializer for change (#4886) --- .../java/org/sakaiproject/site/impl/DbSiteService.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/kernel/kernel-impl/src/main/java/org/sakaiproject/site/impl/DbSiteService.java b/kernel/kernel-impl/src/main/java/org/sakaiproject/site/impl/DbSiteService.java index d814917f3e75..ced84bce11b5 100755 --- a/kernel/kernel-impl/src/main/java/org/sakaiproject/site/impl/DbSiteService.java +++ b/kernel/kernel-impl/src/main/java/org/sakaiproject/site/impl/DbSiteService.java @@ -1984,24 +1984,21 @@ else if (permission == 1) fields[2] = Integer.valueOf(-1); batchList.add(fields); } - m_sql.dbWriteBatch(statement, batchList); - - batchList = new ArrayList<>(); for (String siteId : unpInserts) { fields = new Object[3]; fields[0] = caseId(siteId); fields[1] = userId; fields[2] = Integer.valueOf(0); + batchList.add(fields); } - m_sql.dbWriteBatch(statement, batchList); - - batchList = new ArrayList<>(); for (String siteId : visitInserts) { + fields = new Object[3]; fields[0] = caseId(siteId); fields[1] = userId; fields[2] = Integer.valueOf(1); + batchList.add(fields); } m_sql.dbWriteBatch(statement, batchList); } From b78398562f54144f3c8f5a44fa17073cb7e7ab3b Mon Sep 17 00:00:00 2001 From: Payten Giles Date: Tue, 17 Oct 2017 08:13:50 +1100 Subject: [PATCH 03/19] SAK-33385 add ability to filter custom export by section/group (#4883) --- .../tool/panels/importExport/ExportPanel.html | 14 +++++++ .../tool/panels/importExport/ExportPanel.java | 42 ++++++++++++++++++- .../webapp/styles/gradebook-importexport.css | 4 ++ 3 files changed, 59 insertions(+), 1 deletion(-) diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/ExportPanel.html b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/ExportPanel.html index eeef94a7e328..32258e31a8bf 100644 --- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/ExportPanel.html +++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/ExportPanel.html @@ -108,6 +108,20 @@ + + #end - #end - ## $tlang.getString("gen.title") - #end -
- - - - ## submission information - #set($timeSubmitted=false) - #set($timeSubmitted=$submission.TimeSubmitted) - #set($submitted=false) - #set($submitted=$submission.getSubmitted()) -
- #if (!$!canSubmit) - - - - #else - #if ($submitted && $!timeSubmitted) - #set($name=$tlang.getString("resubmit")) - #else - #set($name=$tlang.getString("gen.subm3")) - #end - - - - #end -
- -
+

+ #if ($!assignment.HonorPledge) + #if ($honor_pledge_yes.equals("true")) +

+ +

+ #else +
+ $tlang.getString("gen.honple2val") +
+

+ +

+ + #end + #end +
+ + + + ## submission information +
+ #if (!$!canSubmit) + + + + #else + #if ($!submission.Submitted && $!submission.DateSubmitted) + #set($name=$tlang.getString("resubmit")) + #else + #set($name=$tlang.getString("gen.subm3")) + #end + + + + #end +
+ +
From 7f6582042e8bb489d156f42748913c272ce88fb7 Mon Sep 17 00:00:00 2001 From: Earle Nietzel Date: Fri, 20 Oct 2017 10:39:11 -0400 Subject: [PATCH 10/19] Assignments student submission view missing assignment attachments part 2 (#4897) --- .../org/sakaiproject/assignment/tool/AssignmentAction.java | 1 - .../vm/assignment/chef_assignments_student_view_submission.vm | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/assignment/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java b/assignment/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java index c608d5e2ae52..6d7be26f2125 100644 --- a/assignment/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java +++ b/assignment/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java @@ -1470,7 +1470,6 @@ private String build_student_view_submission_context(VelocityPortlet portlet, Co assignment_resubmission_option_into_context(context, state); if (assignment.getIsGroup()) { - context.put("assignmentService", assignmentService); // get current site Collection groups = null; Site st = null; diff --git a/assignment/tool/src/webapp/vm/assignment/chef_assignments_student_view_submission.vm b/assignment/tool/src/webapp/vm/assignment/chef_assignments_student_view_submission.vm index bf033c1c7e0b..0589c795b9bc 100644 --- a/assignment/tool/src/webapp/vm/assignment/chef_assignments_student_view_submission.vm +++ b/assignment/tool/src/webapp/vm/assignment/chef_assignments_student_view_submission.vm @@ -370,7 +370,7 @@ $(document).ready(function(){ ## Assignment Attachments #set ($aAttachments = $assignment.Attachments) #if ($aAttachments) - #set ($size = $attachments.size()) + #set ($size = $aAttachments.size()) #if ($size < 1) $tlang.getString("gen.noatt") #else @@ -628,7 +628,7 @@ $(document).ready(function(){ ##mozilla does not resize table children dynamically , so set here - #set($gusers = $assignmentService.getSortedGroupUsers($group)) + #set($gusers = $!service.getSortedGroupUsers($group)) #foreach ($user in $gusers) $user.getDisplayName() ##$!userDirectoryService.getUser($user).getDisplayName() From bb827e87f10df5b219022d9f03a9923c5427f88b Mon Sep 17 00:00:00 2001 From: "Code Hugger (Matthew Jones)" Date: Fri, 20 Oct 2017 12:05:10 -0400 Subject: [PATCH 11/19] SAK-33486 (#4898) --- .../org/sakaiproject/connector/fck/FCKConnectorServlet.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/textarea/FCKeditor/connector/src/java/org/sakaiproject/connector/fck/FCKConnectorServlet.java b/textarea/FCKeditor/connector/src/java/org/sakaiproject/connector/fck/FCKConnectorServlet.java index 8a7b745d9140..1c9664d0f2ee 100644 --- a/textarea/FCKeditor/connector/src/java/org/sakaiproject/connector/fck/FCKConnectorServlet.java +++ b/textarea/FCKeditor/connector/src/java/org/sakaiproject/connector/fck/FCKConnectorServlet.java @@ -1166,11 +1166,11 @@ private SecurityAdvisor createSubmissionSecurityAdvisor() { function.equals(contentHostingService.AUTH_RESOURCE_WRITE_OWN) || function.equals(contentHostingService.AUTH_RESOURCE_HIDDEN) ) { - return SecurityAdvisor.SecurityAdvice.ALLOWED; + return securityService.unlock(userId, contentHostingService.AUTH_RESOURCE_READ, reference) ? SecurityAdvisor.SecurityAdvice.ALLOWED : SecurityAdvisor.SecurityAdvice.NOT_ALLOWED; } else if (function.equals(contentHostingService.AUTH_RESOURCE_WRITE_ANY)) { M_log.info(userId + " requested ability to write to any content on "+ reference+ " which we didn't expect, this should be investigated"); - return SecurityAdvisor.SecurityAdvice.ALLOWED; + return securityService.unlock(userId, contentHostingService.AUTH_RESOURCE_READ, reference) ? SecurityAdvisor.SecurityAdvice.ALLOWED : SecurityAdvisor.SecurityAdvice.NOT_ALLOWED; } return SecurityAdvisor.SecurityAdvice.PASS; }; From b5a08ec428e77ecb8bff6dbd0bd23f4655688ede Mon Sep 17 00:00:00 2001 From: "Code Hugger (Matthew Jones)" Date: Fri, 20 Oct 2017 16:38:41 -0400 Subject: [PATCH 12/19] SAK-31960 (#4899) --- .../sakaiproject/webservices/SakaiLogin.java | 93 ++++++++++++++++++- 1 file changed, 88 insertions(+), 5 deletions(-) diff --git a/webservices/cxf/src/java/org/sakaiproject/webservices/SakaiLogin.java b/webservices/cxf/src/java/org/sakaiproject/webservices/SakaiLogin.java index 5f8d88b2a445..a2b4521364ba 100644 --- a/webservices/cxf/src/java/org/sakaiproject/webservices/SakaiLogin.java +++ b/webservices/cxf/src/java/org/sakaiproject/webservices/SakaiLogin.java @@ -21,12 +21,14 @@ import javax.jws.soap.SOAPBinding; import javax.servlet.http.HttpServletRequest; import javax.ws.rs.GET; +import javax.ws.rs.POST; import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.QueryParam; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.http.HttpMethod; import org.apache.cxf.message.Message; import org.apache.cxf.phase.PhaseInterceptorChain; import org.apache.cxf.transport.http.AbstractHTTPDestination; @@ -35,7 +37,6 @@ import org.sakaiproject.user.api.Authentication; import org.sakaiproject.user.api.AuthenticationException; import org.sakaiproject.user.api.Evidence; -import org.sakaiproject.user.api.AuthenticationManager; import org.sakaiproject.util.IdPwEvidence; @WebService @@ -44,6 +45,9 @@ public class SakaiLogin extends AbstractWebService { private static final Logger LOG = LoggerFactory.getLogger(SakaiLogin.class); + //I don't see a simpler way of doing this + //https://stackoverflow.com/a/13408147/3708872 + /** * Login with the supplied credentials and return the session string which can be used in subsequent web service calls, ie via SakaiScript * @@ -55,13 +59,44 @@ public class SakaiLogin extends AbstractWebService { @Path("/login") @Produces("text/plain") @GET - public java.lang.String login( + public java.lang.String loginGET( @WebParam(partName = "id", name = "id") @QueryParam("id") java.lang.String id, @WebParam(partName = "pw", name = "pw") @QueryParam("pw") java.lang.String pw) { + return login(id,pw); + } + + /** + * Login with the supplied credentials and return the session string which can be used in subsequent web service calls, ie via SakaiScript + * + * @param id eid, eg jsmith26 + * @param pw password for the user + * @return session string + */ + @WebMethod + @Path("/login") + @Produces("text/plain") + @POST + public java.lang.String loginPOST( + @WebParam(partName = "id", name = "id") + @QueryParam("id") + java.lang.String id, + @WebParam(partName = "pw", name = "pw") + @QueryParam("pw") + java.lang.String pw) { + return login (id,pw); + } + + /** + * Actual login method + * @param id + * @param pw + * @return + */ + private java.lang.String login(java.lang.String id, java.lang.String pw) { Message message = PhaseInterceptorChain.getCurrentMessage(); HttpServletRequest request = (HttpServletRequest) message.get(AbstractHTTPDestination.HTTP_REQUEST); String ipAddress = request.getRemoteAddr(); @@ -72,7 +107,11 @@ public java.lang.String login( throw new RuntimeException("Web Services Login Disabled"); } - try { + try { + if ("GET".equals(request.getMethod())) { + LOG.info("This endpoint {} should use POST instead of GET, GET will be deprecated in a future release", request.getRequestURI()); + } + Evidence e = new IdPwEvidence(id, pw, ipAddress); Authentication a = authenticationManager.authenticate(e); @@ -112,10 +151,39 @@ public java.lang.String login( @Produces("text/plain") @GET @Path("/logout") - public boolean logout( + public boolean logoutGET( + @QueryParam("sessionid") + @WebParam(partName = "sessionid", name = "sessionid") + java.lang.String sessionid) { + return logout(sessionid); + } + + /** + * Logout of the given session + * + * @param sessionid sessionid to logout + * @return + * @throws InterruptedException + */ + @WebMethod + @Produces("text/plain") + @POST + @Path("/logout") + public boolean logoutPOST( @QueryParam("sessionid") @WebParam(partName = "sessionid", name = "sessionid") java.lang.String sessionid) { + return logout (sessionid); + } + + /** + * Actual logout method + * + * @param sessionid sessionid to logout + * @return + * @throws InterruptedException + */ + private boolean logout(java.lang.String sessionid) { Session s = sessionManager.getSession(sessionid); if (s == null) { @@ -132,7 +200,22 @@ public boolean logout( @Produces("text/plain") @GET @Path("/loginToServer") - public java.lang.String loginToServer( + public java.lang.String loginToServerGET( + @WebParam(partName = "id", name = "id") + @QueryParam("id") + java.lang.String id, + @WebParam(partName = "pw", name = "pw") + @QueryParam("pw") + java.lang.String pw) { + return login(id, pw) + "," + serverConfigurationService.getString("webservices.directurl", serverConfigurationService.getString("serverUrl")); + } + + + @WebMethod + @Produces("text/plain") + @POST + @Path("/loginToServer") + public java.lang.String loginToServerPOST( @WebParam(partName = "id", name = "id") @QueryParam("id") java.lang.String id, From 8d7247888577bfca9ee31f1984f03acb075884a6 Mon Sep 17 00:00:00 2001 From: Matthew Buckett Date: Mon, 23 Oct 2017 13:36:07 +0100 Subject: [PATCH 13/19] SAK-33499 (#4907) --- common/import-parsers/blackboard_6/impl/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/import-parsers/blackboard_6/impl/pom.xml b/common/import-parsers/blackboard_6/impl/pom.xml index 6a8fd837faea..e45ed842e63c 100644 --- a/common/import-parsers/blackboard_6/impl/pom.xml +++ b/common/import-parsers/blackboard_6/impl/pom.xml @@ -35,7 +35,7 @@ org.jsoup jsoup - 1.8.1 + 1.10.3 commons-lang From 4daa233bbb24bff1939f1dd3a666c7fecef4c509 Mon Sep 17 00:00:00 2001 From: Matthew Buckett Date: Mon, 23 Oct 2017 13:36:34 +0100 Subject: [PATCH 14/19] KNL-1556 (#4906) --- kernel/kernel-impl/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/kernel-impl/pom.xml b/kernel/kernel-impl/pom.xml index 544c95668b0c..c299efc75177 100644 --- a/kernel/kernel-impl/pom.xml +++ b/kernel/kernel-impl/pom.xml @@ -299,7 +299,7 @@ org.jsoup jsoup - 1.7.3 + 1.10.3 jar compile From 1dbcdedf43928bfa74ac450936a0dc74ad506442 Mon Sep 17 00:00:00 2001 From: Matthew Buckett Date: Mon, 23 Oct 2017 13:36:49 +0100 Subject: [PATCH 15/19] KNL-1555 (#4905) --- kernel/kernel-impl/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/kernel-impl/pom.xml b/kernel/kernel-impl/pom.xml index c299efc75177..32589b19bbfa 100644 --- a/kernel/kernel-impl/pom.xml +++ b/kernel/kernel-impl/pom.xml @@ -263,7 +263,7 @@ org.jasypt jasypt - 1.9.0 + 1.9.2 com.ibm.icu From 55760da81e4d78e2de04f50e6c2841e2029c1dbb Mon Sep 17 00:00:00 2001 From: Matthew Buckett Date: Mon, 23 Oct 2017 19:34:01 +0100 Subject: [PATCH 16/19] SAK-33497 Remove conflicting commons-fileupload (#4903) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The version of commons-fileupload was explicitly set in the access-impl/impl/pom.xml file although would result in it getting used at compile time would result in the newer version getting used at runtime due to the fact that it’s a provided dependency so it uses the shared version from the shared class loader in tomcat. The used version is defined in master/pom.xml and is currently set at 1.3.3 --- access/access-impl/impl/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/access/access-impl/impl/pom.xml b/access/access-impl/impl/pom.xml index f11887697b94..7a8c8217db48 100644 --- a/access/access-impl/impl/pom.xml +++ b/access/access-impl/impl/pom.xml @@ -43,7 +43,6 @@ commons-fileupload commons-fileupload - 1.1.1 org.sakaiproject.velocity From c04e86c4cafa56f7748e43fc24b903e37f35b2cc Mon Sep 17 00:00:00 2001 From: "Code Hugger (Matthew Jones)" Date: Mon, 23 Oct 2017 14:34:16 -0400 Subject: [PATCH 17/19] SAK-33500 - Upgrade tika library to 1.16 (#4908) --- master/pom.xml | 2 +- search/search-impl/impl/pom.xml | 2 +- .../adapter/contenthosting/PDFContentDigester.java | 8 ++------ 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/master/pom.xml b/master/pom.xml index 8302a678ac18..23d3b61c38b8 100644 --- a/master/pom.xml +++ b/master/pom.xml @@ -116,7 +116,7 @@ 1.2.0.RELEASE spring-test 4.3.6.RELEASE - 1.14 + 1.16 8.5.20 1.6.4 2.11.0 diff --git a/search/search-impl/impl/pom.xml b/search/search-impl/impl/pom.xml index be8cce11af22..afcfb4d09c32 100644 --- a/search/search-impl/impl/pom.xml +++ b/search/search-impl/impl/pom.xml @@ -156,7 +156,7 @@ org.apache.pdfbox pdfbox - 1.8.6 + 2.0.6 diff --git a/search/search-impl/impl/src/java/org/sakaiproject/search/component/adapter/contenthosting/PDFContentDigester.java b/search/search-impl/impl/src/java/org/sakaiproject/search/component/adapter/contenthosting/PDFContentDigester.java index 04248f95f781..9cb558b3ff0f 100644 --- a/search/search-impl/impl/src/java/org/sakaiproject/search/component/adapter/contenthosting/PDFContentDigester.java +++ b/search/search-impl/impl/src/java/org/sakaiproject/search/component/adapter/contenthosting/PDFContentDigester.java @@ -29,9 +29,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.pdfbox.pdfparser.PDFParser; import org.apache.pdfbox.pdmodel.PDDocument; -import org.apache.pdfbox.util.PDFTextStripper; +import org.apache.pdfbox.text.PDFTextStripper; import org.sakaiproject.content.api.ContentResource; import org.sakaiproject.exception.ServerOverloadException; import org.sakaiproject.search.api.SearchUtils; @@ -50,13 +49,10 @@ public String getContent(ContentResource contentResource) } InputStream contentStream = null; - PDFParser parser = null; PDDocument pddoc = null; try { contentStream = contentResource.streamContent(); - parser = new PDFParser(new BufferedInputStream(contentStream)); - parser.parse(); - pddoc = parser.getPDDocument(); + pddoc = PDDocument.load(contentStream); if (pddoc != null) { PDFTextStripper stripper = new PDFTextStripper(); stripper.setLineSeparator("\n"); From a4f7e9728ada8bc5aafd6514dcd145c3cb382a02 Mon Sep 17 00:00:00 2001 From: Matthew Buckett Date: Mon, 23 Oct 2017 19:35:17 +0100 Subject: [PATCH 18/19] SAK-33498 Removed unused commons-email dependency (#4904) This dependency is no longer used and just increases the size of the build. This probably remains from when mailsender used to send out email directly instead of using the kernel's email service. The activation dependency can also be removed as it isn't directly used by the code and is correctly pulled in as a trasative dependency. --- mailsender/impl/pom.xml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/mailsender/impl/pom.xml b/mailsender/impl/pom.xml index 77004f1de5ad..bdb532436276 100644 --- a/mailsender/impl/pom.xml +++ b/mailsender/impl/pom.xml @@ -50,19 +50,10 @@ - - javax.activation - activation - com.sun.mail javax.mail - - org.apache.commons - commons-email - 1.2 - From 55f774f78488916f36583937543c6fbf23d91e0b Mon Sep 17 00:00:00 2001 From: Matthew Buckett Date: Mon, 23 Oct 2017 19:38:38 +0100 Subject: [PATCH 19/19] SAK-33502 (#4909) --- mycalendar/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mycalendar/pom.xml b/mycalendar/pom.xml index ead1bc2fd5ba..8fdcd6aac39d 100644 --- a/mycalendar/pom.xml +++ b/mycalendar/pom.xml @@ -16,18 +16,18 @@ org.apache.wicket wicket - 6.18.0 + 6.26.0 pom org.apache.wicket wicket-spring - 6.18.0 + 6.26.0 org.apache.wicket wicket-extensions - 6.18.0 + 6.26.0 org.slf4j