[Io7UetI2] Fix log4j dependency conflict.

Also improve MissingDependencyException with cause where possible.
neo4j-contrib · Sep 30, 2024 · 2b80723 · 2b80723
1 parent 2fb26c5
commit 2b80723
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 14 deletions.
diff --git a/core/src/main/java/apoc/util/MissingDependencyException.java b/core/src/main/java/apoc/util/MissingDependencyException.java
@@ -25,4 +25,8 @@ public class MissingDependencyException extends RuntimeException {
     public MissingDependencyException(String message) {
         super(message);
     }
+
+    public MissingDependencyException(String message, Throwable cause) {
+        super(message, cause);
+    }
 }
diff --git a/extra-dependencies/xls/build.gradle b/extra-dependencies/xls/build.gradle
@@ -20,11 +20,21 @@ jar {
 }
 
 dependencies {
-    implementation group: 'org.apache.poi', name: 'poi', version: '5.3.0'
-    implementation group: 'org.apache.poi', name: 'poi-ooxml-lite', version: '5.3.0'
-    implementation group: 'org.apache.poi', name: 'poi-ooxml', version: '5.3.0' , {
-        exclude group: 'org.apache.commons', module: 'commons-compress' 
+    // Make sure no transitive dependencies are included together with apache.poi
+
+    compileOnly "org.apache.poi:poi:5.3.0", {
+        exclude group: '*'
+    }
+    testImplementation "org.apache.poi:poi:5.3.0", {
+        exclude group: '*'
+    }
+    compileOnly "org.apache.poi:poi-ooxml:5.3.0", {
+        exclude group: '*'
     }
+    testImplementation "org.apache.poi:poi-ooxml:5.3.0", {
+        exclude group: '*'
+    }
+
     implementation group: 'org.apache.xmlbeans', name: 'xmlbeans', version: '5.0.2'
     implementation group: 'com.github.virtuald', name: 'curvesapi', version: '1.06'
     implementation group: 'org.apache.commons', name: 'commons-collections4', version: '4.4'

diff --git a/full/build.gradle b/full/build.gradle
@@ -64,10 +64,20 @@ dependencies {
     // compileOnly "org.antlr:antlr4-runtime:4.7.2"
     // testCompile "org.antlr:antlr4-runtime:4.7.2"
 
-    compileOnly "org.apache.poi:poi:5.3.0"
-    testImplementation "org.apache.poi:poi:5.3.0"
-    compileOnly "org.apache.poi:poi-ooxml:5.3.0"
-    testImplementation "org.apache.poi:poi-ooxml:5.3.0"
+    // Make sure no transitive dependencies are included together with apache.poi
+
+    compileOnly "org.apache.poi:poi:5.3.0", {
+        exclude group: '*'
+    }
+    testImplementation "org.apache.poi:poi:5.3.0", {
+        exclude group: '*'
+    }
+    compileOnly "org.apache.poi:poi-ooxml:5.3.0", {
+        exclude group: '*'
+    }
+    testImplementation "org.apache.poi:poi-ooxml:5.3.0", {
+        exclude group: '*'
+    }
 
     implementation 'org.jsoup:jsoup:1.15.3'
 

diff --git a/full/src/main/java/apoc/couchbase/Couchbase.java b/full/src/main/java/apoc/couchbase/Couchbase.java
@@ -400,7 +400,7 @@ private CouchbaseConnection getCouchbaseConnection(String hostOrKey, String buck
             CouchbaseConfig config = new CouchbaseConfig(configMap);
             return CouchbaseManager.getConnection(hostOrKey, bucket, config);
         } catch (NoClassDefFoundError e) {
-            throw new MissingDependencyException(COUCHBASE_MISSING_DEPS_ERROR);
+            throw new MissingDependencyException(COUCHBASE_MISSING_DEPS_ERROR, e);
         }
     }
 }
diff --git a/full/src/main/java/apoc/data/email/ExtractEmail.java b/full/src/main/java/apoc/data/email/ExtractEmail.java
@@ -41,7 +41,7 @@ public Map<String, String> email(final @Name("email_address") String value) {
         try {
             return extractEmail(value);
         } catch (NoClassDefFoundError e) {
-            throw new MissingDependencyException(EMAIL_MISSING_DEPS_ERROR);
+            throw new MissingDependencyException(EMAIL_MISSING_DEPS_ERROR, e);
         }
     }
 }
diff --git a/full/src/main/java/apoc/export/xls/ExportXls.java b/full/src/main/java/apoc/export/xls/ExportXls.java
@@ -111,7 +111,7 @@ private Stream<ProgressInfo> exportXls(
         try {
             return ExportXlsHandler.getProgressInfoStream(fileName, source, data, configMap, apocConfig, db);
         } catch (NoClassDefFoundError e) {
-            throw new MissingDependencyException(XLS_MISSING_DEPS_ERROR);
+            throw new MissingDependencyException(XLS_MISSING_DEPS_ERROR, e);
         }
     }
 }
diff --git a/full/src/main/java/apoc/load/LoadXls.java b/full/src/main/java/apoc/load/LoadXls.java
@@ -149,7 +149,7 @@ public Stream<XLSResult> xls(
                     url, stream, selection, skip, hasHeader, limit, ignore, nullValues, mappings, skipNulls);
             return StreamSupport.stream(xlsSpliterator, false);
         } catch (NoClassDefFoundError e) {
-            throw new MissingDependencyException(XLS_MISSING_DEPS_ERROR);
+            throw new MissingDependencyException(XLS_MISSING_DEPS_ERROR, e);
         } catch (Exception e) {
             if (!failOnError)
                 return Stream.of(

diff --git a/full/src/main/java/apoc/mongodb/MongoDBUtils.java b/full/src/main/java/apoc/mongodb/MongoDBUtils.java
@@ -56,7 +56,7 @@ protected static MongoDbConfig getMongoConfig(Map<String, Object> config) {
         try {
             return new MongoDbConfig(config);
         } catch (NoClassDefFoundError e) {
-            throw new MissingDependencyException(MONGO_MISSING_DEPS_ERROR);
+            throw new MissingDependencyException(MONGO_MISSING_DEPS_ERROR, e);
         }
     }
 }
diff --git a/full/src/main/java/apoc/redis/RedisConfig.java b/full/src/main/java/apoc/redis/RedisConfig.java
@@ -49,7 +49,7 @@ public RedisConnection getRedisConnection(String uri, Map<String, Object> config
                 Constructor<?> constructor = redisConnectionClass.getConstructor(String.class, RedisConfig.class);
                 return (RedisConnection) constructor.newInstance(uri, redisConfig);
             } catch (NoClassDefFoundError e) {
-                throw new MissingDependencyException(REDIS_MISSING_DEPS_ERROR);
+                throw new MissingDependencyException(REDIS_MISSING_DEPS_ERROR, e);
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }