Skip to content

Commit 87cfbf6

Browse files
authored
Update Google cloud storage (#821)
1 parent 747e829 commit 87cfbf6

File tree

5 files changed

+86
-75
lines changed

5 files changed

+86
-75
lines changed

LICENSES.txt

Lines changed: 36 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -167,42 +167,43 @@ Apache-2.0
167167
lucene-queryparser-9.11.1.jar
168168
magnolia_2.13-1.1.8.jar
169169
metrics-core-3.2.4.jar
170-
netty-all-4.1.101.Final.jar
171-
netty-buffer-4.1.101.Final.jar
172-
netty-codec-4.1.101.Final.jar
173-
netty-codec-dns-4.1.101.Final.jar
174-
netty-codec-haproxy-4.1.101.Final.jar
175-
netty-codec-http-4.1.101.Final.jar
176-
netty-codec-http2-4.1.101.Final.jar
177-
netty-codec-memcache-4.1.101.Final.jar
178-
netty-codec-mqtt-4.1.101.Final.jar
179-
netty-codec-redis-4.1.101.Final.jar
180-
netty-codec-smtp-4.1.101.Final.jar
181-
netty-codec-socks-4.1.101.Final.jar
182-
netty-codec-stomp-4.1.101.Final.jar
183-
netty-codec-xml-4.1.101.Final.jar
184-
netty-common-4.1.101.Final.jar
185-
netty-handler-4.1.101.Final.jar
186-
netty-handler-proxy-4.1.101.Final.jar
187-
netty-handler-ssl-ocsp-4.1.101.Final.jar
188-
netty-resolver-4.1.101.Final.jar
189-
netty-resolver-dns-4.1.101.Final.jar
190-
netty-resolver-dns-classes-macos-4.1.101.Final.jar
191-
netty-resolver-dns-native-macos-4.1.101.Final-osx-aarch_64.jar
192-
netty-resolver-dns-native-macos-4.1.101.Final-osx-x86_64.jar
170+
netty-all-4.1.105.Final.jar
171+
netty-buffer-4.1.105.Final.jar
172+
netty-codec-4.1.105.Final.jar
173+
netty-codec-dns-4.1.105.Final.jar
174+
netty-codec-haproxy-4.1.105.Final.jar
175+
netty-codec-http-4.1.105.Final.jar
176+
netty-codec-http2-4.1.105.Final.jar
177+
netty-codec-memcache-4.1.105.Final.jar
178+
netty-codec-mqtt-4.1.105.Final.jar
179+
netty-codec-redis-4.1.105.Final.jar
180+
netty-codec-smtp-4.1.105.Final.jar
181+
netty-codec-socks-4.1.105.Final.jar
182+
netty-codec-stomp-4.1.105.Final.jar
183+
netty-codec-xml-4.1.105.Final.jar
184+
netty-common-4.1.105.Final.jar
185+
netty-handler-4.1.105.Final.jar
186+
netty-handler-proxy-4.1.105.Final.jar
187+
netty-handler-ssl-ocsp-4.1.105.Final.jar
188+
netty-resolver-4.1.105.Final.jar
189+
netty-resolver-dns-4.1.105.Final.jar
190+
netty-resolver-dns-classes-macos-4.1.105.Final.jar
191+
netty-resolver-dns-native-macos-4.1.105.Final-osx-aarch_64.jar
192+
netty-resolver-dns-native-macos-4.1.105.Final-osx-x86_64.jar
193193
netty-tcnative-classes-2.0.70.Final.jar
194-
netty-transport-4.1.101.Final.jar
195-
netty-transport-classes-epoll-4.1.101.Final.jar
196-
netty-transport-classes-kqueue-4.1.101.Final.jar
197-
netty-transport-native-epoll-4.1.101.Final-linux-aarch_64.jar
198-
netty-transport-native-epoll-4.1.101.Final-linux-x86_64.jar
199-
netty-transport-native-epoll-4.1.101.Final.jar
200-
netty-transport-native-kqueue-4.1.101.Final-osx-aarch_64.jar
201-
netty-transport-native-kqueue-4.1.101.Final-osx-x86_64.jar
202-
netty-transport-native-unix-common-4.1.101.Final.jar
203-
netty-transport-rxtx-4.1.101.Final.jar
204-
netty-transport-sctp-4.1.101.Final.jar
205-
netty-transport-udt-4.1.101.Final.jar
194+
netty-transport-4.1.105.Final.jar
195+
netty-transport-classes-epoll-4.1.105.Final.jar
196+
netty-transport-classes-kqueue-4.1.105.Final.jar
197+
netty-transport-native-epoll-4.1.105.Final-linux-aarch_64.jar
198+
netty-transport-native-epoll-4.1.105.Final-linux-riscv64.jar
199+
netty-transport-native-epoll-4.1.105.Final-linux-x86_64.jar
200+
netty-transport-native-epoll-4.1.105.Final.jar
201+
netty-transport-native-kqueue-4.1.105.Final-osx-aarch_64.jar
202+
netty-transport-native-kqueue-4.1.105.Final-osx-x86_64.jar
203+
netty-transport-native-unix-common-4.1.105.Final.jar
204+
netty-transport-rxtx-4.1.105.Final.jar
205+
netty-transport-sctp-4.1.105.Final.jar
206+
netty-transport-udt-4.1.105.Final.jar
206207
nimbus-jose-jwt-9.37.2.jar
207208
objenesis-3.3.jar
208209
opencsv-5.7.1.jar

NOTICE.txt

Lines changed: 36 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -197,42 +197,43 @@ Apache-2.0
197197
lucene-queryparser-9.11.1.jar
198198
magnolia_2.13-1.1.8.jar
199199
metrics-core-3.2.4.jar
200-
netty-all-4.1.101.Final.jar
201-
netty-buffer-4.1.101.Final.jar
202-
netty-codec-4.1.101.Final.jar
203-
netty-codec-dns-4.1.101.Final.jar
204-
netty-codec-haproxy-4.1.101.Final.jar
205-
netty-codec-http-4.1.101.Final.jar
206-
netty-codec-http2-4.1.101.Final.jar
207-
netty-codec-memcache-4.1.101.Final.jar
208-
netty-codec-mqtt-4.1.101.Final.jar
209-
netty-codec-redis-4.1.101.Final.jar
210-
netty-codec-smtp-4.1.101.Final.jar
211-
netty-codec-socks-4.1.101.Final.jar
212-
netty-codec-stomp-4.1.101.Final.jar
213-
netty-codec-xml-4.1.101.Final.jar
214-
netty-common-4.1.101.Final.jar
215-
netty-handler-4.1.101.Final.jar
216-
netty-handler-proxy-4.1.101.Final.jar
217-
netty-handler-ssl-ocsp-4.1.101.Final.jar
218-
netty-resolver-4.1.101.Final.jar
219-
netty-resolver-dns-4.1.101.Final.jar
220-
netty-resolver-dns-classes-macos-4.1.101.Final.jar
221-
netty-resolver-dns-native-macos-4.1.101.Final-osx-aarch_64.jar
222-
netty-resolver-dns-native-macos-4.1.101.Final-osx-x86_64.jar
200+
netty-all-4.1.105.Final.jar
201+
netty-buffer-4.1.105.Final.jar
202+
netty-codec-4.1.105.Final.jar
203+
netty-codec-dns-4.1.105.Final.jar
204+
netty-codec-haproxy-4.1.105.Final.jar
205+
netty-codec-http-4.1.105.Final.jar
206+
netty-codec-http2-4.1.105.Final.jar
207+
netty-codec-memcache-4.1.105.Final.jar
208+
netty-codec-mqtt-4.1.105.Final.jar
209+
netty-codec-redis-4.1.105.Final.jar
210+
netty-codec-smtp-4.1.105.Final.jar
211+
netty-codec-socks-4.1.105.Final.jar
212+
netty-codec-stomp-4.1.105.Final.jar
213+
netty-codec-xml-4.1.105.Final.jar
214+
netty-common-4.1.105.Final.jar
215+
netty-handler-4.1.105.Final.jar
216+
netty-handler-proxy-4.1.105.Final.jar
217+
netty-handler-ssl-ocsp-4.1.105.Final.jar
218+
netty-resolver-4.1.105.Final.jar
219+
netty-resolver-dns-4.1.105.Final.jar
220+
netty-resolver-dns-classes-macos-4.1.105.Final.jar
221+
netty-resolver-dns-native-macos-4.1.105.Final-osx-aarch_64.jar
222+
netty-resolver-dns-native-macos-4.1.105.Final-osx-x86_64.jar
223223
netty-tcnative-classes-2.0.70.Final.jar
224-
netty-transport-4.1.101.Final.jar
225-
netty-transport-classes-epoll-4.1.101.Final.jar
226-
netty-transport-classes-kqueue-4.1.101.Final.jar
227-
netty-transport-native-epoll-4.1.101.Final-linux-aarch_64.jar
228-
netty-transport-native-epoll-4.1.101.Final-linux-x86_64.jar
229-
netty-transport-native-epoll-4.1.101.Final.jar
230-
netty-transport-native-kqueue-4.1.101.Final-osx-aarch_64.jar
231-
netty-transport-native-kqueue-4.1.101.Final-osx-x86_64.jar
232-
netty-transport-native-unix-common-4.1.101.Final.jar
233-
netty-transport-rxtx-4.1.101.Final.jar
234-
netty-transport-sctp-4.1.101.Final.jar
235-
netty-transport-udt-4.1.101.Final.jar
224+
netty-transport-4.1.105.Final.jar
225+
netty-transport-classes-epoll-4.1.105.Final.jar
226+
netty-transport-classes-kqueue-4.1.105.Final.jar
227+
netty-transport-native-epoll-4.1.105.Final-linux-aarch_64.jar
228+
netty-transport-native-epoll-4.1.105.Final-linux-riscv64.jar
229+
netty-transport-native-epoll-4.1.105.Final-linux-x86_64.jar
230+
netty-transport-native-epoll-4.1.105.Final.jar
231+
netty-transport-native-kqueue-4.1.105.Final-osx-aarch_64.jar
232+
netty-transport-native-kqueue-4.1.105.Final-osx-x86_64.jar
233+
netty-transport-native-unix-common-4.1.105.Final.jar
234+
netty-transport-rxtx-4.1.105.Final.jar
235+
netty-transport-sctp-4.1.105.Final.jar
236+
netty-transport-udt-4.1.105.Final.jar
236237
nimbus-jose-jwt-9.37.2.jar
237238
objenesis-3.3.jar
238239
opencsv-5.7.1.jar

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ subprojects {
148148
configurations.configureEach {
149149
resolutionStrategy.eachDependency { details ->
150150
if (details.requested.group == 'io.netty' && !details.requested.name.contains('netty-tcnative') && !details.requested.name.equals('netty')) {
151-
details.useVersion '4.1.101.Final' // Use same Netty version as server
151+
details.useVersion '4.1.105.Final' // Use same Netty version as server
152152
}
153153
}
154154
}
@@ -172,5 +172,5 @@ ext {
172172
publicDir = "${project.rootDir}"
173173
neo4jVersionEffective = project.hasProperty("neo4jVersionOverride") ? project.getProperty("neo4jVersionOverride") : "5.26.11"
174174
testContainersVersion = '1.20.2'
175-
apacheArrowVersion = '15.0.0'
175+
apacheArrowVersion = '17.0.0'
176176
}

common/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ dependencies {
4040
// If updated check if the transitive dependency to javax.servlet.jsp:jsp-api:2.1 has also updated
4141
// and remove the manual licensing check for it in licenses-3rdparties.gradle
4242
compileOnly group: 'org.apache.hadoop', name: 'hadoop-common', version: '3.4.1', withoutServers
43-
compileOnly group: 'com.google.cloud', name: 'google-cloud-storage', version: '2.26.1'
43+
compileOnly group: 'com.google.cloud', name: 'google-cloud-storage', version: '2.54.0'
4444
compileOnly group: 'com.github.seancfoley', name: 'ipaddress', version: '5.3.3'
4545
compileOnly group: 'org.apache.commons', name: 'commons-lang3', version: '3.14.0'
4646

test-utils/build.gradle

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ dependencies {
2929
api group: 'org.hamcrest', name: 'hamcrest-library', version: '2.2'
3030
api group: 'org.neo4j.community', name: 'it-test-support', version: neo4jVersionEffective // , classifier: "tests"
3131
api group: 'org.neo4j', name: 'log-test-utils', version: neo4jVersionEffective // , classifier: "tests"
32-
api group: 'org.neo4j.driver', name: 'neo4j-java-driver', version: '5.18.0'
32+
api group: 'org.neo4j.driver', name: 'neo4j-java-driver', version: '5.28.2'
3333
api group: 'org.apache.hadoop', name: 'hadoop-hdfs', version: '3.4.1', withoutServers.andThen(withoutLoggers)
3434
// If updated check if the transitive dependency to javax.servlet.jsp:jsp-api:2.1 has also updated
3535
// and remove the manual licensing check for it in licenses-3rdparties.gradle
@@ -44,7 +44,16 @@ dependencies {
4444
api group: 'org.testcontainers', name: 'cassandra', version: testContainersVersion
4545
api group: 'org.testcontainers', name: 'localstack', version: testContainersVersion
4646
api group: 'org.apache.arrow', name: 'arrow-vector', version: apacheArrowVersion
47-
api group: 'org.apache.arrow', name: 'arrow-memory-netty', version: apacheArrowVersion
47+
48+
def arrowExclusions = {
49+
exclude group: 'com.fasterxml.jackson.core', module: 'jackson-core'
50+
exclude group: 'com.fasterxml.jackson.core', module: 'jackson-annotations'
51+
exclude group: 'com.fasterxml.jackson.core', module: 'jackson-databind'
52+
exclude group: 'io.netty', module: 'netty-common'
53+
exclude group: 'io.netty', module: 'netty-buffer'
54+
}
55+
56+
api group: 'org.apache.arrow', name: 'arrow-memory-netty', version: apacheArrowVersion, arrowExclusions
4857

4958
implementation project(":common")
5059
implementation group: 'org.neo4j', name: 'neo4j-common', version: neo4jVersionEffective, classifier: "tests"

0 commit comments

Comments
 (0)