From f5b9dd63a894c21d5319513856ff3581d9747ddc Mon Sep 17 00:00:00 2001 From: Karen <64801825+karenc-bq@users.noreply.github.com> Date: Tue, 17 Dec 2024 01:57:18 +0000 Subject: [PATCH] chore: match aws sdk dependency versions (#1205) --- .../build.gradle.kts | 4 +- benchmarks/build.gradle.kts | 2 +- examples/AWSDriverExample/build.gradle.kts | 10 ++-- examples/DBCPExample/build.gradle.kts | 4 +- examples/HibernateExample/build.gradle | 4 +- examples/HikariExample/build.gradle.kts | 2 +- .../ReadWriteSplittingSample/build.gradle.kts | 2 +- .../build.gradle.kts | 2 +- .../build.gradle.kts | 2 +- .../SpringHibernateExample/build.gradle.kts | 2 +- .../spring/build.gradle.kts | 2 +- wrapper/build.gradle.kts | 26 ++++----- .../failover/FailoverConnectionPlugin.java | 10 ++-- .../failover2/FailoverConnectionPlugin.java | 10 ++-- wrapper/src/test/build.gradle.kts | 54 +++++++++---------- 15 files changed, 64 insertions(+), 72 deletions(-) diff --git a/aws-advanced-jdbc-wrapper-bundle/build.gradle.kts b/aws-advanced-jdbc-wrapper-bundle/build.gradle.kts index edbed024f..023ea8bf1 100644 --- a/aws-advanced-jdbc-wrapper-bundle/build.gradle.kts +++ b/aws-advanced-jdbc-wrapper-bundle/build.gradle.kts @@ -25,8 +25,8 @@ repositories { dependencies { implementation("org.apache.httpcomponents:httpclient:4.5.14") - implementation("software.amazon.awssdk:rds:2.29.23") - implementation("software.amazon.awssdk:sts:2.29.24") + implementation("software.amazon.awssdk:rds:2.29.34") + implementation("software.amazon.awssdk:sts:2.29.34") implementation(project(":aws-advanced-jdbc-wrapper")) } diff --git a/benchmarks/build.gradle.kts b/benchmarks/build.gradle.kts index bf9ce9090..54dad389b 100644 --- a/benchmarks/build.gradle.kts +++ b/benchmarks/build.gradle.kts @@ -21,7 +21,7 @@ plugins { dependencies { jmhImplementation(project(":aws-advanced-jdbc-wrapper")) implementation("org.postgresql:postgresql:42.7.4") - implementation("mysql:mysql-connector-java:8.0.33") + implementation("com.mysql:mysql-connector-j:8.3.0") implementation("org.mariadb.jdbc:mariadb-java-client:3.4.1") implementation("com.zaxxer:HikariCP:4.0.3") diff --git a/examples/AWSDriverExample/build.gradle.kts b/examples/AWSDriverExample/build.gradle.kts index 4a11f8af0..9614959dc 100644 --- a/examples/AWSDriverExample/build.gradle.kts +++ b/examples/AWSDriverExample/build.gradle.kts @@ -17,15 +17,15 @@ dependencies { implementation("org.springframework.boot:spring-boot-starter-jdbc:2.7.13") // 2.7.13 is the last version compatible with Java 8 implementation("org.postgresql:postgresql:42.7.4") - implementation("mysql:mysql-connector-java:8.0.33") - implementation("software.amazon.awssdk:rds:2.29.23") - implementation("software.amazon.awssdk:secretsmanager:2.29.29") - implementation("software.amazon.awssdk:sts:2.29.23") + implementation("com.mysql:mysql-connector-j:8.3.0") + implementation("software.amazon.awssdk:rds:2.29.34") + implementation("software.amazon.awssdk:secretsmanager:2.29.34") + implementation("software.amazon.awssdk:sts:2.29.34") implementation("com.fasterxml.jackson.core:jackson-databind:2.17.1") implementation(project(":aws-advanced-jdbc-wrapper")) implementation("io.opentelemetry:opentelemetry-api:1.42.1") implementation("io.opentelemetry:opentelemetry-sdk:1.42.1") implementation("io.opentelemetry:opentelemetry-exporter-otlp:1.44.1") - implementation("com.amazonaws:aws-xray-recorder-sdk-core:2.18.1") + implementation("com.amazonaws:aws-xray-recorder-sdk-core:2.18.2") implementation("org.jsoup:jsoup:1.18.1") } diff --git a/examples/DBCPExample/build.gradle.kts b/examples/DBCPExample/build.gradle.kts index c7a35529a..8a8a94862 100644 --- a/examples/DBCPExample/build.gradle.kts +++ b/examples/DBCPExample/build.gradle.kts @@ -16,8 +16,8 @@ dependencies { implementation("org.postgresql:postgresql:42.7.4") - implementation("mysql:mysql-connector-java:8.0.33") + implementation("com.mysql:mysql-connector-j:8.3.0") implementation(project(":aws-advanced-jdbc-wrapper")) implementation("org.apache.commons:commons-dbcp2:2.12.0") - implementation("software.amazon.awssdk:rds:2.29.23") + implementation("software.amazon.awssdk:rds:2.29.34") } diff --git a/examples/HibernateExample/build.gradle b/examples/HibernateExample/build.gradle index 0165f062b..ef3e74d45 100644 --- a/examples/HibernateExample/build.gradle +++ b/examples/HibernateExample/build.gradle @@ -13,8 +13,8 @@ dependencies { annotationProcessor 'org.projectlombok:lombok:1.18.24' implementation 'org.hibernate:hibernate-core:6.1.3.Final' implementation 'jakarta.persistence:jakarta.persistence-api:3.1.0' - runtimeOnly 'org.postgresql:postgresql:42.5.4' - runtimeOnly 'mysql:mysql-connector-java:8.0.32' + runtimeOnly 'org.postgresql:postgresql:42.7.4' + runtimeOnly 'com.mysql:mysql-connector-j:8.3.0' implementation project(':aws-advanced-jdbc-wrapper') testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.0' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.0' diff --git a/examples/HikariExample/build.gradle.kts b/examples/HikariExample/build.gradle.kts index c065e45d2..f4db2514c 100644 --- a/examples/HikariExample/build.gradle.kts +++ b/examples/HikariExample/build.gradle.kts @@ -16,7 +16,7 @@ dependencies { implementation("org.postgresql:postgresql:42.7.4") - implementation("mysql:mysql-connector-java:8.0.33") + implementation("com.mysql:mysql-connector-j:8.3.0") implementation(project(":aws-advanced-jdbc-wrapper")) implementation("com.zaxxer:HikariCP:4.0.3") } diff --git a/examples/ReadWriteSplittingSample/build.gradle.kts b/examples/ReadWriteSplittingSample/build.gradle.kts index d70a33a62..a951eb0c3 100644 --- a/examples/ReadWriteSplittingSample/build.gradle.kts +++ b/examples/ReadWriteSplittingSample/build.gradle.kts @@ -16,7 +16,7 @@ dependencies { implementation("org.postgresql:postgresql:42.7.4") - implementation("mysql:mysql-connector-java:8.0.33") + implementation("com.mysql:mysql-connector-j:8.3.0") implementation("com.zaxxer:HikariCP:4.0.3") implementation(project(":aws-advanced-jdbc-wrapper")) } diff --git a/examples/SpringHibernateBalancedReaderOneDataSourceExample/build.gradle.kts b/examples/SpringHibernateBalancedReaderOneDataSourceExample/build.gradle.kts index c7f76ce6c..952008919 100644 --- a/examples/SpringHibernateBalancedReaderOneDataSourceExample/build.gradle.kts +++ b/examples/SpringHibernateBalancedReaderOneDataSourceExample/build.gradle.kts @@ -23,6 +23,6 @@ dependencies { implementation("org.springframework.boot:spring-boot-starter-data-jpa") implementation("org.springframework.retry:spring-retry") implementation("org.postgresql:postgresql:42.7.4") - implementation("software.amazon.awssdk:rds:2.29.23") + implementation("software.amazon.awssdk:rds:2.29.34") implementation(project(":aws-advanced-jdbc-wrapper")) } diff --git a/examples/SpringHibernateBalancedReaderTwoDataSourceExample/build.gradle.kts b/examples/SpringHibernateBalancedReaderTwoDataSourceExample/build.gradle.kts index c7f76ce6c..952008919 100644 --- a/examples/SpringHibernateBalancedReaderTwoDataSourceExample/build.gradle.kts +++ b/examples/SpringHibernateBalancedReaderTwoDataSourceExample/build.gradle.kts @@ -23,6 +23,6 @@ dependencies { implementation("org.springframework.boot:spring-boot-starter-data-jpa") implementation("org.springframework.retry:spring-retry") implementation("org.postgresql:postgresql:42.7.4") - implementation("software.amazon.awssdk:rds:2.29.23") + implementation("software.amazon.awssdk:rds:2.29.34") implementation(project(":aws-advanced-jdbc-wrapper")) } diff --git a/examples/SpringHibernateExample/build.gradle.kts b/examples/SpringHibernateExample/build.gradle.kts index 69aa20461..6452d7ec5 100644 --- a/examples/SpringHibernateExample/build.gradle.kts +++ b/examples/SpringHibernateExample/build.gradle.kts @@ -23,6 +23,6 @@ dependencies { implementation("org.springframework.boot:spring-boot-starter-data-jpa") implementation("org.springframework.boot:spring-boot-starter-web") implementation("org.postgresql:postgresql:42.7.4") - implementation("software.amazon.awssdk:rds:2.29.23") + implementation("software.amazon.awssdk:rds:2.29.34") implementation(project(":aws-advanced-jdbc-wrapper")) } diff --git a/examples/SpringWildflyExample/spring/build.gradle.kts b/examples/SpringWildflyExample/spring/build.gradle.kts index 5060fb31f..d711ee9d0 100644 --- a/examples/SpringWildflyExample/spring/build.gradle.kts +++ b/examples/SpringWildflyExample/spring/build.gradle.kts @@ -24,6 +24,6 @@ dependencies { implementation("org.springframework.boot:spring-boot-starter-web") runtimeOnly("org.springframework.boot:spring-boot-devtools") implementation("org.postgresql:postgresql:42.7.4") - implementation("software.amazon.awssdk:rds:2.29.23") + implementation("software.amazon.awssdk:rds:2.29.34") implementation(project(":aws-advanced-jdbc-wrapper")) } diff --git a/wrapper/build.gradle.kts b/wrapper/build.gradle.kts index 53cb53f92..72ec23645 100644 --- a/wrapper/build.gradle.kts +++ b/wrapper/build.gradle.kts @@ -29,14 +29,14 @@ plugins { dependencies { implementation("org.checkerframework:checker-qual:3.48.1") compileOnly("org.apache.httpcomponents:httpclient:4.5.14") - compileOnly("software.amazon.awssdk:rds:2.29.23") - compileOnly("software.amazon.awssdk:auth:2.29.24") // Required for IAM (light implementation) - compileOnly("software.amazon.awssdk:http-client-spi:2.29.23") // Required for IAM (light implementation) - compileOnly("software.amazon.awssdk:sts:2.29.24") + compileOnly("software.amazon.awssdk:rds:2.29.29") + compileOnly("software.amazon.awssdk:auth:2.29.29") // Required for IAM (light implementation) + compileOnly("software.amazon.awssdk:http-client-spi:2.29.29") // Required for IAM (light implementation) + compileOnly("software.amazon.awssdk:sts:2.29.29") compileOnly("com.zaxxer:HikariCP:4.0.3") // Version 4.+ is compatible with Java 8 compileOnly("software.amazon.awssdk:secretsmanager:2.29.29") compileOnly("com.fasterxml.jackson.core:jackson-databind:2.17.1") - compileOnly("mysql:mysql-connector-java:8.0.33") + compileOnly("com.mysql:mysql-connector-j:8.3.0") compileOnly("org.postgresql:postgresql:42.7.4") compileOnly("org.mariadb.jdbc:mariadb-java-client:3.4.1") compileOnly("org.osgi:org.osgi.core:6.0.0") @@ -58,17 +58,17 @@ dependencies { testImplementation("org.apache.commons:commons-dbcp2:2.12.0") testImplementation("org.postgresql:postgresql:42.7.4") - testImplementation("mysql:mysql-connector-java:8.0.33") + testImplementation("com.mysql:mysql-connector-j:8.3.0") testImplementation("org.mariadb.jdbc:mariadb-java-client:3.4.1") testImplementation("com.zaxxer:HikariCP:4.0.3") // Version 4.+ is compatible with Java 8 testImplementation("org.springframework.boot:spring-boot-starter-jdbc:2.7.13") // 2.7.13 is the last version compatible with Java 8 testImplementation("org.mockito:mockito-inline:4.11.0") // 4.11.0 is the last version compatible with Java 8 - testImplementation("software.amazon.awssdk:rds:2.29.23") - testImplementation("software.amazon.awssdk:auth:2.29.24") // Required for IAM (light implementation) - testImplementation("software.amazon.awssdk:http-client-spi:2.29.23") // Required for IAM (light implementation) - testImplementation("software.amazon.awssdk:ec2:2.29.23") - testImplementation("software.amazon.awssdk:secretsmanager:2.29.29") - testImplementation("software.amazon.awssdk:sts:2.29.24") + testImplementation("software.amazon.awssdk:rds:2.29.34") + testImplementation("software.amazon.awssdk:auth:2.29.34") // Required for IAM (light implementation) + testImplementation("software.amazon.awssdk:http-client-spi:2.29.34") // Required for IAM (light implementation) + testImplementation("software.amazon.awssdk:ec2:2.29.34") + testImplementation("software.amazon.awssdk:secretsmanager:2.29.34") + testImplementation("software.amazon.awssdk:sts:2.29.34") testImplementation("org.testcontainers:testcontainers:1.20.1") testImplementation("org.testcontainers:mysql:1.20.1") testImplementation("org.testcontainers:postgresql:1.20.3") @@ -79,7 +79,7 @@ dependencies { testImplementation("org.apache.poi:poi-ooxml:5.3.0") testImplementation("org.slf4j:slf4j-simple:2.0.13") testImplementation("com.fasterxml.jackson.core:jackson-databind:2.17.1") - testImplementation("com.amazonaws:aws-xray-recorder-sdk-core:2.18.1") + testImplementation("com.amazonaws:aws-xray-recorder-sdk-core:2.18.2") testImplementation("io.opentelemetry:opentelemetry-api:1.42.1") testImplementation("io.opentelemetry:opentelemetry-sdk:1.42.1") testImplementation("io.opentelemetry:opentelemetry-sdk-metrics:1.43.0") diff --git a/wrapper/src/main/java/software/amazon/jdbc/plugin/failover/FailoverConnectionPlugin.java b/wrapper/src/main/java/software/amazon/jdbc/plugin/failover/FailoverConnectionPlugin.java index c5ff58cdc..38a7ea39b 100644 --- a/wrapper/src/main/java/software/amazon/jdbc/plugin/failover/FailoverConnectionPlugin.java +++ b/wrapper/src/main/java/software/amazon/jdbc/plugin/failover/FailoverConnectionPlugin.java @@ -371,13 +371,9 @@ protected void initFailoverMode() { this.rdsUrlType = this.rdsHelper.identifyRdsType(initialHostSpec.getHost()); if (this.failoverMode == null) { - if (this.rdsUrlType.isRdsCluster()) { - this.failoverMode = (this.rdsUrlType == RdsUrlType.RDS_READER_CLUSTER) - ? FailoverMode.READER_OR_WRITER - : FailoverMode.STRICT_WRITER; - } else { - this.failoverMode = FailoverMode.STRICT_WRITER; - } + this.failoverMode = this.rdsUrlType == RdsUrlType.RDS_READER_CLUSTER + ? FailoverMode.READER_OR_WRITER + : FailoverMode.STRICT_WRITER; } LOGGER.finer( diff --git a/wrapper/src/main/java/software/amazon/jdbc/plugin/failover2/FailoverConnectionPlugin.java b/wrapper/src/main/java/software/amazon/jdbc/plugin/failover2/FailoverConnectionPlugin.java index 39b8ca692..f771fa355 100644 --- a/wrapper/src/main/java/software/amazon/jdbc/plugin/failover2/FailoverConnectionPlugin.java +++ b/wrapper/src/main/java/software/amazon/jdbc/plugin/failover2/FailoverConnectionPlugin.java @@ -620,13 +620,9 @@ protected void initFailoverMode() { this.rdsUrlType = this.rdsHelper.identifyRdsType(initialHostSpec.getHost()); if (this.failoverMode == null) { - if (this.rdsUrlType.isRdsCluster()) { - this.failoverMode = (this.rdsUrlType == RdsUrlType.RDS_READER_CLUSTER) - ? FailoverMode.READER_OR_WRITER - : FailoverMode.STRICT_WRITER; - } else { - this.failoverMode = FailoverMode.STRICT_WRITER; - } + this.failoverMode = this.rdsUrlType == RdsUrlType.RDS_READER_CLUSTER + ? FailoverMode.READER_OR_WRITER + : FailoverMode.STRICT_WRITER; } LOGGER.finer( diff --git a/wrapper/src/test/build.gradle.kts b/wrapper/src/test/build.gradle.kts index 9f677d615..dccabde5b 100644 --- a/wrapper/src/test/build.gradle.kts +++ b/wrapper/src/test/build.gradle.kts @@ -26,37 +26,37 @@ repositories { } dependencies { - testImplementation("org.junit.platform:junit-platform-commons:1.8.2") - testImplementation("org.junit.platform:junit-platform-engine:1.8.2") - testImplementation("org.junit.platform:junit-platform-launcher:1.8.2") - testImplementation("org.junit.platform:junit-platform-suite-engine:1.8.2") - testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.2") - testImplementation("org.junit.jupiter:junit-jupiter-params:5.8.2") + testImplementation("org.junit.platform:junit-platform-commons:1.11.3") + testImplementation("org.junit.platform:junit-platform-engine:1.11.0") + testImplementation("org.junit.platform:junit-platform-launcher:1.11.3") + testImplementation("org.junit.platform:junit-platform-suite-engine:1.11.3") + testImplementation("org.junit.jupiter:junit-jupiter-api:5.11.3") + testImplementation("org.junit.jupiter:junit-jupiter-params:5.10.2") testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") - testImplementation("org.apache.commons:commons-dbcp2:2.8.0") - testImplementation("org.postgresql:postgresql:42.7.3") - testImplementation("mysql:mysql-connector-java:8.0.33") - testImplementation("org.mariadb.jdbc:mariadb-java-client:3.1.0") - testImplementation("com.zaxxer:HikariCP:4.+") // version 4.+ is compatible with Java 8 + testImplementation("org.apache.commons:commons-dbcp2:2.12.0") + testImplementation("org.postgresql:postgresql:42.7.4") + testImplementation("com.mysql:mysql-connector-j:8.3.0") + testImplementation("org.mariadb.jdbc:mariadb-java-client:3.4.1") + testImplementation("com.zaxxer:HikariCP:4.0.3") // Version 4.+ is compatible with Java 8 testImplementation("org.springframework.boot:spring-boot-starter-jdbc:2.7.13") // 2.7.13 is the last version compatible with Java 8 testImplementation("org.mockito:mockito-inline:4.11.0") // 4.11.0 is the last version compatible with Java 8 - testImplementation("software.amazon.awssdk:ec2:2.29.23") - testImplementation("software.amazon.awssdk:rds:2.29.23") - testImplementation("software.amazon.awssdk:sts:2.29.23") - testImplementation("org.testcontainers:testcontainers:1.17.+") - testImplementation("org.testcontainers:mysql:1.17.+") - testImplementation("org.testcontainers:postgresql:1.17.+") - testImplementation("org.testcontainers:mariadb:1.17.+") - testImplementation("org.testcontainers:junit-jupiter:1.17.+") - testImplementation("org.testcontainers:toxiproxy:1.17.+") - testImplementation("org.apache.poi:poi-ooxml:5.2.2") - testImplementation("org.slf4j:slf4j-simple:1.7.+") - testImplementation("com.fasterxml.jackson.core:jackson-databind:2.13.4") - testImplementation("com.amazonaws:aws-xray-recorder-sdk-core:2.14.0") - testImplementation("io.opentelemetry:opentelemetry-sdk:1.29.0") - testImplementation("io.opentelemetry:opentelemetry-sdk-metrics:1.29.0") - testImplementation("io.opentelemetry:opentelemetry-exporter-otlp:1.29.0") + testImplementation("software.amazon.awssdk:ec2:2.29.34") + testImplementation("software.amazon.awssdk:rds:2.29.34") + testImplementation("software.amazon.awssdk:sts:2.29.34") + testImplementation("org.testcontainers:testcontainers:1.20.1") + testImplementation("org.testcontainers:mysql:1.20.1") + testImplementation("org.testcontainers:postgresql:1.20.3") + testImplementation("org.testcontainers:mariadb:1.20.2") + testImplementation("org.testcontainers:junit-jupiter:1.20.1") + testImplementation("org.testcontainers:toxiproxy:1.20.2") + testImplementation("org.apache.poi:poi-ooxml:5.3.0") + testImplementation("org.slf4j:slf4j-simple:2.0.13") + testImplementation("com.fasterxml.jackson.core:jackson-databind:2.17.1") + testImplementation("com.amazonaws:aws-xray-recorder-sdk-core:2.18.2") + testImplementation("io.opentelemetry:opentelemetry-sdk:1.42.1") + testImplementation("io.opentelemetry:opentelemetry-sdk-metrics:1.43.0") + testImplementation("io.opentelemetry:opentelemetry-exporter-otlp:1.44.1") } tasks.withType {