Merge pull request #579 from aws-observability/update-main-release-v1…

….31.0

Update main after release v1.31.0

dependencyManagement/build.gradle.kts

@@ -27,25 +27,25 @@ data class DependencySet(val group: String, val version: String, val modules: Li
 val TEST_SNAPSHOTS = rootProject.findProperty("testUpstreamSnapshots") == "true"
 
 // This is the version of the upstream instrumentation BOM
-val otelVersion = "1.30.0"
-val otelSnapshotVersion = "1.31.0"
+val otelVersion = "1.31.0"
+val otelSnapshotVersion = "1.32.0"
 val otelAlphaVersion = if (!TEST_SNAPSHOTS) "$otelVersion-alpha" else "$otelSnapshotVersion-alpha-SNAPSHOT"
 val otelJavaAgentVersion = if (!TEST_SNAPSHOTS) otelVersion else "$otelSnapshotVersion-SNAPSHOT"
 // All versions below are only used in testing and do not affect the released artifact.
 
 val DEPENDENCY_BOMS = listOf(
-  "com.amazonaws:aws-java-sdk-bom:1.12.554",
-  "com.fasterxml.jackson:jackson-bom:2.15.2",
-  "com.google.guava:guava-bom:32.1.2-jre",
-  "com.google.protobuf:protobuf-bom:3.24.3",
+  "com.amazonaws:aws-java-sdk-bom:1.12.573",
+  "com.fasterxml.jackson:jackson-bom:2.15.3",
+  "com.google.guava:guava-bom:32.1.3-jre",
+  "com.google.protobuf:protobuf-bom:3.24.4",
   "com.linecorp.armeria:armeria-bom:1.25.2",
-  "io.grpc:grpc-bom:1.58.0",
+  "io.grpc:grpc-bom:1.59.0",
   "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:$otelAlphaVersion",
-  "org.apache.logging.log4j:log4j-bom:2.20.0",
+  "org.apache.logging.log4j:log4j-bom:2.21.1",
   "org.junit:junit-bom:5.10.0",
   "org.springframework.boot:spring-boot-dependencies:2.7.15",
-  "org.testcontainers:testcontainers-bom:1.19.0",
-  "software.amazon.awssdk:bom:2.20.162",
+  "org.testcontainers:testcontainers-bom:1.19.1",
+  "software.amazon.awssdk:bom:2.21.7",
 )
 
 val DEPENDENCY_SETS = listOf(
@@ -72,12 +72,12 @@ val DEPENDENCY_SETS = listOf(
 val DEPENDENCIES = listOf(
   "commons-logging:commons-logging:1.2",
   "com.sparkjava:spark-core:2.9.4",
-  "com.squareup.okhttp3:okhttp:4.11.0",
-  "io.opentelemetry.contrib:opentelemetry-aws-xray:1.30.0",
-  "io.opentelemetry.contrib:opentelemetry-aws-resources:1.30.0-alpha",
+  "com.squareup.okhttp3:okhttp:4.12.0",
+  "io.opentelemetry.contrib:opentelemetry-aws-xray:1.31.0",
+  "io.opentelemetry.contrib:opentelemetry-aws-resources:1.31.0-alpha",
   "io.opentelemetry.proto:opentelemetry-proto:1.0.0-alpha",
   "io.opentelemetry.javaagent:opentelemetry-javaagent:$otelJavaAgentVersion",
-  "net.bytebuddy:byte-buddy:1.14.8",
+  "net.bytebuddy:byte-buddy:1.14.9",
 )
 
 javaPlatform {

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -130,10 +130,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.