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
The following commit(s) were added to refs/heads/trunk by this push:
new 3355c64 Fixed: Update build.gradle to the latest dependencies
(OFBIZ-12092)
3355c64 is described below
commit 3355c64f4c288e2dd23653fbd1c9fd61cd352d64
Author: Jacques Le Roux <[email protected]>
AuthorDate: Sat Dec 19 14:54:04 2020 +0100
Fixed: Update build.gradle to the latest dependencies (OFBIZ-12092)
After last changes jdom is missing when using framework only, certainly due
to a
3rd party lib change that included it.
This fixes the issue, by not only adding last jdom lib
('org.jdom:jdom:2.0.2')
in build.gradle but also changing the import where used: they changed to
jdom2!
---
.../src/main/java/org/apache/ofbiz/product/image/ScaleImage.java | 2 +-
.../java/org/apache/ofbiz/product/imagemanagement/FrameImage.java | 2 +-
.../ofbiz/product/imagemanagement/ImageManagementServices.java | 2 +-
.../main/java/org/apache/ofbiz/product/product/ProductServices.java | 2 +-
build.gradle | 6 +++---
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git
a/applications/product/src/main/java/org/apache/ofbiz/product/image/ScaleImage.java
b/applications/product/src/main/java/org/apache/ofbiz/product/image/ScaleImage.java
index cb8587d..665fcae 100644
---
a/applications/product/src/main/java/org/apache/ofbiz/product/image/ScaleImage.java
+++
b/applications/product/src/main/java/org/apache/ofbiz/product/image/ScaleImage.java
@@ -42,7 +42,7 @@ import org.apache.ofbiz.entity.Delegator;
import org.apache.ofbiz.entity.util.EntityUtilProperties;
import org.apache.ofbiz.service.ModelService;
import org.apache.ofbiz.service.ServiceUtil;
-import org.jdom.JDOMException;
+import org.jdom2.JDOMException;
/**
* ScaleImage Class
diff --git
a/applications/product/src/main/java/org/apache/ofbiz/product/imagemanagement/FrameImage.java
b/applications/product/src/main/java/org/apache/ofbiz/product/imagemanagement/FrameImage.java
index 3a9beed..fc77f4a 100644
---
a/applications/product/src/main/java/org/apache/ofbiz/product/imagemanagement/FrameImage.java
+++
b/applications/product/src/main/java/org/apache/ofbiz/product/imagemanagement/FrameImage.java
@@ -59,7 +59,7 @@ import org.apache.ofbiz.service.DispatchContext;
import org.apache.ofbiz.service.GenericServiceException;
import org.apache.ofbiz.service.LocalDispatcher;
import org.apache.ofbiz.service.ServiceUtil;
-import org.jdom.JDOMException;
+import org.jdom2.JDOMException;
public class FrameImage {
diff --git
a/applications/product/src/main/java/org/apache/ofbiz/product/imagemanagement/ImageManagementServices.java
b/applications/product/src/main/java/org/apache/ofbiz/product/imagemanagement/ImageManagementServices.java
index 8bcf6f7..298f225 100644
---
a/applications/product/src/main/java/org/apache/ofbiz/product/imagemanagement/ImageManagementServices.java
+++
b/applications/product/src/main/java/org/apache/ofbiz/product/imagemanagement/ImageManagementServices.java
@@ -55,7 +55,7 @@ import org.apache.ofbiz.service.GenericServiceException;
import org.apache.ofbiz.service.LocalDispatcher;
import org.apache.ofbiz.service.ModelService;
import org.apache.ofbiz.service.ServiceUtil;
-import org.jdom.JDOMException;
+import org.jdom2.JDOMException;
/**
* Product Services
diff --git
a/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductServices.java
b/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductServices.java
index 1ee5804..4f7f31a 100644
---
a/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductServices.java
+++
b/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductServices.java
@@ -62,7 +62,7 @@ import org.apache.ofbiz.service.GenericServiceException;
import org.apache.ofbiz.service.LocalDispatcher;
import org.apache.ofbiz.service.ModelService;
import org.apache.ofbiz.service.ServiceUtil;
-import org.jdom.JDOMException;
+import org.jdom2.JDOMException;
/**
* Product Services
diff --git a/build.gradle b/build.gradle
index efdabb9..9ce0e06 100644
--- a/build.gradle
+++ b/build.gradle
@@ -202,13 +202,13 @@ dependencies {
implementation 'oro:oro:2.0.8'
implementation 'wsdl4j:wsdl4j:1.6.3'
implementation 'com.auth0:java-jwt:3.11.0'
- implementation 'org.jdom:jdom:2.0.0'
-
+ implementation 'org.jdom:jdom:2.0.2'
+
testImplementation 'org.hamcrest:hamcrest-library:2.2' // Enable junit4 to
not depend on hamcrest-1.3
testImplementation 'org.mockito:mockito-core:3.6.28'
testImplementation 'org.jmockit:jmockit:1.49'
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'
