svn commit: r1864973 - in /ofbiz: ofbiz-framework/trunk/ ofbiz-plugins/trunk/example/ ofbiz-plugins/trunk/lucene/ ofbiz-plugins/trunk/lucene/src
Locked
svn commit: r1864973 - in /ofbiz: ofbiz-framework/trunk/ ofbiz-plugins/trunk/example/ ofbiz-plugins/trunk/lucene/ ofbiz-plugins/trunk/lucene/src
 
|
Author: jleroux
Date: Mon Aug 12 15:03:03 2019 New Revision: 1864973 URL: http://svn.apache.org/viewvc?rev=1864973&view=rev Log: Improved: Update build.gradle to the latest dependencies (OFBIZ-11151) Like for OFBIZ-10922 some updates were not possible. Please refer to the Jira for more information Modified: ofbiz/ofbiz-framework/trunk/build.gradle ofbiz/ofbiz-plugins/trunk/example/build.gradle ofbiz/ofbiz-plugins/trunk/lucene/build.gradle ofbiz/ofbiz-plugins/trunk/lucene/src/main/java/org/apache/ofbiz/content/search/SearchWorker.java ofbiz/ofbiz-plugins/trunk/lucene/src/main/java/org/apache/ofbiz/content/test/LuceneTests.java ofbiz/ofbiz-plugins/trunk/pricat/build.gradle ofbiz/ofbiz-plugins/trunk/solr/build.gradle ofbiz/ofbiz-plugins/trunk/solr/home/solrdefault/conf/solrconfig.xml Modified: ofbiz/ofbiz-framework/trunk/build.gradle URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/build.gradle?rev=1864973&r1=1864972&r2=1864973&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/build.gradle (original) +++ ofbiz/ofbiz-framework/trunk/build.gradle Mon Aug 12 15:03:03 2019 @@ -31,9 +31,9 @@ plugins { id 'maven-publish' id 'at.bxm.svntools' version '2.2.1' id 'org.asciidoctor.convert' version '2.0.0' - id 'org.owasp.dependencycheck' version '5.0.0-M2' apply false - id 'se.patrikerdes.use-latest-versions' version '0.2.9' apply false - id 'com.github.ben-manes.versions' version '0.21.0' apply false + id 'org.owasp.dependencycheck' version '5.2.1' apply false + id 'se.patrikerdes.use-latest-versions' version '0.2.12' apply false + id 'com.github.ben-manes.versions' version '0.22.0' apply false } /* OWASP plugin @@ -157,12 +157,12 @@ configurations { dependencies { implementation 'apache-xerces:xercesImpl:2.9.1' - implementation 'com.google.zxing:core:3.3.3' + implementation 'com.google.zxing:core:3.4.0' implementation 'com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:1.4.2' implementation 'com.googlecode.ez-vcard:ez-vcard:0.9.10' implementation 'com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20180219.1' - implementation 'com.googlecode.libphonenumber:libphonenumber:8.10.9' - implementation 'com.ibm.icu:icu4j:64.1' + implementation 'com.googlecode.libphonenumber:libphonenumber:8.10.16' + implementation 'com.ibm.icu:icu4j:64.2' implementation 'com.lowagie:itext:2.1.7' // Don't update due to license change in newer versions, see OFBIZ-10455 implementation 'com.sun.mail:javax.mail:1.6.2' implementation 'com.sun.syndication:com.springsource.com.sun.syndication:0.9.0' @@ -176,41 +176,41 @@ dependencies { implementation 'javax.servlet:javax.servlet-api:4.0.1' implementation 'javax.servlet.jsp:javax.servlet.jsp-api:2.3.3' implementation 'net.fortuna.ical4j:ical4j:1.0-rc3-atlassian-11' - implementation 'org.apache.ant:ant-junit:1.10.5' + implementation 'org.apache.ant:ant-junit:1.10.6' implementation 'org.apache.axis2:axis2-kernel:1.7.9' - implementation 'org.apache.commons:commons-collections4:4.3' - implementation 'org.apache.commons:commons-csv:1.6' - implementation 'org.apache.commons:commons-dbcp2:2.6.0' // When changing for 2.6.1+ we can remove ManagedDataSource::close, see DBCP-539 - implementation 'org.apache.commons:commons-text:1.6' + implementation 'org.apache.commons:commons-collections4:4.4' + implementation 'org.apache.commons:commons-csv:1.7' + implementation 'org.apache.commons:commons-dbcp2:2.7.0' + implementation 'org.apache.commons:commons-text:1.7' implementation 'org.apache.geronimo.components:geronimo-transaction:3.1.4' implementation 'org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1.1' - implementation 'org.apache.httpcomponents:httpclient-cache:4.5.8' - implementation 'org.apache.logging.log4j:log4j-api:2.11.2' // the API of log4j 2 + implementation 'org.apache.httpcomponents:httpclient-cache:4.5.9' + implementation 'org.apache.logging.log4j:log4j-api:2.12.1' // the API of log4j 2 implementation 'org.apache.poi:poi:4.1.0' - implementation 'org.apache.shiro:shiro-core:1.4.0' + implementation 'org.apache.shiro:shiro-core:1.4.1' implementation 'org.apache.sshd:sshd-core:1.7.0' - implementation 'org.apache.tika:tika-core:1.20' - implementation 'org.apache.tika:tika-parsers:1.20' - implementation 'org.apache.tomcat:tomcat-catalina-ha:9.0.21' - implementation 'org.apache.tomcat:tomcat-catalina:9.0.21' - implementation 'org.apache.tomcat:tomcat-jasper:9.0.21' - implementation 'org.apache.tomcat:tomcat-tribes:9.0.21' + implementation 'org.apache.tika:tika-core:1.22' + implementation 'org.apache.tika:tika-parsers:1.22' + implementation 'org.apache.tomcat:tomcat-catalina-ha:9.0.22' + implementation 'org.apache.tomcat:tomcat-catalina:9.0.22' + implementation 'org.apache.tomcat:tomcat-jasper:9.0.22' + implementation 'org.apache.tomcat:tomcat-tribes:9.0.22' implementation 'org.apache.xmlgraphics:fop:2.3' implementation 'org.apache.xmlrpc:xmlrpc-client:3.1.3' implementation 'org.apache.xmlrpc:xmlrpc-server:3.1.3' implementation 'org.codehaus.groovy:groovy-all:2.4.16' // Remember to change the version number in javadoc.options block implementation 'org.freemarker:freemarker:2.3.28' // Remember to change the version number in FreeMarkerWorker class when upgrading - implementation 'org.owasp.esapi:esapi:2.1.0.1' - implementation 'org.springframework:spring-test:5.1.6.RELEASE' + implementation 'org.owasp.esapi:esapi:2.2.0.0' + implementation 'org.springframework:spring-test:5.1.9.RELEASE' implementation 'org.zapodot:jackson-databind-java-optional:2.6.1' implementation 'oro:oro:2.0.8' implementation 'wsdl4j:wsdl4j:1.6.3' - implementation 'org.jsoup:jsoup:1.11.3' + implementation 'org.jsoup:jsoup:1.12.1' implementation 'io.jsonwebtoken:jjwt:0.9.1' implementation 'org.json:json:20140107' testImplementation 'org.hamcrest:hamcrest:2.1' testImplementation 'org.hamcrest:hamcrest-library:2.1' // Enable junit4 to not depend on hamcrest-1.3 - testImplementation 'org.mockito:mockito-core:2.27.0' + testImplementation 'org.mockito:mockito-core:3.0.0' runtimeOnly 'javax.xml.soap:javax.xml.soap-api:1.4.0' runtimeOnly 'de.odysseus.juel:juel-spi:2.2.7' runtimeOnly 'net.sf.barcode4j:barcode4j-fop-ext:2.1' @@ -219,10 +219,10 @@ dependencies { runtimeOnly 'org.apache.axis2:axis2-transport-local:1.7.9' runtimeOnly 'org.apache.derby:derby:10.14.2.0' runtimeOnly 'org.apache.geronimo.specs:geronimo-jaxrpc_1.1_spec:1.1' - runtimeOnly 'org.apache.logging.log4j:log4j-1.2-api:2.11.2' // for external jars using the old log4j1.2: routes logging to log4j 2 - runtimeOnly 'org.apache.logging.log4j:log4j-core:2.11.2' // the implementation of the log4j 2 API - runtimeOnly 'org.apache.logging.log4j:log4j-jul:2.11.2' // for external jars using the java.util.logging: routes logging to log4j 2 - runtimeOnly 'org.apache.logging.log4j:log4j-slf4j-impl:2.11.2' // for external jars using slf4j: routes logging to log4j 2 + runtimeOnly 'org.apache.logging.log4j:log4j-1.2-api:2.12.1' // for external jars using the old log4j1.2: routes logging to log4j 2 + runtimeOnly 'org.apache.logging.log4j:log4j-core:2.12.1' // the implementation of the log4j 2 API + runtimeOnly 'org.apache.logging.log4j:log4j-jul:2.12.1' // for external jars using the java.util.logging: routes logging to log4j 2 + runtimeOnly 'org.apache.logging.log4j:log4j-slf4j-impl:2.12.1' // for external jars using slf4j: routes logging to log4j 2 runtimeOnly 'org.codeartisans.thirdparties.swing:batik-all:1.8pre-r1084380' // Dependencies defined by the plugins @@ -233,7 +233,7 @@ dependencies { } junitReport 'junit:junit:4.12' - junitReport 'org.apache.ant:ant-junit:1.10.5' + junitReport 'org.apache.ant:ant-junit:1.10.6' asciidoctor 'org.asciidoctor:asciidoctorj-pdf:1.5.0-alpha.16' asciidoctor 'org.jruby:jruby-complete:9.2.7.0' // bug workaround - see OFBIZ-9873 Modified: ofbiz/ofbiz-plugins/trunk/example/build.gradle URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/example/build.gradle?rev=1864973&r1=1864972&r2=1864973&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/example/build.gradle (original) +++ ofbiz/ofbiz-plugins/trunk/example/build.gradle Mon Aug 12 15:03:03 2019 @@ -18,5 +18,5 @@ */ dependencies { - pluginLibsCompile 'org.apache.tomcat.embed:tomcat-embed-websocket:9.0.21' + pluginLibsCompile 'org.apache.tomcat.embed:tomcat-embed-websocket:9.0.22' } \ No newline at end of file Modified: ofbiz/ofbiz-plugins/trunk/lucene/build.gradle URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/lucene/build.gradle?rev=1864973&r1=1864972&r2=1864973&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/lucene/build.gradle (original) +++ ofbiz/ofbiz-plugins/trunk/lucene/build.gradle Mon Aug 12 15:03:03 2019 @@ -19,7 +19,7 @@ dependencies { // Remember to change the version number in SearchWorker class when upgrading. // Also Solr et Lucene should use the same version, luceneMatchVersion should be updated in solrconfig.xml - pluginLibsCompile 'org.apache.lucene:lucene-core:7.5.0' - pluginLibsCompile 'org.apache.lucene:lucene-queryparser:7.5.0' - pluginLibsCompile 'org.apache.lucene:lucene-analyzers-common:7.5.0' + pluginLibsCompile 'org.apache.lucene:lucene-core:8.2.0' + pluginLibsCompile 'org.apache.lucene:lucene-queryparser:8.2.0' + pluginLibsCompile 'org.apache.lucene:lucene-analyzers-common:8.2.0' } \ No newline at end of file Modified: ofbiz/ofbiz-plugins/trunk/lucene/src/main/java/org/apache/ofbiz/content/search/SearchWorker.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/lucene/src/main/java/org/apache/ofbiz/content/search/SearchWorker.java?rev=1864973&r1=1864972&r2=1864973&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/lucene/src/main/java/org/apache/ofbiz/content/search/SearchWorker.java (original) +++ ofbiz/ofbiz-plugins/trunk/lucene/src/main/java/org/apache/ofbiz/content/search/SearchWorker.java Mon Aug 12 15:03:03 2019 @@ -41,7 +41,7 @@ public final class SearchWorker { public static final String module = SearchWorker.class.getName(); - private static final Version LUCENE_VERSION = Version.LUCENE_7_5_0; + private static final Version LUCENE_VERSION = Version.LUCENE_8_2_0; private SearchWorker() {} Modified: ofbiz/ofbiz-plugins/trunk/lucene/src/main/java/org/apache/ofbiz/content/test/LuceneTests.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/lucene/src/main/java/org/apache/ofbiz/content/test/LuceneTests.java?rev=1864973&r1=1864972&r2=1864973&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/lucene/src/main/java/org/apache/ofbiz/content/test/LuceneTests.java (original) +++ ofbiz/ofbiz-plugins/trunk/lucene/src/main/java/org/apache/ofbiz/content/test/LuceneTests.java Mon Aug 12 15:03:03 2019 @@ -20,8 +20,6 @@ package org.apache.ofbiz.content.test; import java.io.File; -import java.lang.Object; -import java.lang.String; import java.util.HashMap; import java.util.Map; @@ -36,12 +34,12 @@ import org.apache.lucene.search.Query; import org.apache.lucene.search.TopScoreDocCollector; import org.apache.lucene.store.Directory; import org.apache.lucene.store.FSDirectory; +import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.content.search.SearchWorker; import org.apache.ofbiz.entity.GenericValue; import org.apache.ofbiz.entity.util.EntityQuery; import org.apache.ofbiz.service.ServiceUtil; import org.apache.ofbiz.service.testtools.OFBizTestCase; -import org.apache.ofbiz.base.util.Debug; public class LuceneTests extends OFBizTestCase { @@ -99,7 +97,7 @@ public class LuceneTests extends OFBizTe combQueryBuilder.add(query, BooleanClause.Occur.MUST); BooleanQuery combQuery = combQueryBuilder.build(); - TopScoreDocCollector collector = TopScoreDocCollector.create(10); + TopScoreDocCollector collector = TopScoreDocCollector.create(10, 10); searcher.search(combQuery, collector); assertEquals("Only 1 result expected from the testdata", 1, collector.getTotalHits()); Modified: ofbiz/ofbiz-plugins/trunk/pricat/build.gradle URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/pricat/build.gradle?rev=1864973&r1=1864972&r2=1864973&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/pricat/build.gradle (original) +++ ofbiz/ofbiz-plugins/trunk/pricat/build.gradle Mon Aug 12 15:03:03 2019 @@ -18,8 +18,8 @@ */ dependencies { pluginLibsCompile 'org.safehaus.jug:jug:2.0.0:asl' - pluginLibsCompile 'org.apache.poi:poi-ooxml:3.17' - pluginLibsCompile 'org.apache.poi:poi-ooxml-schemas:3.17' - pluginLibsCompile 'org.apache.poi:poi-excelant:3.17' - pluginLibsCompile 'org.apache.poi:poi-scratchpad:3.17' + pluginLibsCompile 'org.apache.poi:poi-ooxml:4.1.0' + pluginLibsCompile 'org.apache.poi:poi-ooxml-schemas:4.1.0' + pluginLibsCompile 'org.apache.poi:poi-excelant:4.1.0' + pluginLibsCompile 'org.apache.poi:poi-scratchpad:4.1.0' } \ No newline at end of file Modified: ofbiz/ofbiz-plugins/trunk/solr/build.gradle URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/solr/build.gradle?rev=1864973&r1=1864972&r2=1864973&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/solr/build.gradle (original) +++ ofbiz/ofbiz-plugins/trunk/solr/build.gradle Mon Aug 12 15:03:03 2019 @@ -17,7 +17,9 @@ * under the License. */ dependencies { - pluginLibsCompile 'org.apache.solr:solr-core:7.5.0' // Remember to change the version number in SearchWorker class when upgrading. Also Solr et Lucene should use the same version + // Remember to change the version number in SearchWorker class when upgrading. + // Also Solr et Lucene should use the same version, luceneMatchVersion should be updated in solrconfig.xml + pluginLibsCompile 'org.apache.solr:solr-core:8.2.0' pluginLibsCompile 'com.google.guava:guava:20.0' } Modified: ofbiz/ofbiz-plugins/trunk/solr/home/solrdefault/conf/solrconfig.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/solr/home/solrdefault/conf/solrconfig.xml?rev=1864973&r1=1864972&r2=1864973&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/solr/home/solrdefault/conf/solrconfig.xml (original) +++ ofbiz/ofbiz-plugins/trunk/solr/home/solrdefault/conf/solrconfig.xml Mon Aug 12 15:03:03 2019 @@ -35,7 +35,7 @@ that you fully re-index after changing this setting as it can affect both how text is indexed and queried. --> - <luceneMatchVersion>7.5.0</luceneMatchVersion> + <luceneMatchVersion>8.2.0</luceneMatchVersion> <!-- <lib/> directives can be used to instruct Solr to load any Jars |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |