Fisheye: Diff - lams-github/lams_tool

Tree
Options

ad8707a

Monthly merge from master to lams31
Multiple conflicts regarding audit service and JSON.
Conflicts:
lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserSearchAction.java
lams_build/conf/domain.xml
lams_build/conf/slim/standalone.xml
lams_build/conf/standalone.xml
lams_build/lib/lams/lams-central.jar
lams_build/lib/lams/lams.jar
lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java
lams_common/src/java/org/lamsfoundation/lams/integration/security/SsoHandler.java
lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.java
lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java
lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveWebsocketServer.java
lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java
lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaLearningAction.java
lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaMonitoringAction.java
lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java
lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/ILeaderselectionService.java
lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java
lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/MonitoringAction.java
lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java
lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/MonitoringAction.java
lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java
lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/MonitoringAction.java
lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java
lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java
lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/MonitoringAction.java

24 Mar 18 Marcin Cieslak ad8707a3e0b0501d651993f3da9dd0ba975f39fc

4845924

LDEV-4400 Update dependecies to embedded libraries
WildFly 10 is shipped with newer versions of libraries that LAMS uses.
LAMS now points to proper JAR files. Following libraries were updated:
beanutils 1.8.3 -> 1.9.2
codec 1.9 -> 1.10
collection 3.2.1 -> 3.2.2
xerces 2.11.0.SP3 -> 2.11.0.SP4
httpclient 4.2.1 -> 4.5
httpcore 4.2.1 -> 4.4.1
wildfly-controller-client 8.2.1 -> 2.2.0 (probably naming convention was
changed)
jboss-dmr 1.2.0 -> 1.3.0
Hibernate 4.3.7 -> 5.0.10
log4j-jboss-logmanager 1.1.0 -> 1.1.2
jcl-over-slf4j 1.7.2 -> 1.7.7
undertow-core 1.1.8 -> 1.4.0
undertow-servlet 1.1.8 -> 1.4.0
javax.mail 1.5.0 -> 1.5.5
jboss-jstl 1.1.2 -> 1.1.3
jboss-logging 3.1.4 -> 3.3.0
remoting-jmx 2.0.0 -> 2.0.1
slf4j-api 1.7.2 -> 1.7.7
picketbox 4.0.21 -> 4.9.6
jboss-websocket-api 1.1.0 -> 1.1.1
joda-time 1.6.2 -> 2.7

05 Aug 17 Marcin Cieslak 4845924e4c50c859a4e230872c3f1629f9224380

Loading ...