Update dependencies and remove unnecessary excludes

Dependency versions have been updated and unnecessary excludes have been removed. Requirement for 'commons.validator' has been replaced with 'org.apache.commons.validator'. Dependencies for 'retrofit2' and 'okttp3' have been removed. 'commons-logging' exclusion has been removed from 'commons-validator' and 'retrofit' in the 'gemsfx' module and from 'gemsfx' in the 'gemsfx-demo' module.
dlsc-software-consulting-gmbh · May 21, 2024 · 37c0ea3 · 37c0ea3
1 parent b423a9f
commit 37c0ea3
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 29 deletions.
diff --git a/gemsfx-demo/pom.xml b/gemsfx-demo/pom.xml
@@ -146,12 +146,6 @@
             <groupId>com.dlsc.gemsfx</groupId>
             <artifactId>gemsfx</artifactId>
             <version>2.17.0</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <dependency>
@@ -164,7 +158,6 @@
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
-            <version>1.2</version>
         </dependency>
 
         <dependency>

diff --git a/gemsfx/pom.xml b/gemsfx/pom.xml
@@ -72,25 +72,7 @@
         <dependency>
             <groupId>commons-validator</groupId>
             <artifactId>commons-validator</artifactId>
-            <version>1.7</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>com.squareup.retrofit2</groupId>
-            <artifactId>retrofit</artifactId>
-            <version>2.6.1</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
-            </exclusions>
+            <version>1.8.0</version>
         </dependency>
 
         <dependency>

diff --git a/gemsfx/src/main/java/module-info.java b/gemsfx/src/main/java/module-info.java
@@ -15,13 +15,11 @@
     requires java.logging;
     requires java.prefs;
 
-    requires commons.validator;
+    requires org.apache.commons.validator;
     requires net.synedra.validatorfx;
     requires org.apache.commons.lang3;
     requires org.controlsfx.controls;
 
-    requires retrofit2;
-    requires okhttp3;
     requires java.desktop;
     requires com.dlsc.pickerfx;
     requires com.dlsc.unitfx;

diff --git a/pom.xml b/pom.xml
@@ -82,6 +82,12 @@
                 <version>1.2.0</version>
             </dependency>
 
+            <dependency>
+                <groupId>commons-logging</groupId>
+                <artifactId>commons-logging</artifactId>
+                <version>1.3.0</version>
+            </dependency>
+
             <dependency>
                 <groupId>org.openjfx</groupId>
                 <artifactId>javafx-graphics</artifactId>