[ofbiz-framework] branch trunk updated: Fixed: Update build.gradle to the latest dependencies (OFBIZ-12092)

[jleroux]

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 a0d8eb8  Fixed:  Update build.gradle to the latest dependencies 
(OFBIZ-12092)
a0d8eb8 is described below

commit a0d8eb86a0760a8e8dd0e14bd674472bdda3190c
Author: Jacques Le Roux <jacques.le.r...@les7arts.com>
AuthorDate: Sun Dec 20 13:52:28 2020 +0100

    Fixed:  Update build.gradle to the latest dependencies (OFBIZ-12092)
    
    Forget about upgrading org.jdom to v2 we need only JDOMException and it 
works
    as is. So this reverts to  org.jdom to v1. We still need the updated entry 
in
    build.gradle
    
    This fixes integration tests with framework only
---
 .../src/main/java/org/apache/ofbiz/product/image/ScaleImage.java        | 2 +-
 .../main/java/org/apache/ofbiz/product/imagemanagement/FrameImage.java  | 2 +-
 .../apache/ofbiz/product/imagemanagement/ImageManagementServices.java   | 2 +-
 .../src/main/java/org/apache/ofbiz/product/product/ProductServices.java | 2 +-
 build.gradle                                                            | 2 +-
 5 files changed, 5 insertions(+), 5 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 665fcae..cb8587d 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.jdom2.JDOMException;
+import org.jdom.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 fc77f4a..3a9beed 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.jdom2.JDOMException;
+import org.jdom.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 298f225..8bcf6f7 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.jdom2.JDOMException;
+import org.jdom.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 4f7f31a..1ee5804 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.jdom2.JDOMException;
+import org.jdom.JDOMException;
 
 /**
  * Product Services
diff --git a/build.gradle b/build.gradle
index 9ce0e06..b564a0e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -202,7 +202,7 @@ 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.2'
+    implementation 'org.jdom:jdom:1.1.3'
 
     testImplementation 'org.hamcrest:hamcrest-library:2.2' // Enable junit4 to 
not depend on hamcrest-1.3
     testImplementation 'org.mockito:mockito-core:3.6.28'