Index: ssts-web/src/main/webapp/knowledge/viewExt.jsp
===================================================================
diff -u -r29542 -r30583
--- ssts-web/src/main/webapp/knowledge/viewExt.jsp (.../viewExt.jsp) (revision 29542)
+++ ssts-web/src/main/webapp/knowledge/viewExt.jsp (.../viewExt.jsp) (revision 30583)
@@ -12,9 +12,9 @@
Index: ssts-web/src/main/resources/struts.xml
===================================================================
diff -u -r12341 -r30583
--- ssts-web/src/main/resources/struts.xml (.../struts.xml) (revision 12341)
+++ ssts-web/src/main/resources/struts.xml (.../struts.xml) (revision 30583)
@@ -1,9 +1,12 @@
+ "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
+ "http://struts.apache.org/dtds/struts-2.5.dtd">
+
+
+
-
+ regex:.*
-
+
Index: ssts-web/src/main/webapp/WEB-INF/web-xml-standard/web.xml
===================================================================
diff -u -r29871 -r30583
--- ssts-web/src/main/webapp/WEB-INF/web-xml-standard/web.xml (.../web.xml) (revision 29871)
+++ ssts-web/src/main/webapp/WEB-INF/web-xml-standard/web.xml (.../web.xml) (revision 30583)
@@ -70,7 +70,7 @@
struts2
- org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter
+ org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter
Index: build.gradle
===================================================================
diff -u -r30452 -r30583
--- build.gradle (.../build.gradle) (revision 30452)
+++ build.gradle (.../build.gradle) (revision 30583)
@@ -214,7 +214,7 @@
ext.springVersion = '4.2.4.RELEASE'
ext.springSecurityVersion = '3.2.9.RELEASE'
ext.hibernateVersion = '4.3.11.Final'
- ext.struts2Version = '2.3.24.1'
+ ext.struts2Version = '2.5.26'
ext.cxfVersion = '3.1.5'
ext.encoding = 'UTF-8'
ext.webInfDir = "../ssts-web/src/main/webapp/WEB-INF"
@@ -325,16 +325,17 @@
compile group: 'org.apache.struts', name: 'struts2-spring-plugin', version:struts2Version
compile group: 'org.apache.struts', name: 'struts2-convention-plugin', version:struts2Version
compile group: 'org.apache.struts', name: 'struts2-jasperreports-plugin', version:struts2Version
- compile group: 'org.apache.struts', name: 'struts2-java8-support-plugin', version:struts2Version
+ compile group: 'org.apache.struts', name: 'struts2-java8-support-plugin', version:'2.5.2'
+ compile "ognl:ognl:3.1.28"
compile 'org.freemarker:freemarker:2.3.23'
- compile 'org.ow2.asm:asm:5.0.4'
- compile 'org.ow2.asm:asm-tree:5.0.4'
+ compile 'org.ow2.asm:asm:7.3.1'
+ compile 'org.ow2.asm:asm-tree:7.3.1'
compile 'org.ow2.asm:asm-util:5.0.4'
compile 'org.ow2.asm:asm-all:5.0.4'
- compile group: 'org.apache.struts.xwork', name: 'xwork-core', version:'2.3.24.1'
+ //compile group: 'org.apache.struts.xwork', name: 'xwork-core', version:'2.3.24.1'
compile group: 'org.aspectj', name: 'aspectjrt', version:'1.8.8'
compile group: 'org.aspectj', name: 'aspectjtools', version:'1.8.8'
@@ -407,17 +408,17 @@
compile group: 'commons-lang', name: 'commons-lang', version:'2.5'
- compile group: 'org.apache.commons', name: 'commons-lang3', version:'3.1'
+ compile group: 'org.apache.commons', name: 'commons-lang3', version:'3.8.1'
compile group: 'org.apache.commons', name: 'commons-collections4', version:'4.0'
compile 'org.apache.commons:commons-compress:1.10'
compile 'com.opencsv:opencsv:3.5'
- compile group: 'commons-collections', name: 'commons-collections', version:'2.1.1'
+ //compile group: 'commons-collections', name: 'commons-collections', version:'2.1.1'
compile group: 'commons-collections', name: 'commons-collections', version:'3.2.2'
- compile group: 'commons-io', name: 'commons-io', version:'2.4'
- compile group: 'commons-fileupload', name: 'commons-fileupload', version:'1.2.2'
+ compile group: 'commons-io', name: 'commons-io', version:'2.6'
+ compile group: 'commons-fileupload', name: 'commons-fileupload', version:'1.4'
compile group: 'commons-beanutils', name: 'commons-beanutils', version:'1.9.3'
compile group: 'commons-digester', name: 'commons-digester', version:'1.8'
compile group: 'commons-logging', name: 'commons-logging', version:'1.0.2'
@@ -449,7 +450,7 @@
compile 'org.apache.logging.log4j:log4j-core:2.5'
- compile 'org.apache.logging.log4j:log4j-api:2.5'
+ compile 'org.apache.logging.log4j:log4j-api:2.12.1'
//compile 'org.apache.logging.log4j:log4j-jcl:2.5'
//compile 'org.apache.logging.log4j:log4j-slf4j-impl:2.5'
@@ -566,6 +567,8 @@
compile group: 'org.hibernate', name: 'hibernate-validator', version: '5.2.4.Final'
compile group: 'com.fasterxml', name: 'classmate', version: '1.1.0'
compile group: 'com.itextpdf', name: 'itextpdf', version: '5.4.1'
+
+ //compile 'org.java-websocket:Java-WebSocket:1.5.1'
}