Merge branch 'main' into declarative-config-resource-providers

Author: zeitlinger

.github/workflows/codeql.yml

@@ -38,6 +38,12 @@ jobs:
 
       # don't need to free disk space (which takes time) since running on larger machine
 
+      - name: Set up JDK 11
+        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
+        with:
+          distribution: temurin
+          java-version: 11
+
       - name: Set up JDK for running Gradle
         uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
         with:

dependencyManagement/build.gradle.kts

@@ -93,7 +93,7 @@ val DEPENDENCIES = listOf(
   "com.uber.nullaway:nullaway:0.12.7",
   "commons-beanutils:commons-beanutils:1.11.0",
   "commons-cli:commons-cli:1.9.0",
-  "commons-codec:commons-codec:1.18.0",
+  "commons-codec:commons-codec:1.19.0",
   "commons-collections:commons-collections:3.2.2",
   "commons-digester:commons-digester:2.1",
   "commons-fileupload:commons-fileupload:1.6.0",

instrumentation/okhttp/okhttp-3.0/library/README.md

@@ -39,8 +39,6 @@ import io.opentelemetry.instrumentation.okhttp.v3_0.OkHttpTelemetry;
 import okhttp3.Call;
 import okhttp3.OkHttpClient;
 
-import java.util.concurrent.ExecutorService;
-
 public class OkHttpConfiguration {
 
   //Use this Call.Factory implementation for making standard http client calls.