You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2025/01/02 18:40:11 UTC
(ofbiz-framework) branch trunk updated (0ee46845db -> 6916e775e4)
This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
from 0ee46845db Improved: slim down groovy scriptlet on minilang (OFBIZ-13146)
new b59c083e6b Improved: Add the OpenSSF Best Practices Badge (OFBIZ-13198)
new 6916e775e4 Improved: Have library dependencies moved to a dependencies.gradle file (OFBIZ-10924)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
README.adoc | 2 ++
dependencies.gradle | 44 +++++++++++++++++++++++---------------------
2 files changed, 25 insertions(+), 21 deletions(-)
(ofbiz-framework) 02/02: Improved: Have library dependencies moved to a dependencies.gradle file (OFBIZ-10924)
Posted by jl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
commit 6916e775e4c88ac66ecdae981ed05e53f599741b
Author: Jacques Le Roux <ja...@les7arts.com>
AuthorDate: Thu Jan 2 19:15:07 2025 +0100
Improved: Have library dependencies moved to a dependencies.gradle file (OFBIZ-10924)
Alphabetically sorts content, last time issue was a mix with
Birt dependencies testing
---
dependencies.gradle | 44 +++++++++++++++++++++++---------------------
1 file changed, 23 insertions(+), 21 deletions(-)
diff --git a/dependencies.gradle b/dependencies.gradle
index 8cbb7ad052..b031656ff2 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -17,21 +17,25 @@
* under the License.
*/
dependencies {
+
+ implementation 'com.auth0:java-jwt:4.4.0'
+ implementation 'com.fasterxml.jackson.core:jackson-databind:2.18.2'
implementation 'com.github.ben-manes.caffeine:caffeine:3.1.8'
implementation 'com.google.guava:guava:33.3.1-jre'
+ implementation 'com.google.re2j:re2j:1.7'
implementation 'com.google.zxing:core:3.5.3'
implementation 'com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:1.4.2'
implementation 'com.googlecode.ez-vcard:ez-vcard:0.12.1'
- implementation 'com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20240325.1'
implementation 'com.googlecode.libphonenumber:libphonenumber:8.13.52'
+ implementation 'com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20240325.1'
implementation 'com.ibm.icu:icu4j:76.1'
implementation ('com.lowagie:itext:2.1.7') { // Don't update due to license change in newer versions, see OFBIZ-10455
exclude group: 'bouncycastle', module: 'bcmail-jdk14'
exclude group: 'bouncycastle', module: 'bcprov-jdk14'
exclude group: 'bouncycastle', module: 'bctsp-jdk14'
}
- implementation 'com.sun.mail:javax.mail:1.6.2'
implementation 'com.rometools:rome:2.1.0'
+ implementation 'com.sun.mail:javax.mail:1.6.2'
implementation 'com.thoughtworks.xstream:xstream:1.4.21'
implementation 'commons-cli:commons-cli:1.5.0' // with 1.6.0, 2 tests of OfbizStartupUnitTests don't pass
implementation 'commons-fileupload:commons-fileupload:1.5'
@@ -42,58 +46,56 @@ dependencies {
implementation 'net.fortuna.ical4j:ical4j:1.0-rc4-atlassian-12'
implementation 'net.lingala.zip4j:zip4j:2.11.5'
implementation 'org.apache.ant:ant-junit:1.10.15'
+ implementation 'org.apache.axis2:axis2-kernel:1.8.2'
implementation 'org.apache.commons:commons-collections4:4.4'
implementation 'org.apache.commons:commons-csv:1.12.0'
implementation 'org.apache.commons:commons-dbcp2:2.13.0'
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...
implementation 'org.apache.commons:commons-text:1.12.0'
+ implementation 'org.apache.cxf:cxf-rt-frontend-jaxrs:3.6.4' // 4.x+ requires javax.xml.bind -> jakarta.xml.bind namespace change
implementation 'org.apache.geronimo.components:geronimo-transaction:3.1.5' // 4.0.0 does not compile
implementation 'org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1.1'
+ implementation 'org.apache.groovy:groovy-all:5.0.0-alpha-11'
implementation 'org.apache.httpcomponents:httpclient-cache:4.5.14'
implementation 'org.apache.logging.log4j:log4j-api:2.24.2' // the API of log4j 2
implementation 'org.apache.logging.log4j:log4j-core:2.24.2' // Somehow needed by Buildbot to compile OFBizDynamicThresholdFilter.java
- implementation 'org.apache.poi:poi:5.3.0'
implementation 'org.apache.pdfbox:pdfbox:2.0.32' // 3.0.1 does not compile
+ implementation 'org.apache.poi:poi:5.3.0'
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
implementation 'org.apache.shiro:shiro-crypto-cipher:2.0.2'
implementation 'org.apache.sshd:sshd-core:2.14.0'
implementation 'org.apache.sshd:sshd-sftp:2.14.0'
implementation 'org.apache.tika:tika-core:2.9.2' // To be compatible with tika-parser-pdf-module below
- implementation 'org.apache.tika:tika-parsers:2.9.2' // To be compatible with tika-parser-pdf-module below
implementation 'org.apache.tika:tika-parser-pdf-module:2.9.2' // > 2.9.2 does not compile, see OFBIZ-13155
- implementation 'org.apache.cxf:cxf-rt-frontend-jaxrs:3.6.4' // 4.x+ requires javax.xml.bind -> jakarta.xml.bind namespace change
+ implementation 'org.apache.tika:tika-parsers:2.9.2' // To be compatible with tika-parser-pdf-module below
implementation 'org.apache.tomcat:tomcat-catalina-ha:9.0.97' // Remember to change the version number (9 now) in javadoc block if needed.
implementation 'org.apache.tomcat:tomcat-jasper:9.0.97'
- implementation 'org.apache.axis2:axis2-kernel:1.8.2'
implementation 'org.apache.xmlgraphics:batik-anim:1.18'
- implementation 'org.apache.xmlgraphics:batik-util:1.18'
implementation 'org.apache.xmlgraphics:batik-bridge:1.18'
+ implementation 'org.apache.xmlgraphics:batik-util:1.18'
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
implementation 'org.clojure:clojure:1.12.0'
- implementation 'org.apache.groovy:groovy-all:5.0.0-alpha-11'
- implementation 'org.freemarker:freemarker:2.3.34' // Remember to change the version number in FreeMarkerWorker class when upgrading. See OFBIZ-10019 if >= 2.4
- implementation 'org.owasp.esapi:esapi:2.6.0.0'
implementation 'org.cyberneko:html:1.9.8'
- implementation 'org.springframework:spring-test:5.3.29' // 6.1.4 does not compile
- implementation 'com.fasterxml.jackson.core:jackson-databind:2.18.2'
- implementation 'oro:oro:2.0.8'
- implementation 'wsdl4j:wsdl4j:1.6.3'
- implementation 'com.auth0:java-jwt:4.4.0'
+ implementation 'org.freemarker:freemarker:2.3.34' // Remember to change the version number in FreeMarkerWorker class when upgrading. See OFBIZ-10019 if >= 2.4
implementation 'org.jdom:jdom2:2.0.6.1'
- implementation 'com.google.re2j:re2j:1.7'
- implementation 'xerces:xercesImpl:2.12.2'
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)
exclude group: 'pull-parser', module: 'pull-parser'
exclude group: 'xpp3', module: 'xpp3'
}
+ implementation 'org.owasp.esapi:esapi:2.6.0.0'
+ implementation 'org.springframework:spring-test:5.3.29' // 6.1.4 does not compile
+ implementation 'oro:oro:2.0.8'
+ implementation 'wsdl4j:wsdl4j:1.6.3'
+ implementation 'xerces:xercesImpl:2.12.2'
+ testImplementation 'com.pholser:junit-quickcheck-generators:1.0'
testImplementation 'org.hamcrest:hamcrest-library:2.2' // Enable junit4 to not depend on hamcrest-1.3
- testImplementation 'org.mockito:mockito-core:5.14.2'
testImplementation 'org.jmockit:jmockit:1.49'
- testImplementation 'com.pholser:junit-quickcheck-generators:1.0'
+ testImplementation 'org.mockito:mockito-core:5.14.2'
+
- runtimeOnly 'javax.xml.soap:javax.xml.soap-api:1.4.0'
runtimeOnly 'de.odysseus.juel:juel-spi:2.2.7'
+ runtimeOnly 'javax.xml.soap:javax.xml.soap-api:1.4.0'
runtimeOnly 'net.sf.barcode4j:barcode4j-fop-ext:2.1'
runtimeOnly 'net.sf.barcode4j:barcode4j:2.1'
runtimeOnly 'org.apache.axis2:axis2-transport-http:1.8.2'
@@ -102,10 +104,10 @@ dependencies {
runtimeOnly 'org.apache.derby:derbytools:10.16.1.1' // 10.17.x.x requires Java 21
runtimeOnly 'org.apache.geronimo.specs:geronimo-jaxrpc_1.1_spec:2.1'
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
+ runtimeOnly 'org.apache.logging.log4j:log4j-jcl:2.24.2' // need to constrain to version to avoid classpath conflict (ReflectionUtil)
runtimeOnly 'org.apache.logging.log4j:log4j-jul:2.24.2' // for external jars using the java.util.logging: routes logging to log4j 2
runtimeOnly 'org.apache.logging.log4j:log4j-slf4j-impl:2.24.2' // for external jars using slf4j: routes logging to log4j 2
runtimeOnly 'org.apache.logging.log4j:log4j-web:2.24.2' //???
- runtimeOnly 'org.apache.logging.log4j:log4j-jcl:2.24.2' // need to constrain to version to avoid classpath conflict (ReflectionUtil)
// specify last codenarc version for java 17 compliance
codenarc('org.codenarc:CodeNarc:3.5.0')
(ofbiz-framework) 01/02: Improved: Add the OpenSSF Best Practices Badge (OFBIZ-13198)
Posted by jl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
commit b59c083e6b6ed7afeb198baf2821905197521465
Author: Jacques Le Roux <ja...@les7arts.com>
AuthorDate: Thu Jan 2 18:37:13 2025 +0100
Improved: Add the OpenSSF Best Practices Badge (OFBIZ-13198)
Adds 2 comments about BuildBot and CodeQL badges on how to keep them successful
---
README.adoc | 2 ++
1 file changed, 2 insertions(+)
diff --git a/README.adoc b/README.adoc
index d2684b3c35..c98b075644 100644
--- a/README.adoc
+++ b/README.adoc
@@ -22,10 +22,12 @@ The Apache OFBiz Project
image:https://img.shields.io/badge/License-Apache%202.0-blue.svg[link=http://www.apache.org/licenses/LICENSE-2.0]
image:https://img.shields.io/badge/Version-trunk-blue.svg[link=https://github.com/apache/ofbiz-framework]
+// For the BuildBot badge to not get stuck on failure, ALL builds of all branches handled by https://svn.apache.org/repos/infra/infrastructure/buildbot2/projects/ofbiz.py need to pass
image:https://ci2.apache.org/badges/ofbizTrunkFrameworkPlugins.svg[link=https://ci2.apache.org/#/builders?tags=%2BofbizTrunkFrameworkPlugins]
image:https://github.com/apache/ofbiz-framework/actions/workflows/gradle.yaml/badge.svg?branch=trunk[link=https://github.com/apache/ofbiz-framework/actions/workflows/gradle.yaml]
image:https://qpkb254zxeu.montastic.io/badge[link=https://qpkb254zxeu.montastic.io]
image:https://api.securityscorecards.dev/projects/github.com/apache/ofbiz-framework/badge[link=https://securityscorecards.dev/viewer/?uri=github.com/apache/ofbiz-framework]
+// For the CodeQL badge to not get stuck on failing, you need to delete the last failing CodeQL workflow (AKA action)
image:https://github.com/apache/ofbiz-framework/actions/workflows/codeql-analysis.yml/badge.svg[link=https://github.com/apache/ofbiz-framework/actions/workflows/codeql-analysis.yml]
image:https://www.bestpractices.dev/projects/8708/badge[link=https://www.bestpractices.dev/projects/8708]