Skip to content

Commit 6d1dba4

Browse files
authored
fix conflict errors with neo4j 5.26.12 (#4468) (#4472)
* fix conflict errors with neo4j 2025.08 * wip * wip 2 * restored gradle * cleanup * cleanup * cleanup * reset code * changed gradle * removed unused file
1 parent bbc42a9 commit 6d1dba4

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
@@ -17,7 +17,7 @@ ext {
1717
commonExclusions = {
1818
// guava
1919
exclude group: 'com.google.guava', module: 'guava'
20-
20+
2121
// gson
2222
exclude group: 'com.google.code.gson', module: 'gson'
2323

@@ -31,6 +31,28 @@ ext {
3131
exclude group: 'org.apache.commons', module: 'commons-logging'
3232
exclude group: 'org.apache.commons', module: 'commons-text'
3333

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

@@ -67,6 +89,7 @@ ext {
6789
exclude group: 'io.netty', module: 'netty-transport-native-kqueue'
6890
exclude group: 'io.netty', module: 'netty-transport-native-unix-common'
6991
exclude group: 'io.netty', module: 'netty-tcnative-classes'
92+
exclude group: 'io.netty', module: 'netty-all'
7093

7194
// javax
7295
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)