Skip to content

Commit

Permalink
[NOID] Rely on neo4j provided libraries instead of shading
Browse files Browse the repository at this point in the history
  • Loading branch information
klaren committed Feb 26, 2024
1 parent 3c568c5 commit 97dd5cb
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 11 deletions.
9 changes: 2 additions & 7 deletions common/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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')
Expand Down
8 changes: 4 additions & 4 deletions core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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: '13.0.0', arrowExclusions
compileOnly group: 'org.apache.arrow', name: 'arrow-memory-netty', version: '13.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
Expand Down

0 comments on commit 97dd5cb

Please sign in to comment.