Skip to content

Commit 3cf51a8

Browse files
JacquesLeRouxJacquesLeRoux
committed
Reverted: Improved: Have library dependencies moved to a dependencies.gradle file (OFBIZ-10924)
This reverts commit 6916e77. I thought Gradle dependencies order had no importance. It seems though it depends on OS.  So I revert a last time and forget this idea of alphabetically ordering the dependencies.
1 parent 33e3000 commit 3cf51a8

File tree

1 file changed

+21
-23
lines changed

1 file changed

+21
-23
lines changed

‎dependencies.gradle

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -17,25 +17,21 @@
1717
* under the License.
1818
*/
1919
dependencies {
20-
21-
implementation 'com.auth0:java-jwt:4.4.0'
22-
implementation 'com.fasterxml.jackson.core:jackson-databind:2.18.2'
2320
implementation 'com.github.ben-manes.caffeine:caffeine:3.1.8'
2421
implementation 'com.google.guava:guava:33.3.1-jre'
25-
implementation 'com.google.re2j:re2j:1.7'
2622
implementation 'com.google.zxing:core:3.5.3'
2723
implementation 'com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:1.4.2'
2824
implementation 'com.googlecode.ez-vcard:ez-vcard:0.12.1'
29-
implementation 'com.googlecode.libphonenumber:libphonenumber:8.13.52'
3025
implementation 'com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20240325.1'
26+
implementation 'com.googlecode.libphonenumber:libphonenumber:8.13.52'
3127
implementation 'com.ibm.icu:icu4j:76.1'
3228
implementation ('com.lowagie:itext:2.1.7') { // Don't update due to license change in newer versions, see OFBIZ-10455
3329
exclude group: 'bouncycastle', module: 'bcmail-jdk14'
3430
exclude group: 'bouncycastle', module: 'bcprov-jdk14'
3531
exclude group: 'bouncycastle', module: 'bctsp-jdk14'
3632
}
37-
implementation 'com.rometools:rome:2.1.0'
3833
implementation 'com.sun.mail:javax.mail:1.6.2'
34+
implementation 'com.rometools:rome:2.1.0'
3935
implementation 'com.thoughtworks.xstream:xstream:1.4.21'
4036
implementation 'commons-cli:commons-cli:1.5.0' // with 1.6.0, 2 tests of OfbizStartupUnitTests don't pass
4137
implementation 'commons-fileupload:commons-fileupload:1.5'
@@ -46,56 +42,58 @@ dependencies {
4642
implementation 'net.fortuna.ical4j:ical4j:1.0-rc4-atlassian-12'
4743
implementation 'net.lingala.zip4j:zip4j:2.11.5'
4844
implementation 'org.apache.ant:ant-junit:1.10.15'
49-
implementation 'org.apache.axis2:axis2-kernel:1.8.2'
5045
implementation 'org.apache.commons:commons-collections4:4.4'
5146
implementation 'org.apache.commons:commons-csv:1.12.0'
5247
implementation 'org.apache.commons:commons-dbcp2:2.13.0'
5348
implementation 'org.apache.commons:commons-imaging:1.0-alpha3' // Alpha but OK, "Imaging was working and was used by a number of projects in production even before reaching its initial release as an Apache Commons component." Since 1.0.0-alpha4 (note the use of semver) the API has changed. Better wait an "official release" to rewrite OFBiz code...
5449
implementation 'org.apache.commons:commons-text:1.12.0'
55-
implementation 'org.apache.cxf:cxf-rt-frontend-jaxrs:3.6.4' // 4.x+ requires javax.xml.bind -> jakarta.xml.bind namespace change
5650
implementation 'org.apache.geronimo.components:geronimo-transaction:3.1.5' // 4.0.0 does not compile
5751
implementation 'org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1.1'
58-
implementation 'org.apache.groovy:groovy-all:5.0.0-alpha-11'
5952
implementation 'org.apache.httpcomponents:httpclient-cache:4.5.14'
6053
implementation 'org.apache.logging.log4j:log4j-api:2.24.2' // the API of log4j 2
6154
implementation 'org.apache.logging.log4j:log4j-core:2.24.2' // Somehow needed by Buildbot to compile OFBizDynamicThresholdFilter.java
62-
implementation 'org.apache.pdfbox:pdfbox:2.0.32' // 3.0.1 does not compile
6355
implementation 'org.apache.poi:poi:5.3.0'
56+
implementation 'org.apache.pdfbox:pdfbox:2.0.32' // 3.0.1 does not compile
6457
implementation 'org.apache.shiro:shiro-core:1.13.0' // Got "Exception in thread "main" java.lang.UnsupportedOperationException: Cannot create a hash with the given algorithm: argon2" with 2.0.2 in integration tests
6558
implementation 'org.apache.shiro:shiro-crypto-cipher:2.0.2'
6659
implementation 'org.apache.sshd:sshd-core:2.14.0'
6760
implementation 'org.apache.sshd:sshd-sftp:2.14.0'
6861
implementation 'org.apache.tika:tika-core:2.9.2' // To be compatible with tika-parser-pdf-module below
69-
implementation 'org.apache.tika:tika-parser-pdf-module:2.9.2' // > 2.9.2 does not compile, see OFBIZ-13155
7062
implementation 'org.apache.tika:tika-parsers:2.9.2' // To be compatible with tika-parser-pdf-module below
63+
implementation 'org.apache.tika:tika-parser-pdf-module:2.9.2' // > 2.9.2 does not compile, see OFBIZ-13155
64+
implementation 'org.apache.cxf:cxf-rt-frontend-jaxrs:3.6.4' // 4.x+ requires javax.xml.bind -> jakarta.xml.bind namespace change
7165
implementation 'org.apache.tomcat:tomcat-catalina-ha:9.0.97' // Remember to change the version number (9 now) in javadoc block if needed.
7266
implementation 'org.apache.tomcat:tomcat-jasper:9.0.97'
67+
implementation 'org.apache.axis2:axis2-kernel:1.8.2'
7368
implementation 'org.apache.xmlgraphics:batik-anim:1.18'
74-
implementation 'org.apache.xmlgraphics:batik-bridge:1.18'
7569
implementation 'org.apache.xmlgraphics:batik-util:1.18'
70+
implementation 'org.apache.xmlgraphics:batik-bridge:1.18'
7671
implementation 'org.apache.xmlgraphics:fop:2.3' // NOTE: since 2.4 dependencies are messed up. See https://github.com/moqui/moqui-fop/blob/master/build.gradle
7772
implementation 'org.clojure:clojure:1.12.0'
78-
implementation 'org.cyberneko:html:1.9.8'
73+
implementation 'org.apache.groovy:groovy-all:5.0.0-alpha-11'
7974
implementation 'org.freemarker:freemarker:2.3.34' // Remember to change the version number in FreeMarkerWorker class when upgrading. See OFBIZ-10019 if >= 2.4
80-
implementation 'org.jdom:jdom2:2.0.6.1'
81-
implementation('org.mustangproject:library:2.8.0') { // 2.10.0 did not work, cf. OFBIZ-12920 (https://github.com/apache/ofbiz-framework/pull/712#issuecomment-1968960963)
82-
exclude group: 'pull-parser', module: 'pull-parser'
83-
exclude group: 'xpp3', module: 'xpp3'
84-
}
8575
implementation 'org.owasp.esapi:esapi:2.6.0.0'
76+
implementation 'org.cyberneko:html:1.9.8'
8677
implementation 'org.springframework:spring-test:5.3.29' // 6.1.4 does not compile
78+
implementation 'com.fasterxml.jackson.core:jackson-databind:2.18.2'
8779
implementation 'oro:oro:2.0.8'
8880
implementation 'wsdl4j:wsdl4j:1.6.3'
81+
implementation 'com.auth0:java-jwt:4.4.0'
82+
implementation 'org.jdom:jdom2:2.0.6.1'
83+
implementation 'com.google.re2j:re2j:1.7'
8984
implementation 'xerces:xercesImpl:2.12.2'
85+
implementation('org.mustangproject:library:2.8.0') { // 2.10.0 did not work, cf. OFBIZ-12920 (https://github.com/apache/ofbiz-framework/pull/712#issuecomment-1968960963)
86+
exclude group: 'pull-parser', module: 'pull-parser'
87+
exclude group: 'xpp3', module: 'xpp3'
88+
}
9089

91-
testImplementation 'com.pholser:junit-quickcheck-generators:1.0'
9290
testImplementation 'org.hamcrest:hamcrest-library:2.2' // Enable junit4 to not depend on hamcrest-1.3
93-
testImplementation 'org.jmockit:jmockit:1.49'
9491
testImplementation 'org.mockito:mockito-core:5.14.2'
92+
testImplementation 'org.jmockit:jmockit:1.49'
93+
testImplementation 'com.pholser:junit-quickcheck-generators:1.0'
9594

96-
97-
runtimeOnly 'de.odysseus.juel:juel-spi:2.2.7'
9895
runtimeOnly 'javax.xml.soap:javax.xml.soap-api:1.4.0'
96+
runtimeOnly 'de.odysseus.juel:juel-spi:2.2.7'
9997
runtimeOnly 'net.sf.barcode4j:barcode4j-fop-ext:2.1'
10098
runtimeOnly 'net.sf.barcode4j:barcode4j:2.1'
10199
runtimeOnly 'org.apache.axis2:axis2-transport-http:1.8.2'
@@ -104,10 +102,10 @@ dependencies {
104102
runtimeOnly 'org.apache.derby:derbytools:10.16.1.1' // 10.17.x.x requires Java 21
105103
runtimeOnly 'org.apache.geronimo.specs:geronimo-jaxrpc_1.1_spec:2.1'
106104
runtimeOnly 'org.apache.logging.log4j:log4j-1.2-api:2.24.2' // for external jars using the old log4j1.2: routes logging to log4j 2
107-
runtimeOnly 'org.apache.logging.log4j:log4j-jcl:2.24.2' // need to constrain to version to avoid classpath conflict (ReflectionUtil)
108105
runtimeOnly 'org.apache.logging.log4j:log4j-jul:2.24.2' // for external jars using the java.util.logging: routes logging to log4j 2
109106
runtimeOnly 'org.apache.logging.log4j:log4j-slf4j-impl:2.24.2' // for external jars using slf4j: routes logging to log4j 2
110107
runtimeOnly 'org.apache.logging.log4j:log4j-web:2.24.2' //???
108+
runtimeOnly 'org.apache.logging.log4j:log4j-jcl:2.24.2' // need to constrain to version to avoid classpath conflict (ReflectionUtil)
111109

112110
// specify last codenarc version for java 17 compliance
113111
codenarc('org.codenarc:CodeNarc:3.5.0')

0 commit comments

Comments
 (0)