Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 36 additions & 35 deletions LICENSES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -167,42 +167,43 @@ Apache-2.0
lucene-queryparser-9.11.1.jar
magnolia_2.13-1.1.8.jar
metrics-core-3.2.4.jar
netty-all-4.1.101.Final.jar
netty-buffer-4.1.101.Final.jar
netty-codec-4.1.101.Final.jar
netty-codec-dns-4.1.101.Final.jar
netty-codec-haproxy-4.1.101.Final.jar
netty-codec-http-4.1.101.Final.jar
netty-codec-http2-4.1.101.Final.jar
netty-codec-memcache-4.1.101.Final.jar
netty-codec-mqtt-4.1.101.Final.jar
netty-codec-redis-4.1.101.Final.jar
netty-codec-smtp-4.1.101.Final.jar
netty-codec-socks-4.1.101.Final.jar
netty-codec-stomp-4.1.101.Final.jar
netty-codec-xml-4.1.101.Final.jar
netty-common-4.1.101.Final.jar
netty-handler-4.1.101.Final.jar
netty-handler-proxy-4.1.101.Final.jar
netty-handler-ssl-ocsp-4.1.101.Final.jar
netty-resolver-4.1.101.Final.jar
netty-resolver-dns-4.1.101.Final.jar
netty-resolver-dns-classes-macos-4.1.101.Final.jar
netty-resolver-dns-native-macos-4.1.101.Final-osx-aarch_64.jar
netty-resolver-dns-native-macos-4.1.101.Final-osx-x86_64.jar
netty-all-4.1.105.Final.jar
netty-buffer-4.1.105.Final.jar
netty-codec-4.1.105.Final.jar
netty-codec-dns-4.1.105.Final.jar
netty-codec-haproxy-4.1.105.Final.jar
netty-codec-http-4.1.105.Final.jar
netty-codec-http2-4.1.105.Final.jar
netty-codec-memcache-4.1.105.Final.jar
netty-codec-mqtt-4.1.105.Final.jar
netty-codec-redis-4.1.105.Final.jar
netty-codec-smtp-4.1.105.Final.jar
netty-codec-socks-4.1.105.Final.jar
netty-codec-stomp-4.1.105.Final.jar
netty-codec-xml-4.1.105.Final.jar
netty-common-4.1.105.Final.jar
netty-handler-4.1.105.Final.jar
netty-handler-proxy-4.1.105.Final.jar
netty-handler-ssl-ocsp-4.1.105.Final.jar
netty-resolver-4.1.105.Final.jar
netty-resolver-dns-4.1.105.Final.jar
netty-resolver-dns-classes-macos-4.1.105.Final.jar
netty-resolver-dns-native-macos-4.1.105.Final-osx-aarch_64.jar
netty-resolver-dns-native-macos-4.1.105.Final-osx-x86_64.jar
netty-tcnative-classes-2.0.70.Final.jar
netty-transport-4.1.101.Final.jar
netty-transport-classes-epoll-4.1.101.Final.jar
netty-transport-classes-kqueue-4.1.101.Final.jar
netty-transport-native-epoll-4.1.101.Final-linux-aarch_64.jar
netty-transport-native-epoll-4.1.101.Final-linux-x86_64.jar
netty-transport-native-epoll-4.1.101.Final.jar
netty-transport-native-kqueue-4.1.101.Final-osx-aarch_64.jar
netty-transport-native-kqueue-4.1.101.Final-osx-x86_64.jar
netty-transport-native-unix-common-4.1.101.Final.jar
netty-transport-rxtx-4.1.101.Final.jar
netty-transport-sctp-4.1.101.Final.jar
netty-transport-udt-4.1.101.Final.jar
netty-transport-4.1.105.Final.jar
netty-transport-classes-epoll-4.1.105.Final.jar
netty-transport-classes-kqueue-4.1.105.Final.jar
netty-transport-native-epoll-4.1.105.Final-linux-aarch_64.jar
netty-transport-native-epoll-4.1.105.Final-linux-riscv64.jar
netty-transport-native-epoll-4.1.105.Final-linux-x86_64.jar
netty-transport-native-epoll-4.1.105.Final.jar
netty-transport-native-kqueue-4.1.105.Final-osx-aarch_64.jar
netty-transport-native-kqueue-4.1.105.Final-osx-x86_64.jar
netty-transport-native-unix-common-4.1.105.Final.jar
netty-transport-rxtx-4.1.105.Final.jar
netty-transport-sctp-4.1.105.Final.jar
netty-transport-udt-4.1.105.Final.jar
nimbus-jose-jwt-9.37.2.jar
objenesis-3.3.jar
opencsv-5.7.1.jar
Expand Down
71 changes: 36 additions & 35 deletions NOTICE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -197,42 +197,43 @@ Apache-2.0
lucene-queryparser-9.11.1.jar
magnolia_2.13-1.1.8.jar
metrics-core-3.2.4.jar
netty-all-4.1.101.Final.jar
netty-buffer-4.1.101.Final.jar
netty-codec-4.1.101.Final.jar
netty-codec-dns-4.1.101.Final.jar
netty-codec-haproxy-4.1.101.Final.jar
netty-codec-http-4.1.101.Final.jar
netty-codec-http2-4.1.101.Final.jar
netty-codec-memcache-4.1.101.Final.jar
netty-codec-mqtt-4.1.101.Final.jar
netty-codec-redis-4.1.101.Final.jar
netty-codec-smtp-4.1.101.Final.jar
netty-codec-socks-4.1.101.Final.jar
netty-codec-stomp-4.1.101.Final.jar
netty-codec-xml-4.1.101.Final.jar
netty-common-4.1.101.Final.jar
netty-handler-4.1.101.Final.jar
netty-handler-proxy-4.1.101.Final.jar
netty-handler-ssl-ocsp-4.1.101.Final.jar
netty-resolver-4.1.101.Final.jar
netty-resolver-dns-4.1.101.Final.jar
netty-resolver-dns-classes-macos-4.1.101.Final.jar
netty-resolver-dns-native-macos-4.1.101.Final-osx-aarch_64.jar
netty-resolver-dns-native-macos-4.1.101.Final-osx-x86_64.jar
netty-all-4.1.105.Final.jar
netty-buffer-4.1.105.Final.jar
netty-codec-4.1.105.Final.jar
netty-codec-dns-4.1.105.Final.jar
netty-codec-haproxy-4.1.105.Final.jar
netty-codec-http-4.1.105.Final.jar
netty-codec-http2-4.1.105.Final.jar
netty-codec-memcache-4.1.105.Final.jar
netty-codec-mqtt-4.1.105.Final.jar
netty-codec-redis-4.1.105.Final.jar
netty-codec-smtp-4.1.105.Final.jar
netty-codec-socks-4.1.105.Final.jar
netty-codec-stomp-4.1.105.Final.jar
netty-codec-xml-4.1.105.Final.jar
netty-common-4.1.105.Final.jar
netty-handler-4.1.105.Final.jar
netty-handler-proxy-4.1.105.Final.jar
netty-handler-ssl-ocsp-4.1.105.Final.jar
netty-resolver-4.1.105.Final.jar
netty-resolver-dns-4.1.105.Final.jar
netty-resolver-dns-classes-macos-4.1.105.Final.jar
netty-resolver-dns-native-macos-4.1.105.Final-osx-aarch_64.jar
netty-resolver-dns-native-macos-4.1.105.Final-osx-x86_64.jar
netty-tcnative-classes-2.0.70.Final.jar
netty-transport-4.1.101.Final.jar
netty-transport-classes-epoll-4.1.101.Final.jar
netty-transport-classes-kqueue-4.1.101.Final.jar
netty-transport-native-epoll-4.1.101.Final-linux-aarch_64.jar
netty-transport-native-epoll-4.1.101.Final-linux-x86_64.jar
netty-transport-native-epoll-4.1.101.Final.jar
netty-transport-native-kqueue-4.1.101.Final-osx-aarch_64.jar
netty-transport-native-kqueue-4.1.101.Final-osx-x86_64.jar
netty-transport-native-unix-common-4.1.101.Final.jar
netty-transport-rxtx-4.1.101.Final.jar
netty-transport-sctp-4.1.101.Final.jar
netty-transport-udt-4.1.101.Final.jar
netty-transport-4.1.105.Final.jar
netty-transport-classes-epoll-4.1.105.Final.jar
netty-transport-classes-kqueue-4.1.105.Final.jar
netty-transport-native-epoll-4.1.105.Final-linux-aarch_64.jar
netty-transport-native-epoll-4.1.105.Final-linux-riscv64.jar
netty-transport-native-epoll-4.1.105.Final-linux-x86_64.jar
netty-transport-native-epoll-4.1.105.Final.jar
netty-transport-native-kqueue-4.1.105.Final-osx-aarch_64.jar
netty-transport-native-kqueue-4.1.105.Final-osx-x86_64.jar
netty-transport-native-unix-common-4.1.105.Final.jar
netty-transport-rxtx-4.1.105.Final.jar
netty-transport-sctp-4.1.105.Final.jar
netty-transport-udt-4.1.105.Final.jar
nimbus-jose-jwt-9.37.2.jar
objenesis-3.3.jar
opencsv-5.7.1.jar
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ subprojects {
configurations.configureEach {
resolutionStrategy.eachDependency { details ->
if (details.requested.group == 'io.netty' && !details.requested.name.contains('netty-tcnative') && !details.requested.name.equals('netty')) {
details.useVersion '4.1.101.Final' // Use same Netty version as server
details.useVersion '4.1.105.Final' // Use same Netty version as server
}
}
}
Expand All @@ -172,5 +172,5 @@ ext {
publicDir = "${project.rootDir}"
neo4jVersionEffective = project.hasProperty("neo4jVersionOverride") ? project.getProperty("neo4jVersionOverride") : "5.26.11"
testContainersVersion = '1.20.2'
apacheArrowVersion = '15.0.0'
apacheArrowVersion = '17.0.0'
}
2 changes: 1 addition & 1 deletion common/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ dependencies {
// If updated check if the transitive dependency to javax.servlet.jsp:jsp-api:2.1 has also updated
// and remove the manual licensing check for it in licenses-3rdparties.gradle
compileOnly group: 'org.apache.hadoop', name: 'hadoop-common', version: '3.4.1', withoutServers
compileOnly group: 'com.google.cloud', name: 'google-cloud-storage', version: '2.26.1'
compileOnly group: 'com.google.cloud', name: 'google-cloud-storage', version: '2.54.0'
compileOnly group: 'com.github.seancfoley', name: 'ipaddress', version: '5.3.3'
compileOnly group: 'org.apache.commons', name: 'commons-lang3', version: '3.14.0'

Expand Down
13 changes: 11 additions & 2 deletions test-utils/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ dependencies {
api group: 'org.hamcrest', name: 'hamcrest-library', version: '2.2'
api group: 'org.neo4j.community', name: 'it-test-support', version: neo4jVersionEffective // , classifier: "tests"
api group: 'org.neo4j', name: 'log-test-utils', version: neo4jVersionEffective // , classifier: "tests"
api group: 'org.neo4j.driver', name: 'neo4j-java-driver', version: '5.18.0'
api group: 'org.neo4j.driver', name: 'neo4j-java-driver', version: '5.28.2'
api group: 'org.apache.hadoop', name: 'hadoop-hdfs', version: '3.4.1', withoutServers.andThen(withoutLoggers)
// If updated check if the transitive dependency to javax.servlet.jsp:jsp-api:2.1 has also updated
// and remove the manual licensing check for it in licenses-3rdparties.gradle
Expand All @@ -44,7 +44,16 @@ dependencies {
api group: 'org.testcontainers', name: 'cassandra', version: testContainersVersion
api group: 'org.testcontainers', name: 'localstack', version: testContainersVersion
api group: 'org.apache.arrow', name: 'arrow-vector', version: apacheArrowVersion
api group: 'org.apache.arrow', name: 'arrow-memory-netty', version: apacheArrowVersion

def arrowExclusions = {
exclude group: 'com.fasterxml.jackson.core', module: 'jackson-core'
exclude group: 'com.fasterxml.jackson.core', module: 'jackson-annotations'
exclude group: 'com.fasterxml.jackson.core', module: 'jackson-databind'
exclude group: 'io.netty', module: 'netty-common'
exclude group: 'io.netty', module: 'netty-buffer'
}

api group: 'org.apache.arrow', name: 'arrow-memory-netty', version: apacheArrowVersion, arrowExclusions

implementation project(":common")
implementation group: 'org.neo4j', name: 'neo4j-common', version: neo4jVersionEffective, classifier: "tests"
Expand Down
Loading