Merge branch 'main' into aerospike-client-instrumentation

open-telemetry · Feb 11, 2024 · afda86d · afda86d
2 parents 7f84218 + 57438e6
commit afda86d
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 8 deletions.
diff --git a/.github/renovate.json5 b/.github/renovate.json5
@@ -4,6 +4,7 @@
     "config:base"
   ],
   "ignorePaths": ["instrumentation/**"],
+  "baseBranches": ["main", "release/v1.32.x"],
   "packageRules": [
     {
       "matchPackagePrefixes": ["ch.qos.logback:"],

diff --git a/.github/workflows/build-common.yml b/.github/workflows/build-common.yml
@@ -58,7 +58,7 @@ jobs:
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
-      - uses: gradle/wrapper-validation-action@85cde3f5a1033b2adc2442631c24b530f1183a1a # v2.1.0
+      - uses: gradle/wrapper-validation-action@699bb18358f12c5b78b37bb0111d3a0e2276e0e2 # v2.1.1
 
   license-check:
     runs-on: ubuntu-latest

diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts
@@ -27,7 +27,7 @@ val groovyVersion = "4.0.18"
 
 val DEPENDENCY_BOMS = listOf(
   "com.fasterxml.jackson:jackson-bom:2.16.1",
-  "com.squareup.okio:okio-bom:3.7.0", // see https://github.com/open-telemetry/opentelemetry-java/issues/5637
+  "com.squareup.okio:okio-bom:3.8.0", // see https://github.com/open-telemetry/opentelemetry-java/issues/5637
   "com.google.guava:guava-bom:33.0.0-jre",
   "org.apache.groovy:groovy-bom:${groovyVersion}",
   "io.opentelemetry:opentelemetry-bom:${otelSdkVersion}",
@@ -80,7 +80,7 @@ val CORE_DEPENDENCIES = listOf(
 // this top level to help consistently satisfy large numbers of transitive dependencies.
 val DEPENDENCIES = listOf(
   "io.r2dbc:r2dbc-proxy:1.1.4.RELEASE",
-  "ch.qos.logback:logback-classic:1.3.8", // 1.4+ requires Java 11+
+  "ch.qos.logback:logback-classic:1.3.14", // 1.4+ requires Java 11+
   "com.github.stefanbirkner:system-lambda:1.2.1",
   "com.github.stefanbirkner:system-rules:1.19.0",
   "uk.org.webcompere:system-stubs-jupiter:2.0.3",

diff --git a/licenses/licenses.md b/licenses/licenses.md
diff --git a/smoke-tests/images/servlet/build.gradle.kts b/smoke-tests/images/servlet/build.gradle.kts
@@ -39,7 +39,9 @@ val targets = mapOf(
   ),
   "payara" to listOf(
     ImageTarget(listOf("5.2020.6", "5.2021.8"), listOf("hotspot", "openj9"), listOf("8", "11")),
-    ImageTarget(listOf("6.2023.12"), listOf("hotspot", "openj9"), listOf("11", "17", "21"), war = "servlet-5.0")
+    // Test application is not deployed when server is sarted with hotspot jdk version 21
+    ImageTarget(listOf("6.2023.12"), listOf("hotspot"), listOf("11", "17"), war = "servlet-5.0"),
+    ImageTarget(listOf("6.2023.12"), listOf("openj9"), listOf("11", "17", "21"), war = "servlet-5.0")
   ),
   "tomcat" to listOf(
     ImageTarget(listOf("7.0.109"), listOf("hotspot", "openj9"), listOf("8"), mapOf("majorVersion" to "7")),
@@ -58,7 +60,12 @@ val targets = mapOf(
   "wildfly" to listOf(
     ImageTarget(listOf("13.0.0.Final"), listOf("hotspot", "openj9"), listOf("8")),
     ImageTarget(
-      listOf("17.0.1.Final", "21.0.0.Final", "28.0.1.Final", "29.0.1.Final", "30.0.1.Final"),
+      listOf("17.0.1.Final", "21.0.0.Final"),
+      listOf("hotspot", "openj9"),
+      listOf("8", "11", "17", "21")
+    ),
+    ImageTarget(
+      listOf("28.0.1.Final", "29.0.1.Final", "30.0.1.Final"),
       listOf("hotspot", "openj9"),
       listOf("11", "17", "21"),
       war = "servlet-5.0"