Merge remote-tracking branch 'upstream/main' into feature/cel-sampler

Author: dol

CHANGELOG.md

@@ -2,8 +2,6 @@
 
 ## Unreleased
 
-## Version 1.47.0 (2025-05-19)
-
 ### GCP authentication extension
 
 - Update the internal implementation such that the required headers are retrieved

gcp-auth-extension/build.gradle.kts

@@ -23,7 +23,7 @@ dependencies {
   compileOnly("io.opentelemetry:opentelemetry-exporter-otlp")
 
   // Only dependencies added to `implementation` configuration will be picked up by Shadow plugin
-  implementation("com.google.auth:google-auth-library-oauth2-http:1.37.0")
+  implementation("com.google.auth:google-auth-library-oauth2-http:1.37.1")
 
   // Test dependencies
   testCompileOnly("com.google.auto.service:auto-service-annotations")

maven-extension/src/test/resources/projects/jib_1/pom.xml

@@ -15,7 +15,7 @@
       <plugin>
         <groupId>com.google.cloud.tools</groupId>
         <artifactId>jib-maven-plugin</artifactId>
-        <version>3.4.5</version>
+        <version>3.4.6</version>
         <configuration>
           <to>
             <image>docker.io/john/${project.artifactId}:latest</image>

maven-extension/src/test/resources/projects/jib_2/pom.xml

@@ -15,7 +15,7 @@
       <plugin>
         <groupId>com.google.cloud.tools</groupId>
         <artifactId>jib-maven-plugin</artifactId>
-        <version>3.4.5</version>
+        <version>3.4.6</version>
         <configuration>
           <to>
             <image>gcr.io/my-gcp-project/my-app</image>

version.gradle.kts

@@ -1,5 +1,5 @@
-val stableVersion = "1.48.0-SNAPSHOT"
-val alphaVersion = "1.48.0-alpha-SNAPSHOT"
+val stableVersion = "1.47.0-SNAPSHOT"
+val alphaVersion = "1.47.0-alpha-SNAPSHOT"
 
 allprojects {
   if (findProperty("otel.stable") != "true") {