This is an automated email from the ASF dual-hosted git repository.
ycai pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra-sidecar.git
The following commit(s) were added to refs/heads/trunk by this push:
new f045207b CASSANDRASC-137: Bump AWS SDK version to 2.26.12 (#128)
f045207b is described below
commit f045207b623fde27b84d0f717b3075ea20726502
Author: Yifan Cai <y...@apache.org>
AuthorDate: Mon Jul 1 12:48:14 2024 -0700
CASSANDRASC-137: Bump AWS SDK version to 2.26.12 (#128)
Patch by Yifan Cai; Reviewed by Francisco Guerrero for CASSANDRASC-137
---
CHANGES.txt | 1 +
build.gradle | 13 ++++++++++---
gradle.properties | 2 +-
vertx-client-shaded/build.gradle | 2 ++
4 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/CHANGES.txt b/CHANGES.txt
index 5d19ec6e..71918338 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,6 @@
1.0.0
-----
+ * Bump AWS SDK version to 2.26.12 (CASSANDRASC-137)
* Add delay between reporting of the same slow task (CASSANDRASC-136)
* Added additional JVM options to increase max open FD limit for MacOS
(CASSANDRASC-135)
* Detect out of range data and cleanup using nodetool (CASSANDRASC-134)
diff --git a/build.gradle b/build.gradle
index 58a6c158..a8919fdd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -207,9 +207,16 @@ dependencies {
implementation(group: 'com.fasterxml.jackson.dataformat', name:
'jackson-dataformat-yaml', version: "${project.jacksonVersion}")
// aws sdk BOM + s3
- implementation platform(group: 'software.amazon.awssdk', name:'bom',
version:"${project.aswSdkVersion}")
+ implementation platform(group: 'software.amazon.awssdk', name:'bom',
version:"${project.awsSdkVersion}")
implementation('software.amazon.awssdk:s3')
implementation('software.amazon.awssdk:netty-nio-client')
+ implementation('io.netty:netty-transport-classes-epoll') {
+ version {
+ // Some integration tests are failing with version 4.1.100.final
due to netty bootstrapping issue in cassandra java driver.
+ // Force the version to the old version unblocks the integration
test.
+ strictly '4.1.86.Final'
+ }
+ }
jolokia 'org.jolokia:jolokia-jvm:1.6.0:agent'
@@ -222,7 +229,7 @@ dependencies {
exclude group: 'junit', module: 'junit'
}
-
testImplementation('com.datastax.cassandra:cassandra-driver-core:3.9.0:tests')
+
testImplementation('com.datastax.cassandra:cassandra-driver-core:3.11.3:tests')
testImplementation('org.mockito:mockito-core:4.10.0')
testImplementation('org.mockito:mockito-inline:4.10.0')
testImplementation("io.vertx:vertx-junit5:${project.vertxVersion}")
@@ -395,7 +402,7 @@ def integrationTest = task("integrationTest")
html.enabled = true
}
testLogging {
- events "passed", "skipped", "failed"
+ events "started", "passed", "skipped", "failed"
}
testClassesDirs = sourceSets.integrationTest.output.classesDirs
classpath = sourceSets.integrationTest.runtimeClasspath
diff --git a/gradle.properties b/gradle.properties
index c1d5a195..4ad89e04 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -26,7 +26,7 @@ dtestApiVersion=0.0.16
# trunk is currently 5.1 - update when trunk moves
dtestVersion=5.1
dtestDependencyName=cassandra-dtest-local-all
-aswSdkVersion=2.20.43
+awsSdkVersion=2.26.12
# The dep is to introduce xxhash impl
commonsCodecVersion=1.16.1
# If running MacOS then you need to increase the max
diff --git a/vertx-client-shaded/build.gradle b/vertx-client-shaded/build.gradle
index d713a17f..21bf30eb 100644
--- a/vertx-client-shaded/build.gradle
+++ b/vertx-client-shaded/build.gradle
@@ -81,6 +81,8 @@ shadowJar {
dependencies {
exclude(dependency('org.slf4j:.*:.*'))
}
+
+ dependsOn assemble
}
tasks.named('test') {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
