From 171f92c73b54e3cca959a54e661e56f0c614346e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anton=20Klar=C3=A9n?= <anton.klaren@neotechnology.com>
Date: Fri, 23 Feb 2024 14:44:31 +0100
Subject: [PATCH] [NOID] Rely on neo4j provided libraries instead of shading
---
common/build.gradle | 9 ++-------
core/build.gradle | 8 ++++----
2 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/common/build.gradle b/common/build.gradle
index 6bb60ae67..913fadecd 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -32,13 +32,6 @@ dependencies {
// We need this to avoid seeing SLF4J: Failed to load class "org.slf4j.impl.StaticLoggerBinder" on startup
api group: 'org.slf4j', name: 'slf4j-api', version: '2.0.9'
- // We need to force this dependency's version due to a vulnerability https://github.com/neo4j-contrib/neo4j-apoc-procedures/issues/3048
- api group: 'org.apache.commons', name: 'commons-lang3', {
- version {
- strictly '3.14.0'
- }
- }
- api group: 'com.github.seancfoley', name: 'ipaddress', version: '5.3.3'
// These will be dependencies not packaged with the .jar
// They need to be provided either through the database or in an extra .jar
@@ -49,6 +42,8 @@ dependencies {
// and remove the manual licensing check for it in licenses-3rdparties.gradle
compileOnly group: 'org.apache.hadoop', name: 'hadoop-common', version: '3.3.6', withoutServers
compileOnly group: 'com.google.cloud', name: 'google-cloud-storage', version: '2.26.1'
+ compileOnly group: 'com.github.seancfoley', name: 'ipaddress', version: '5.3.3'
+ compileOnly group: 'org.apache.commons', name: 'commons-lang3', version: '3.14.0'
// These dependencies affect the tests only, they will not be packaged in the resulting .jar
testImplementation project(':test-utils')
diff --git a/core/build.gradle b/core/build.gradle
index 020d4fae2..7cfbbbdd2 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -40,7 +40,6 @@ dependencies {
implementation project(":common")
implementation group: 'com.opencsv', name: 'opencsv', version: '5.7.1'
implementation group: 'org.roaringbitmap', name: 'RoaringBitmap', version: '0.7.17'
- implementation group: 'com.google.guava', name: 'guava', version: '32.0.1-jre'
def arrowExclusions = {
exclude group: 'com.fasterxml.jackson.core', module: 'jackson-core'
@@ -50,12 +49,13 @@ dependencies {
exclude group: 'io.netty', module: 'netty-buffer'
}
- implementation group: 'org.apache.arrow', name: 'arrow-vector', version: '15.0.0', arrowExclusions
- implementation group: 'org.apache.arrow', name: 'arrow-memory-netty', version: '15.0.0', arrowExclusions
-
// These will be dependencies not packaged with the .jar
// They need to be provided either through the database or in an extra .jar
+ compileOnly group: 'org.apache.arrow', name: 'arrow-vector', version: '15.0.0', arrowExclusions
+ compileOnly group: 'org.apache.arrow', name: 'arrow-memory-netty', version: '15.0.0', arrowExclusions
+
compileOnly group: 'org.neo4j', name: 'neo4j', version: neo4jVersionEffective
+ compileOnly group: 'com.google.guava', name: 'guava', version: '33.0.0-jre'
// These dependencies affect the tests only, they will not be packaged in the resulting .jar
testImplementation project(":common").sourceSets.test.output