Upgrade AWS Java SDK to 1.12.228 (aws#334)

willarmiros · May 27, 2022 · 5730d71 · 5730d71
1 parent 2dcd09e
commit 5730d71
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 15 deletions.
diff --git a/aws-xray-recorder-sdk-aws-sdk-core/build.gradle.kts b/aws-xray-recorder-sdk-aws-sdk-core/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
 }
 
 dependencies {
-    compileOnly("com.fasterxml.jackson.core:jackson-annotations:2.11.0")
+    compileOnly("com.fasterxml.jackson.core:jackson-annotations")
 
     testImplementation("com.fasterxml.jackson.core:jackson-databind")
 }

diff --git a/aws-xray-recorder-sdk-aws-sdk/build.gradle.kts b/aws-xray-recorder-sdk-aws-sdk/build.gradle.kts
@@ -8,9 +8,11 @@ dependencies {
 
     implementation(project(":aws-xray-recorder-sdk-aws-sdk-core"))
 
-    api("com.amazonaws:aws-java-sdk-core:1.11.1000")
+    api("com.amazonaws:aws-java-sdk-core")
 
-    testImplementation("com.amazonaws:aws-java-sdk:1.11.1000")
+    testImplementation("com.amazonaws:aws-java-sdk-lambda")
+    testImplementation("com.amazonaws:aws-java-sdk-s3")
+    testImplementation("com.amazonaws:aws-java-sdk-sns")
     testImplementation("org.powermock:powermock-reflect:2.0.2")
     testImplementation("org.skyscreamer:jsonassert:1.3.0")
 }

diff --git a/aws-xray-recorder-sdk-core/build.gradle.kts b/aws-xray-recorder-sdk-core/build.gradle.kts
@@ -4,12 +4,12 @@ plugins {
 }
 
 dependencies {
-    api("com.amazonaws:aws-java-sdk-xray:1.11.903")
+    api("com.amazonaws:aws-java-sdk-xray")
 
     compileOnly("com.google.code.findbugs:jsr305:3.0.2")
     compileOnly("javax.servlet:javax.servlet-api:3.1.0")
 
-    testImplementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.0")
+    testImplementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310")
     testImplementation("com.github.stefanbirkner:system-rules:1.16.0")
     testImplementation("com.github.tomakehurst:wiremock-jre8")
     testImplementation("org.openjdk.jmh:jmh-core:1.19")

diff --git a/aws-xray-recorder-sdk-sql/src/main/java/com/amazonaws/xray/sql/SqlSubsegments.java b/aws-xray-recorder-sdk-sql/src/main/java/com/amazonaws/xray/sql/SqlSubsegments.java
@@ -18,14 +18,12 @@
 import com.amazonaws.xray.AWSXRay;
 import com.amazonaws.xray.entities.Namespace;
 import com.amazonaws.xray.entities.Subsegment;
-
 import com.blogspot.mydailyjava.weaklockfree.WeakConcurrentMap;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
 import java.sql.SQLException;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.checkerframework.checker.nullness.qual.Nullable;

diff --git a/aws-xray-recorder-sdk-sql/src/test/java/com/amazonaws/xray/sql/SqlSubsegmentsTest.java b/aws-xray-recorder-sdk-sql/src/test/java/com/amazonaws/xray/sql/SqlSubsegmentsTest.java
@@ -25,14 +25,12 @@
 import com.amazonaws.xray.AWSXRay;
 import com.amazonaws.xray.entities.Namespace;
 import com.amazonaws.xray.entities.Subsegment;
-
 import com.blogspot.mydailyjava.weaklockfree.WeakConcurrentMap;
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
 import java.sql.SQLException;
 import java.util.HashMap;
 import java.util.Map;
-
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;

diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts
@@ -5,8 +5,9 @@ plugins {
 data class DependencySet(val group: String, val version: String, val modules: List<String>)
 
 val DEPENDENCY_BOMS = listOf(
-        "com.fasterxml.jackson:jackson-bom:2.11.0",
-        "org.junit:junit-bom:5.6.2"
+        "com.amazonaws:aws-java-sdk-bom:1.12.228",
+        "com.fasterxml.jackson:jackson-bom:2.12.0",
+        "org.junit:junit-bom:5.8.2"
 )
 
 val DEPENDENCY_SETS = listOf(
@@ -17,7 +18,7 @@ val DEPENDENCY_SETS = listOf(
         ),
         DependencySet(
                 "com.fasterxml.jackson.datatype",
-                "2.11.0",
+                "2.12.0",
                 listOf("jackson-datatype-jsr310")
         ),
         DependencySet(
@@ -42,7 +43,7 @@ val DEPENDENCY_SETS = listOf(
         ),
         DependencySet(
                 "junit",
-                "4.12",
+                "4.13.1",
                 listOf("junit")
         ),
         DependencySet(

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,6 +1,6 @@
 pluginManagement {
     plugins {
-        id("com.github.hierynomus.license") version "0.15.0"
+        id("com.github.hierynomus.license") version "0.16.1"
         id("nebula.release") version "15.1.0"
         id("io.freefair.aggregate-javadoc-jar") version "5.3.0"
         id("io.github.gradle-nexus.publish-plugin") version "1.0.0"