Merge branch 'googleapis:main' into main

googleapis · Feb 12, 2025 · 1a28b3a · 1a28b3a
2 parents d65a579 + eeb99a9
commit 1a28b3a
Show file tree

Hide file tree

Showing 16 changed files with 34 additions and 33 deletions.
diff --git a/.github/workflows/hermetic_library_generation.yaml b/.github/workflows/hermetic_library_generation.yaml
@@ -37,7 +37,7 @@ jobs:
       with:
         fetch-depth: 0
         token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
-    - uses: googleapis/sdk-platform-java/.github/scripts@v2.52.0
+    - uses: googleapis/sdk-platform-java/.github/scripts@v2.53.0
       if: env.SHOULD_RUN == 'true'
       with:
         base_ref: ${{ github.base_ref }}

diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml
@@ -17,6 +17,6 @@ jobs:
           # repository
           .kokoro/build.sh
       - name: Unmanaged dependency check
-        uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.42.0
+        uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.43.0
         with:
           bom-path: google-cloud-pubsub-bom/pom.xml
diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.42.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.43.0"
 }
 
 env_vars: {

diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.42.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.43.0"
 }
 
 env_vars: {

diff --git a/README.md b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>libraries-bom</artifactId>
-      <version>26.53.0</version>
+      <version>26.54.0</version>
       <type>pom</type>
       <scope>import</scope>
     </dependency>
@@ -43,7 +43,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 <dependency>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-pubsub</artifactId>
-  <version>1.136.0</version>
+  <version>1.136.1</version>
 </dependency>
 
 ```

diff --git a/generation_config.yaml b/generation_config.yaml
@@ -1,5 +1,5 @@
-gapic_generator_version: 2.52.0
-googleapis_commitish: 0a459af4362c0e41b9723dd4d7edc022c552db40
+gapic_generator_version: 2.53.0
+googleapis_commitish: 9605bff3d36fbdb1227b26bce68258c5f00815e4
 libraries_bom_version: 26.54.0
 libraries:
   - api_shortname: pubsub

diff --git a/google-cloud-pubsub-bom/pom.xml b/google-cloud-pubsub-bom/pom.xml
@@ -3,12 +3,12 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-pubsub-bom</artifactId>
-  <version>1.136.1</version><!-- {x-version-update:google-cloud-pubsub:current} -->
+  <version>1.136.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-pubsub:current} -->
   <packaging>pom</packaging>
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>sdk-platform-java-config</artifactId>
-    <version>3.42.0</version>
+    <version>3.43.0</version>
   </parent>
 
   <name>Google Cloud pubsub BOM</name>
@@ -52,17 +52,17 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-pubsub</artifactId>
-        <version>1.136.1</version><!-- {x-version-update:google-cloud-pubsub:current} -->
+        <version>1.136.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-pubsub:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>grpc-google-cloud-pubsub-v1</artifactId>
-        <version>1.118.1</version><!-- {x-version-update:grpc-google-cloud-pubsub-v1:current} -->
+        <version>1.118.2-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-pubsub-v1:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-pubsub-v1</artifactId>
-        <version>1.118.1</version><!-- {x-version-update:proto-google-cloud-pubsub-v1:current} -->
+        <version>1.118.2-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-pubsub-v1:current} -->
       </dependency>
     </dependencies>
   </dependencyManagement>

diff --git a/google-cloud-pubsub/pom.xml b/google-cloud-pubsub/pom.xml
@@ -3,15 +3,15 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-pubsub</artifactId>
-  <version>1.136.1</version><!-- {x-version-update:google-cloud-pubsub:current} -->
+  <version>1.136.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-pubsub:current} -->
   <packaging>jar</packaging>
   <name>Google Cloud Pub/Sub</name>
   <url>https://github.com/googleapis/java-pubsub</url>
   <description>Java idiomatic client for Google Cloud Pub/Sub</description>
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-pubsub-parent</artifactId>
-    <version>1.136.1</version><!-- {x-version-update:google-cloud-pubsub:current} -->
+    <version>1.136.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-pubsub:current} -->
   </parent>
   <properties>
     <site.installationModule>google-cloud-pubsub</site.installationModule>

diff --git a/...ources/META-INF/native-image/com.google.cloud/google-cloud-pubsub/native-image.properties b/...ources/META-INF/native-image/com.google.cloud/google-cloud-pubsub/native-image.properties
@@ -0,0 +1 @@
+Args=--initialize-at-build-time=org.junit.runners.model.FrameworkField
diff --git a/grpc-google-cloud-pubsub-v1/pom.xml b/grpc-google-cloud-pubsub-v1/pom.xml
@@ -4,13 +4,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.api.grpc</groupId>
   <artifactId>grpc-google-cloud-pubsub-v1</artifactId>
-  <version>1.118.1</version><!-- {x-version-update:grpc-google-cloud-pubsub-v1:current} -->
+  <version>1.118.2-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-pubsub-v1:current} -->
   <name>grpc-google-cloud-pubsub-v1</name>
   <description>GRPC library for grpc-google-cloud-pubsub-v1</description>
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-pubsub-parent</artifactId>
-    <version>1.136.1</version><!-- {x-version-update:google-cloud-pubsub:current} -->
+    <version>1.136.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-pubsub:current} -->
   </parent>
   <dependencies>
     <dependency>

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-pubsub-parent</artifactId>
   <packaging>pom</packaging>
-  <version>1.136.1</version><!-- {x-version-update:google-cloud-pubsub:current} -->
+  <version>1.136.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-pubsub:current} -->
   <name>Google Cloud Pub/Sub Parent</name>
   <url>https://github.com/googleapis/java-pubsub</url>
   <description>
@@ -14,7 +14,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>sdk-platform-java-config</artifactId>
-    <version>3.42.0</version>
+    <version>3.43.0</version>
   </parent>
 
   <developers>
@@ -69,17 +69,17 @@
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-pubsub-v1</artifactId>
-        <version>1.118.1</version><!-- {x-version-update:proto-google-cloud-pubsub-v1:current} -->
+        <version>1.118.2-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-pubsub-v1:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>grpc-google-cloud-pubsub-v1</artifactId>
-        <version>1.118.1</version><!-- {x-version-update:grpc-google-cloud-pubsub-v1:current} -->
+        <version>1.118.2-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-pubsub-v1:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-pubsub</artifactId>
-        <version>1.136.1</version><!-- {x-version-update:google-cloud-pubsub:current} -->
+        <version>1.136.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-pubsub:current} -->
       </dependency>
 
       <!-- Test dependencies -->

diff --git a/proto-google-cloud-pubsub-v1/pom.xml b/proto-google-cloud-pubsub-v1/pom.xml
@@ -4,13 +4,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.api.grpc</groupId>
   <artifactId>proto-google-cloud-pubsub-v1</artifactId>
-  <version>1.118.1</version><!-- {x-version-update:proto-google-cloud-pubsub-v1:current} -->
+  <version>1.118.2-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-pubsub-v1:current} -->
   <name>proto-google-cloud-pubsub-v1</name>
   <description>PROTO library for proto-google-cloud-pubsub-v1</description>
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-pubsub-parent</artifactId>
-    <version>1.136.1</version><!-- {x-version-update:google-cloud-pubsub:current} -->
+    <version>1.136.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-pubsub:current} -->
   </parent>
   <dependencies>
     <dependency>

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
@@ -80,7 +80,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-core</artifactId>
-      <version>2.50.0</version>
+      <version>2.51.0</version>
       <classifier>tests</classifier>
     </dependency>
     <dependency>
@@ -91,7 +91,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-storage</artifactId>
-      <version>2.48.1</version>
+      <version>2.48.2</version>
     </dependency>
     <dependency>
       <groupId>com.google.cloud.opentelemetry</groupId>

diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-pubsub</artifactId>
-      <version>1.136.1</version>
+      <version>1.136.2-SNAPSHOT</version>
     </dependency>
     <!-- {x-version-update-end} -->
 
@@ -79,7 +79,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-core</artifactId>
-      <version>2.50.0</version>
+      <version>2.51.0</version>
       <classifier>tests</classifier>
     </dependency>
     <dependency>
@@ -90,7 +90,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-storage</artifactId>
-      <version>2.48.1</version>
+      <version>2.48.2</version>
     </dependency>
     <dependency>
       <groupId>com.google.cloud.opentelemetry</groupId>

diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
@@ -103,7 +103,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-core</artifactId>
-      <version>2.50.0</version>
+      <version>2.51.0</version>
       <classifier>tests</classifier>
     </dependency>
     <!-- [END_EXCLUDE] -->

diff --git a/versions.txt b/versions.txt
@@ -1,6 +1,6 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-pubsub:1.136.1:1.136.1
-grpc-google-cloud-pubsub-v1:1.118.1:1.118.1
-proto-google-cloud-pubsub-v1:1.118.1:1.118.1
+google-cloud-pubsub:1.136.1:1.136.2-SNAPSHOT
+grpc-google-cloud-pubsub-v1:1.118.1:1.118.2-SNAPSHOT
+proto-google-cloud-pubsub-v1:1.118.1:1.118.2-SNAPSHOT
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Args=--initialize-at-build-time=org.junit.runners.model.FrameworkField