svn commit: r1812161 - in /ofbiz/ofbiz-framework/trunk: build.gradle framework/base/src/main/java/org/apache/ofbiz/base/util/template/FreeMarkerWorker.java framework/service/src/main/java/org/apache/ofbiz/service/xmlrpc/AliasSupportedTransportFactory.java

[mbrohl]

Author: mbrohl
Date: Fri Oct 13 20:42:25 2017
New Revision: 1812161

URL: http://svn.apache.org/viewvc?rev=1812161&view=rev
Log:
Improved: Update build.gradle to the latest dependencies.
(OFBIZ-9674)

Thanks Julian Leichert for providing the patch.

Modified:
    ofbiz/ofbiz-framework/trunk/build.gradle
    ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/template/FreeMarkerWorker.java
    ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/xmlrpc/AliasSupportedTransportFactory.java

Modified: ofbiz/ofbiz-framework/trunk/build.gradle
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/build.gradle?rev=1812161&r1=1812160&r2=1812161&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/build.gradle (original)
+++ ofbiz/ofbiz-framework/trunk/build.gradle Fri Oct 13 20:42:25 2017
@@ -94,14 +94,14 @@ configurations {
 dependencies {
     // ofbiz compile libs
     compile 'apache-xerces:xercesImpl:2.9.1'
-    compile 'com.google.zxing:core:3.2.1'
-    compile 'com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:1.0'
+    compile 'com.google.zxing:core:3.3.0'
+    compile 'com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:1.4.2'
     compile 'com.googlecode.ez-vcard:ez-vcard:0.9.10'
     compile 'com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20170515.1'
-    compile 'com.googlecode.libphonenumber:libphonenumber:8.6.0'
-    compile 'com.ibm.icu:icu4j:57.1'
-    compile 'com.lowagie:itext:2.1.7'
-    compile 'com.sun.mail:javax.mail:1.5.1'
+    compile 'com.googlecode.libphonenumber:libphonenumber:8.8.3'
+    compile 'com.ibm.icu:icu4j:59.1'
+    compile 'com.lowagie:itext:4.2.0'
+    compile 'com.sun.mail:javax.mail:1.6.0'
     compile 'com.sun.syndication:com.springsource.com.sun.syndication:0.9.0'
     compile 'com.thoughtworks.xstream:xstream:1.4.10'
     compile 'commons-cli:commons-cli:1.3.1'
@@ -109,41 +109,41 @@ dependencies {
     compile 'commons-validator:commons-validator:1.5.1'
     compile 'de.odysseus.juel:juel-impl:2.2.7'
     compile 'javax.el:javax.el-api:3.0.1-b04'
-    compile 'javax.servlet:javax.servlet-api:3.1.0'
+    compile 'javax.servlet:javax.servlet-api:4.0.0'
     compile 'javax.servlet.jsp:javax.servlet.jsp-api:2.3.0'
-    compile 'junit:junit-dep:4.10'
+    compile 'junit:junit-dep:4.11'
     compile 'net.fortuna.ical4j:ical4j:1.0-rc3-atlassian-11'
-    compile 'org.apache.ant:ant-junit:1.9.0'
-    compile 'org.apache.axis2:axis2-kernel:1.7.1'
+    compile 'org.apache.ant:ant-junit:1.10.1'
+    compile 'org.apache.axis2:axis2-kernel:1.7.6'
     compile 'org.apache.commons:commons-collections4:4.1'
-    compile 'org.apache.commons:commons-csv:1.1'
-    compile 'org.apache.commons:commons-dbcp2:2.1'
+    compile 'org.apache.commons:commons-csv:1.5'
+    compile 'org.apache.commons:commons-dbcp2:2.1.1'
     compile 'org.apache.geronimo.components:geronimo-transaction:3.1.4'
     compile 'org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1.1'
-    compile 'org.apache.httpcomponents:httpclient-cache:4.4.1'
-    compile 'org.apache.logging.log4j:log4j-api:2.6.2' // the API of log4j 2
-    compile 'org.apache.poi:poi:3.14'
-    compile 'org.apache.shiro:shiro-core:1.3.0'
-    compile 'org.apache.tika:tika-core:1.12'
-    compile 'org.apache.tika:tika-parsers:1.12'
+    compile 'org.apache.httpcomponents:httpclient-cache:4.5.3'
+    compile 'org.apache.logging.log4j:log4j-api:2.9.1' // the API of log4j 2
+    compile 'org.apache.poi:poi:3.17'
+    compile 'org.apache.shiro:shiro-core:1.4.0'
+    compile 'org.apache.tika:tika-core:1.16'
+    compile 'org.apache.tika:tika-parsers:1.16'
     compile 'org.apache.tomcat:tomcat-catalina-ha:8.5.23'
     compile 'org.apache.tomcat:tomcat-catalina:8.5.23'
     compile 'org.apache.tomcat:tomcat-jasper:8.5.23'
     compile 'org.apache.tomcat:tomcat-tribes:8.5.23'
-    compile 'org.apache.xmlgraphics:fop:2.1'
-    compile 'org.apache.xmlrpc:xmlrpc-client:3.1.2'
-    compile 'org.apache.xmlrpc:xmlrpc-server:3.1.2'
+    compile 'org.apache.xmlgraphics:fop:2.2'
+    compile 'org.apache.xmlrpc:xmlrpc-client:3.1.3'
+    compile 'org.apache.xmlrpc:xmlrpc-server:3.1.3'
     compile 'org.codehaus.groovy:groovy-all:2.4.12'
-    compile 'org.freemarker:freemarker:2.3.25-incubating' // Remember to change the version number in FreeMarkerWorker class when upgrading
+    compile 'org.freemarker:freemarker:2.3.26-incubating' // Remember to change the version number in FreeMarkerWorker class when upgrading
     compile 'org.hamcrest:hamcrest-all:1.3'
-    compile 'org.owasp.esapi:esapi:2.1.0'
+    compile 'org.owasp.esapi:esapi:2.1.0.1'
     compile 'org.springframework:spring-test:4.2.3.RELEASE'
-    compile 'org.zapodot:jackson-databind-java-optional:2.4.2'
+    compile 'org.zapodot:jackson-databind-java-optional:2.6.1'
     compile 'oro:oro:2.0.8'
-    compile 'wsdl4j:wsdl4j:1.6.2'
+    compile 'wsdl4j:wsdl4j:1.6.3'
 
     // ofbiz unit-test compile libs
-    testCompile 'org.mockito:mockito-core:1.+'
+    testCompile 'org.mockito:mockito-core:2.+'
 
     // ofbiz runtime libs
     runtime 'de.odysseus.juel:juel-spi:2.2.7'
@@ -151,12 +151,12 @@ dependencies {
     runtime 'net.sf.barcode4j:barcode4j:2.1'
     runtime 'org.apache.axis2:axis2-transport-http:1.7.1'
     runtime 'org.apache.axis2:axis2-transport-local:1.7.1'
-    runtime 'org.apache.derby:derby:10.11.1.1'
+    runtime 'org.apache.derby:derby:10.13.1.1'
     runtime 'org.apache.geronimo.specs:geronimo-jaxrpc_1.1_spec:1.1'
-    runtime 'org.apache.logging.log4j:log4j-1.2-api:2.6.2' // for external jars using the old log4j1.2: routes logging to log4j 2
-    runtime 'org.apache.logging.log4j:log4j-core:2.6.2' // the implementation of the log4j 2 API
-    runtime 'org.apache.logging.log4j:log4j-jul:2.6.2' // for external jars using the java.util.logging: routes logging to log4j 2
-    runtime 'org.apache.logging.log4j:log4j-slf4j-impl:2.6.2' // for external jars using slf4j: routes logging to log4j 2
+    runtime 'org.apache.logging.log4j:log4j-1.2-api:2.9.1' // for external jars using the old log4j1.2: routes logging to log4j 2
+    runtime 'org.apache.logging.log4j:log4j-core:2.9.1' // the implementation of the log4j 2 API
+    runtime 'org.apache.logging.log4j:log4j-jul:2.9.1' // for external jars using the java.util.logging: routes logging to log4j 2
+    runtime 'org.apache.logging.log4j:log4j-slf4j-impl:2.9.1' // for external jars using slf4j: routes logging to log4j 2
     runtime 'org.codeartisans.thirdparties.swing:batik-all:1.8pre-r1084380'
 
     // plugin libs

Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/template/FreeMarkerWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/template/FreeMarkerWorker.java?rev=1812161&r1=1812160&r2=1812161&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/template/FreeMarkerWorker.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/template/FreeMarkerWorker.java Fri Oct 13 20:42:25 2017
@@ -71,7 +71,7 @@ public final class FreeMarkerWorker {
 
     public static final String module = FreeMarkerWorker.class.getName();
 
-    public static final Version version = Configuration.VERSION_2_3_25;
+    public static final Version version = Configuration.VERSION_2_3_26;
 
     private FreeMarkerWorker () {}
 

Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/xmlrpc/AliasSupportedTransportFactory.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/xmlrpc/AliasSupportedTransportFactory.java?rev=1812161&r1=1812160&r2=1812161&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/xmlrpc/AliasSupportedTransportFactory.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/xmlrpc/AliasSupportedTransportFactory.java Fri Oct 13 20:42:25 2017
@@ -60,14 +60,13 @@ public class AliasSupportedTransportFact
 
     class AliasSupportedTransport extends XmlRpcHttpTransport {
 
-        protected static final String userAgent = USER_AGENT + " (Sun HTTP Transport)";
         private URLConnection con;
         private String password;
         private String alias;
         private KeyStore ks;
 
         protected AliasSupportedTransport(org.apache.xmlrpc.client.XmlRpcClient client, KeyStore ks, String password, String alias) {
-            super(client, userAgent);
+            super(client, USER_AGENT + " (Sun HTTP Transport)");
             this.password = password;
             this.alias = alias;
             this.ks = ks;