Merge branch 'main' into upjs

open-telemetry · Nov 1, 2023 · 8943ce8 · 8943ce8
2 parents 5df0bbf + ea9ec5d
commit 8943ce8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/java/dependencyManagement/build.gradle.kts b/java/dependencyManagement/build.gradle.kts
@@ -10,13 +10,13 @@ data class DependencySet(val group: String, val version: String, val modules: Li
 
 val DEPENDENCY_BOMS = listOf(
     "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.31.0-alpha",
-    "org.apache.logging.log4j:log4j-bom:2.20.0",
+    "org.apache.logging.log4j:log4j-bom:2.21.1",
     "software.amazon.awssdk:bom:2.21.0"
 )
 
 val DEPENDENCIES = listOf(
     "com.amazonaws:aws-lambda-java-core:1.2.3",
-    "com.amazonaws:aws-lambda-java-events:3.11.2",
+    "com.amazonaws:aws-lambda-java-events:3.11.3",
     "com.squareup.okhttp3:okhttp:4.11.0",
     "io.opentelemetry.javaagent:opentelemetry-javaagent:1.31.0"
 )

diff --git a/java/settings.gradle.kts b/java/settings.gradle.kts
@@ -1,7 +1,7 @@
 pluginManagement {
     plugins {
         id("com.diffplug.spotless") version "6.22.0"
-        id("com.github.ben-manes.versions") version "0.47.0"
+        id("com.github.ben-manes.versions") version "0.49.0"
         id("com.github.johnrengelman.shadow") version "8.1.1"
     }
 }