Skip to content

Commit bfdbf99

Browse files
authored
fix conflict errors with neo4j 2025.08 (#4468) (#4477)
* fix conflict errors with neo4j 2025.08 * wip * wip 2 * restored gradle * cleanup * cleanup * cleanup * reset code * changed gradle * removed unused file
1 parent a36f206 commit bfdbf99

File tree

13 files changed

+28
-8
lines changed

13 files changed

+28
-8
lines changed
9.29 KB
Binary file not shown.

extra-dependencies/build.gradle

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ext {
1919
commonExclusions = {
2020
// guava
2121
exclude group: 'com.google.guava', module: 'guava'
22-
22+
2323
// gson
2424
exclude group: 'com.google.code.gson', module: 'gson'
2525

@@ -33,6 +33,28 @@ ext {
3333
exclude group: 'org.apache.commons', module: 'commons-logging'
3434
exclude group: 'org.apache.commons', module: 'commons-text'
3535

36+
// jersey
37+
exclude group: 'com.sun.jersey', module: 'jersey-client'
38+
exclude group: 'com.sun.jersey', module: 'jersey-server'
39+
exclude group: 'com.sun.jersey', module: 'jersey-servlet'
40+
exclude group: 'com.sun.jersey', module: 'jersey-container-servlet'
41+
exclude group: 'com.sun.jersey', module: 'jersey-container-servlet-core'
42+
43+
// dnsjava
44+
exclude group: 'dnsjava', module: 'dnsjava'
45+
exclude group: 'org.xbill', module: 'dnsjava'
46+
47+
// jetty
48+
exclude group: 'org.eclipse.jetty', module: 'jetty-server'
49+
exclude group: 'org.eclipse.jetty', module: 'jetty-servlet'
50+
51+
// parquet
52+
exclude group: 'org.apache.parquet', module: 'parquet-hadoop'
53+
exclude group: 'org.apache.parquet', module: 'parquet-column'
54+
55+
// snappy
56+
exclude group: 'org.xerial.snappy', module: 'snappy-java'
57+
3658
// reactor-core
3759
exclude group: 'io.projectreactor', module: 'reactor-core'
3860

@@ -69,6 +91,7 @@ ext {
6991
exclude group: 'io.netty', module: 'netty-transport-native-kqueue'
7092
exclude group: 'io.netty', module: 'netty-transport-native-unix-common'
7193
exclude group: 'io.netty', module: 'netty-tcnative-classes'
94+
exclude group: 'io.netty', module: 'netty-all'
7295

7396
// javax
7497
exclude group: 'javax.servlet', module: 'javax.servlet-api'
9.29 KB
Binary file not shown.
9.29 KB
Binary file not shown.
9.29 KB
Binary file not shown.

extra-dependencies/hadoop/build.gradle

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,10 @@ dependencies {
3131
// the hadoop-hdfs-client and hadoop-common use by default the deprecated javax.servlet-api dependency
3232
implementation group: 'jakarta.servlet', name: 'jakarta.servlet-api', version: '6.1.0', commonExclusions
3333

34-
implementation group: 'org.apache.hadoop', name: 'hadoop-hdfs-client', version: '3.4.0', commonExclusions
35-
implementation group: 'org.apache.hadoop', name: 'hadoop-common', version: '3.4.0', commonExclusions
36-
implementation group: 'com.google.protobuf', name: 'protobuf-java', version: '3.23.1', commonExclusions
34+
implementation group: 'org.apache.hadoop', name: 'hadoop-hdfs-client', version: '3.4.2', commonExclusions
35+
implementation group: 'org.apache.hadoop', name: 'hadoop-common', version: '3.4.2', commonExclusions
3736

38-
implementation group: 'org.apache.parquet', name: 'parquet-hadoop', version: '1.13.1', commonExclusions
39-
implementation group: 'org.apache.parquet', name: 'parquet-column', version: '1.13.1', commonExclusions
40-
implementation group: 'org.apache.hadoop', name: 'hadoop-mapreduce-client-core', version: '3.4.0', commonExclusions
37+
implementation group: 'org.apache.hadoop', name: 'hadoop-mapreduce-client-core', version: '3.4.2', commonExclusions
4138
}
4239

4340

9.29 KB
Binary file not shown.
9.29 KB
Binary file not shown.
9.29 KB
Binary file not shown.
9.29 KB
Binary file not shown.

0 commit comments

Comments
 (0)