Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ public static Map<String, Object> exportVCard(DispatchContext dctx, Map<String,
}
String saveToFilename = fullName + ".vcf";
file = FileUtil.getFile(saveToDirectory + "/" + saveToFilename);
Ezvcard.write(vcard).go(file);
Ezvcard.write(vcard).go(file.toPath());
} catch (FileNotFoundException e) {
Debug.logError(e, MODULE);
return ServiceUtil.returnError(UtilProperties.getMessage(RES_ERROR,
Expand Down
14 changes: 7 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@ plugins {
id 'maven-publish'
id 'org.asciidoctor.jvm.convert' version '3.3.2' // 4.0.2 does not compile
id 'org.asciidoctor.jvm.pdf' version '3.3.2' // 4.0.2 does not compile
id 'org.owasp.dependencycheck' version '9.0.9' apply false //Not tested after 7.4.4
id 'se.patrikerdes.use-latest-versions' version '0.2.18' apply false
id 'com.github.ben-manes.versions' version '0.51.0' apply false
id 'org.owasp.dependencycheck' version '9.2.0' apply false //Not tested after 7.4.4
id 'se.patrikerdes.use-latest-versions' version '0.2.19' apply false
id 'com.github.ben-manes.versions' version '0.53.0' apply false
id "com.github.ManifestClasspath" version "0.1.0-RELEASE"
id "com.github.jakemarsden.git-hooks" version "0.0.2"
id "com.github.node-gradle.node" version '7.0.2' apply false
id "com.github.node-gradle.node" version '7.1.0' apply false
}

/* DependencyUpdates plugin
Expand Down Expand Up @@ -92,9 +92,9 @@ javadoc {
// Those external Javadoc links should correspond to the actual
// versions declared in the 'dependencies' block.
links(
'https://docs.oracle.com/javase/17/docs/api',
'https://docs.oracle.com/en/java/javase/17/docs/api/',
'https://tomcat.apache.org/tomcat-9.0-doc/servletapi/',
'http://docs.groovy-lang.org/docs/groovy-3.0.20/html/api',
'http://docs.groovy-lang.org/docs/groovy-3.0.25/html/api',
'https://commons.apache.org/proper/commons-cli/apidocs'
)
}
Expand Down Expand Up @@ -197,7 +197,7 @@ dependencies {
}

junitReport 'junit:junit:4.13.2'
junitReport 'org.apache.ant:ant-junit:1.10.14'
junitReport 'org.apache.ant:ant-junit:1.10.15'

// Libraries downloaded manually
implementation fileTree(dir: file("${rootDir}/lib"), include: '**/*.jar')
Expand Down
98 changes: 48 additions & 50 deletions dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,94 +18,92 @@
*/
dependencies {
implementation 'com.drewnoakes:metadata-extractor:2.19.0'
implementation 'com.github.ben-manes.caffeine:caffeine:3.1.8'
implementation 'com.google.zxing:core:3.5.3'
implementation 'com.github.ben-manes.caffeine:caffeine:3.2.3'
implementation 'com.google.zxing:core:3.5.4'
implementation 'com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:1.4.2'
implementation 'com.googlecode.ez-vcard:ez-vcard:0.11.3' // 0.12.1 does not compile
implementation 'com.googlecode.ez-vcard:ez-vcard:0.12.2'
implementation 'com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20220608.1'
implementation 'com.googlecode.libphonenumber:libphonenumber:8.13.31'
implementation 'com.googlecode.libphonenumber:libphonenumber:8.13.55'
implementation 'com.ibm.icu:icu4j:74.2'
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.github.librepdf:openpdf:1.3.43'
implementation 'com.sun.mail:javax.mail:1.6.2'
implementation 'com.rometools:rome:2.1.0'
implementation 'com.thoughtworks.xstream:xstream:1.4.20'
implementation 'commons-cli:commons-cli:1.5.0' // with 1.6.0, 2 tests of OfbizStartupUnitTests don't pass
implementation 'com.thoughtworks.xstream:xstream:1.4.21'
implementation 'commons-cli:commons-cli:1.11.0'
implementation 'commons-fileupload:commons-fileupload:1.6.0'
implementation 'commons-net:commons-net:3.10.0'
implementation 'commons-validator:commons-validator:1.8.0'
implementation 'commons-net:commons-net:3.13.0'
implementation 'commons-validator:commons-validator:1.10.1'
implementation 'de.odysseus.juel:juel-impl:2.2.7'
implementation 'javax.transaction:javax.transaction-api:1.3'
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.14'
implementation 'org.apache.commons:commons-collections4:4.4'
implementation 'org.apache.commons:commons-csv:1.10.0'
implementation 'org.apache.commons:commons-dbcp2:2.10.0'// 2.11.0 does not compile.
implementation 'net.lingala.zip4j:zip4j:2.11.6'
implementation 'org.apache.ant:ant-junit:1.10.15'
implementation 'org.apache.commons:commons-collections4:4.5.0'
implementation 'org.apache.commons:commons-csv:1.14.1'
implementation 'org.apache.commons:commons-dbcp2:2.14.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.11.0'
implementation 'org.apache.commons:commons-text:1.15.0'
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.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.logging.log4j:log4j-api:2.25.3' // the API of log4j 2
implementation 'org.apache.logging.log4j:log4j-core:2.25.3' // Somehow needed by Buildbot to compile OFBizDynamicThresholdFilter.java
implementation 'org.apache.poi:poi:4.1.2' // poi-ooxml-schemas-5.0.0.pom'. Received status code 401 from server
implementation 'org.apache.pdfbox:pdfbox:2.0.31' // 3.0.1 does not compile
implementation 'org.apache.pdfbox:pdfbox:2.0.36' // 3.0.1 does not compile
implementation 'org.apache.shiro:shiro-core:1.13.0'
implementation 'org.apache.shiro:shiro-crypto-cipher:2.0.0'
implementation 'org.apache.sshd:sshd-core:2.10.0'
implementation 'org.apache.sshd:sshd-sftp:2.10.0'
implementation 'org.apache.tika:tika-core:2.9.2'
implementation 'org.apache.tika:tika-parsers:2.5.0'
implementation 'org.apache.tika:tika-parser-pdf-module:2.5.0'
implementation 'org.apache.cxf:cxf-rt-frontend-jaxrs:3.5.6' // 4.0.3 does not compile
implementation 'org.apache.tomcat:tomcat-catalina-ha:9.0.115' // Remember to change the version number (9 now) in javadoc block if needed.
implementation 'org.apache.tomcat:tomcat-jasper:9.0.115'
implementation 'org.apache.shiro:shiro-crypto-cipher:2.1.0'
implementation 'org.apache.sshd:sshd-core:2.17.1'
implementation 'org.apache.sshd:sshd-sftp:2.17.1'
implementation 'org.apache.tika:tika-core:2.9.4'
implementation 'org.apache.tika:tika-parsers:2.9.4'
implementation 'org.apache.tika:tika-parser-pdf-module:2.9.4'
implementation 'org.apache.cxf:cxf-rt-frontend-jaxrs:3.6.10' // 4.0.3 does not compile
implementation 'org.apache.tomcat:tomcat-catalina-ha:9.0.116' // Remember to change the version number (9 now) in javadoc block if needed.
implementation 'org.apache.tomcat:tomcat-jasper:9.0.116'
implementation 'org.apache.axis2:axis2-kernel:1.8.2'
implementation 'org.apache.xmlgraphics:batik-anim:1.17'
implementation 'org.apache.xmlgraphics:batik-util:1.17'
implementation 'org.apache.xmlgraphics:batik-bridge:1.17'
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.11.1'
implementation 'org.codehaus.groovy:groovy-all:3.0.21'
implementation 'org.apache.xmlgraphics:batik-anim:1.19'
implementation 'org.apache.xmlgraphics:batik-util:1.19'
implementation 'org.apache.xmlgraphics:batik-bridge:1.19'
implementation 'org.apache.xmlgraphics:fop:2.10'
// NOTE: fop 2.11+ pulls fontbox 3.x which conflicts with pdfbox 2.x used elsewhere; stay on 2.10 (last version using fontbox 2.x)
implementation 'org.clojure:clojure:1.12.4'
implementation 'org.codehaus.groovy:groovy-all:3.0.25'
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.5.3.1'
implementation 'org.springframework:spring-test:5.3.29' // 6.1.4 does not compile
implementation 'com.fasterxml.jackson.core:jackson-databind:2.15.2'
implementation 'org.owasp.esapi:esapi:2.7.0.0'
implementation 'org.springframework:spring-test:5.3.39' // 6.1.4 does not compile
implementation 'com.fasterxml.jackson.core:jackson-databind:2.21.2'
implementation 'oro:oro:2.0.8'
implementation 'wsdl4j:wsdl4j:1.6.3'
implementation 'com.auth0:java-jwt:4.4.0'
implementation 'com.auth0:java-jwt:4.5.1'
implementation 'org.jdom:jdom:1.1.3' // don't upgrade above 1.1.3, makes a lot of not obvious and useless complications, see last commits of OFBIZ-12092 for more
implementation 'com.google.re2j:re2j:1.7'
implementation 'com.google.re2j:re2j:1.8'
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'
}

testImplementation 'org.hamcrest:hamcrest-library:2.2' // Enable junit4 to not depend on hamcrest-1.3
testImplementation 'org.mockito:mockito-core:5.10.0'
testImplementation 'org.jmockit:jmockit:1.49'
testImplementation 'org.mockito:mockito-core:5.23.0'
testImplementation 'org.jmockit:jmockit:1.50'
testImplementation 'com.pholser:junit-quickcheck-generators:1.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'
runtimeOnly 'net.sf.barcode4j:barcode4j:2.1'
runtimeOnly 'org.apache.avalon.framework:avalon-framework-api:4.3.1' // required by barcode4j SPI scanning in xmlgraphics-commons 2.10+
runtimeOnly 'org.apache.axis2:axis2-transport-http:1.8.2'
runtimeOnly 'org.apache.axis2:axis2-transport-local:1.8.2'
runtimeOnly 'org.apache.derby:derby:10.14.2.0' // 10.17.1.0 does not compile
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-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)
runtimeOnly 'org.apache.logging.log4j:log4j-1.2-api:2.25.3' // for external jars using the old log4j1.2: routes logging to log4j 2
runtimeOnly 'org.apache.logging.log4j:log4j-jul:2.25.3' // for external jars using the java.util.logging: routes logging to log4j 2
runtimeOnly 'org.apache.logging.log4j:log4j-slf4j-impl:2.25.3' // for external jars using slf4j: routes logging to log4j 2
runtimeOnly 'org.apache.logging.log4j:log4j-web:2.25.3' //???
runtimeOnly 'org.apache.logging.log4j:log4j-jcl:2.25.3' // need to constrain to version to avoid classpath conflict (ReflectionUtil)

// specify last codenarc version for java 17 compliance
codenarc('org.codenarc:CodeNarc:3.4.0')
codenarc('org.codenarc:CodeNarc:3.7.0')
}
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.6-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
4 changes: 2 additions & 2 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
*/

plugins {
id 'com.gradle.develocity' version '3.18.2'
id 'com.gradle.common-custom-user-data-gradle-plugin' version '2.0.2'
id 'com.gradle.develocity' version '3.19.2'
id 'com.gradle.common-custom-user-data-gradle-plugin' version '2.4.0'
}

def isCI = System.getenv('GITHUB_ACTIONS') != null
Expand Down
Loading