chore(main): release 2.40.1

googleapis · May 4, 2024 · 4c67d29 · 4c67d29
1 parent 8e87b2e
commit 4c67d29
Show file tree

Hide file tree

Showing 43 changed files with 157 additions and 142 deletions.
diff --git a/.cloudbuild/graalvm/cloudbuild-test-a.yaml b/.cloudbuild/graalvm/cloudbuild-test-a.yaml
@@ -14,7 +14,7 @@
 
 timeout: 7200s # 2 hours
 substitutions:
-  _SHARED_DEPENDENCIES_VERSION: '3.30.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
+  _SHARED_DEPENDENCIES_VERSION: '3.30.1' # {x-version-update:google-cloud-shared-dependencies:current}
   _JAVA_SHARED_CONFIG_VERSION: '1.7.7'
 
 steps:

diff --git a/.cloudbuild/graalvm/cloudbuild-test-b.yaml b/.cloudbuild/graalvm/cloudbuild-test-b.yaml
@@ -14,7 +14,7 @@
 
 timeout: 7200s # 2 hours
 substitutions:
-  _SHARED_DEPENDENCIES_VERSION: '3.30.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
+  _SHARED_DEPENDENCIES_VERSION: '3.30.1' # {x-version-update:google-cloud-shared-dependencies:current}
   _JAVA_SHARED_CONFIG_VERSION: '1.7.7'
 
 steps:

diff --git a/.cloudbuild/graalvm/cloudbuild.yaml b/.cloudbuild/graalvm/cloudbuild.yaml
@@ -14,7 +14,7 @@
 
 timeout: 7200s # 2 hours
 substitutions:
-  _SHARED_DEPENDENCIES_VERSION: '3.30.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
+  _SHARED_DEPENDENCIES_VERSION: '3.30.1' # {x-version-update:google-cloud-shared-dependencies:current}
   _JAVA_SHARED_CONFIG_VERSION: '1.7.7'
 steps:
   # GraalVM A build

diff --git a/.cloudbuild/library_generation/cloudbuild-library-generation-release.yaml b/.cloudbuild/library_generation/cloudbuild-library-generation-release.yaml
@@ -14,7 +14,7 @@
 
 timeout: 7200s # 2 hours
 substitutions:
-  _GAPIC_GENERATOR_JAVA_VERSION: '2.40.1-SNAPSHOT' # {x-version-update:gapic-generator-java:current}
+  _GAPIC_GENERATOR_JAVA_VERSION: '2.40.1' # {x-version-update:gapic-generator-java:current}
   _IMAGE_ID: "gcr.io/cloud-devrel-public-resources/java-library-generation:${_GAPIC_GENERATOR_JAVA_VERSION}"
 steps:
   # Library generation build

diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "2.40.0"
+  ".": "2.40.1"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,20 @@
 # Changelog
 
+## [2.40.1](https://github.com/googleapis/sdk-platform-java/compare/v2.40.0...v2.40.1) (2024-05-04)
+
+
+### Bug Fixes
+
+* only append `.api.grpc` suffix to group id if the artifact id starts with `proto-` or `grpc-` ([#2731](https://github.com/googleapis/sdk-platform-java/issues/2731)) ([8e87b2e](https://github.com/googleapis/sdk-platform-java/commit/8e87b2e9a28a1797efb2eea531d25094b4438e0d))
+
+
+### Dependencies
+
+* update dependency black to v24.4.2 ([#2660](https://github.com/googleapis/sdk-platform-java/issues/2660)) ([1cbb681](https://github.com/googleapis/sdk-platform-java/commit/1cbb681f3f395afee4be63cd6b96fefda7083d97))
+* update dependency markupsafe to v2.1.5 ([#2657](https://github.com/googleapis/sdk-platform-java/issues/2657)) ([805baf8](https://github.com/googleapis/sdk-platform-java/commit/805baf87cfd70bb74b345cff93a6a6e02ade3dd7))
+* update dependency platformdirs to v4.2.1 ([#2662](https://github.com/googleapis/sdk-platform-java/issues/2662)) ([dbdcc91](https://github.com/googleapis/sdk-platform-java/commit/dbdcc91e91ca19eca7c098b6131e3faa90f3386e))
+* update googleapis/java-cloud-bom digest to f3c611a ([#2700](https://github.com/googleapis/sdk-platform-java/issues/2700)) ([d254e9b](https://github.com/googleapis/sdk-platform-java/commit/d254e9bd67ec12802158d48f3c06dc618e0df903))
+
 ## [2.40.0](https://github.com/googleapis/sdk-platform-java/compare/v2.39.0...v2.40.0) (2024-05-02)
 
 

diff --git a/WORKSPACE b/WORKSPACE
@@ -60,7 +60,7 @@ maven_install(
     repositories = ["https://repo.maven.apache.org/maven2/"],
 )
 
-_gapic_generator_java_version = "2.40.1-SNAPSHOT"  # {x-version-update:gapic-generator-java:current}
+_gapic_generator_java_version = "2.40.1"  # {x-version-update:gapic-generator-java:current}
 
 maven_install(
     artifacts = [

diff --git a/api-common-java/pom.xml b/api-common-java/pom.xml
@@ -5,14 +5,14 @@
     <groupId>com.google.api</groupId>
     <artifactId>api-common</artifactId>
     <packaging>jar</packaging>
-    <version>2.31.1-SNAPSHOT</version><!-- {x-version-update:api-common:current} -->
+    <version>2.31.1</version><!-- {x-version-update:api-common:current} -->
     <name>API Common</name>
     <description>Common utilities for Google APIs in Java</description>
 
     <parent>
         <groupId>com.google.api</groupId>
         <artifactId>gapic-generator-java-pom-parent</artifactId>
-        <version>2.40.1-SNAPSHOT</version><!-- {x-version-update:gapic-generator-java:current} -->
+        <version>2.40.1</version><!-- {x-version-update:gapic-generator-java:current} -->
         <relativePath>../gapic-generator-java-pom-parent</relativePath>
     </parent>
 

diff --git a/coverage-report/pom.xml b/coverage-report/pom.xml
@@ -31,22 +31,22 @@
             <dependency>
                 <groupId>com.google.api</groupId>
                 <artifactId>gax</artifactId>
-                <version>2.48.1-SNAPSHOT</version> <!-- {x-version-update:gax:current} -->
+                <version>2.48.1</version> <!-- {x-version-update:gax:current} -->
             </dependency>
             <dependency>
                 <groupId>com.google.api</groupId>
                 <artifactId>gax-grpc</artifactId>
-                <version>2.48.1-SNAPSHOT</version> <!-- {x-version-update:gax-grpc:current} -->
+                <version>2.48.1</version> <!-- {x-version-update:gax-grpc:current} -->
             </dependency>
             <dependency>
                 <groupId>com.google.api</groupId>
                 <artifactId>gax-httpjson</artifactId>
-                <version>2.48.1-SNAPSHOT</version> <!-- {x-version-update:gax:current} -->
+                <version>2.48.1</version> <!-- {x-version-update:gax:current} -->
             </dependency>
             <dependency>
                 <groupId>com.google.api</groupId>
                 <artifactId>api-common</artifactId>
-                <version>2.31.1-SNAPSHOT</version> <!-- {x-version-update:api-common:current} -->
+                <version>2.31.1</version> <!-- {x-version-update:api-common:current} -->
             </dependency>
         </dependencies>
 

diff --git a/gapic-generator-java-bom/pom.xml b/gapic-generator-java-bom/pom.xml
@@ -4,7 +4,7 @@
   <groupId>com.google.api</groupId>
   <artifactId>gapic-generator-java-bom</artifactId>
   <packaging>pom</packaging>
-  <version>2.40.1-SNAPSHOT</version><!-- {x-version-update:gapic-generator-java:current} -->
+  <version>2.40.1</version><!-- {x-version-update:gapic-generator-java:current} -->
   <name>GAPIC Generator Java BOM</name>
   <description>
     BOM for the libraries in gapic-generator-java repository. Users should not
@@ -15,7 +15,7 @@
   <parent>
     <groupId>com.google.api</groupId>
     <artifactId>gapic-generator-java-pom-parent</artifactId>
-    <version>2.40.1-SNAPSHOT</version><!-- {x-version-update:gapic-generator-java:current} -->
+    <version>2.40.1</version><!-- {x-version-update:gapic-generator-java:current} -->
     <relativePath>../gapic-generator-java-pom-parent</relativePath>
   </parent>
 
@@ -82,61 +82,61 @@
       <dependency>
         <groupId>com.google.api</groupId>
         <artifactId>api-common</artifactId>
-        <version>2.31.1-SNAPSHOT</version><!-- {x-version-update:api-common:current} -->
+        <version>2.31.1</version><!-- {x-version-update:api-common:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api</groupId>
         <artifactId>gax-bom</artifactId>
-        <version>2.48.1-SNAPSHOT</version><!-- {x-version-update:gax:current} -->
+        <version>2.48.1</version><!-- {x-version-update:gax:current} -->
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>com.google.api</groupId>
         <artifactId>gapic-generator-java</artifactId>
-        <version>2.40.1-SNAPSHOT</version><!-- {x-version-update:gapic-generator-java:current} -->
+        <version>2.40.1</version><!-- {x-version-update:gapic-generator-java:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>grpc-google-common-protos</artifactId>
-        <version>2.39.1-SNAPSHOT</version><!-- {x-version-update:proto-google-common-protos:current} -->
+        <version>2.39.1</version><!-- {x-version-update:proto-google-common-protos:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-common-protos</artifactId>
-        <version>2.39.1-SNAPSHOT</version><!-- {x-version-update:proto-google-common-protos:current} -->
+        <version>2.39.1</version><!-- {x-version-update:proto-google-common-protos:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-iam-v1</artifactId>
-        <version>1.34.1-SNAPSHOT</version><!-- {x-version-update:proto-google-iam-v1:current} -->
+        <version>1.34.1</version><!-- {x-version-update:proto-google-iam-v1:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-iam-v2</artifactId>
-        <version>1.34.1-SNAPSHOT</version><!-- {x-version-update:proto-google-iam-v2:current} -->
+        <version>1.34.1</version><!-- {x-version-update:proto-google-iam-v2:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-iam-v2beta</artifactId>
-        <version>1.34.1-SNAPSHOT</version><!-- {x-version-update:proto-google-iam-v2beta:current} -->
+        <version>1.34.1</version><!-- {x-version-update:proto-google-iam-v2beta:current} -->
       </dependency>
 
       <!-- Following test deps are kept to keep them consistent with versions above -->
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>grpc-google-iam-v1</artifactId>
-        <version>1.34.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-iam-v1:current} -->
+        <version>1.34.1</version><!-- {x-version-update:grpc-google-iam-v1:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>grpc-google-iam-v2</artifactId>
-        <version>1.34.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-iam-v2:current} -->
+        <version>1.34.1</version><!-- {x-version-update:grpc-google-iam-v2:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>grpc-google-iam-v2beta</artifactId>
-        <version>1.34.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-iam-v2beta:current} -->
+        <version>1.34.1</version><!-- {x-version-update:grpc-google-iam-v2beta:current} -->
       </dependency>
     </dependencies>
 

diff --git a/gapic-generator-java-pom-parent/pom.xml b/gapic-generator-java-pom-parent/pom.xml
@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.api</groupId>
   <artifactId>gapic-generator-java-pom-parent</artifactId>
-  <version>2.40.1-SNAPSHOT</version><!-- {x-version-update:gapic-generator-java:current} -->
+  <version>2.40.1</version><!-- {x-version-update:gapic-generator-java:current} -->
   <packaging>pom</packaging>
   <name>GAPIC Generator Java POM Parent</name>
   <url>https://github.com/googleapis/sdk-platform-java</url>

diff --git a/gapic-generator-java/pom.xml b/gapic-generator-java/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.api</groupId>
   <artifactId>gapic-generator-java</artifactId>
-  <version>2.40.1-SNAPSHOT</version><!-- {x-version-update:gapic-generator-java:current} -->
+  <version>2.40.1</version><!-- {x-version-update:gapic-generator-java:current} -->
   <name>GAPIC Generator Java</name>
   <description>GAPIC generator Java</description>
 
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.google.api</groupId>
     <artifactId>gapic-generator-java-pom-parent</artifactId>
-    <version>2.40.1-SNAPSHOT</version><!-- {x-version-update:gapic-generator-java:current} -->
+    <version>2.40.1</version><!-- {x-version-update:gapic-generator-java:current} -->
     <relativePath>../gapic-generator-java-pom-parent</relativePath>
   </parent>
 
@@ -31,7 +31,7 @@
       <dependency>
         <groupId>com.google.api</groupId>
         <artifactId>gapic-generator-java-bom</artifactId>
-        <version>2.40.1-SNAPSHOT</version><!-- {x-version-update:gapic-generator-java:current} -->
+        <version>2.40.1</version><!-- {x-version-update:gapic-generator-java:current} -->
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/gax-java/README.md b/gax-java/README.md
@@ -34,27 +34,27 @@ If you are using Maven, add this to your pom.xml file
 <dependency>
   <groupId>com.google.api</groupId>
   <artifactId>gax</artifactId>
-  <version>2.48.0</version>
+  <version>2.48.1</version>
 </dependency>
 <dependency>
   <groupId>com.google.api</groupId>
   <artifactId>gax-grpc</artifactId>
-  <version>2.48.0</version>
+  <version>2.48.1</version>
 </dependency>
 ```
 
 If you are using Gradle, add this to your dependencies
 
 ```Groovy
-compile 'com.google.api:gax:2.48.0',
-  'com.google.api:gax-grpc:2.48.0'
+compile 'com.google.api:gax:2.48.1',
+  'com.google.api:gax-grpc:2.48.1'
 ```
 
 If you are using SBT, add this to your dependencies
 
 ```Scala
-libraryDependencies += "com.google.api" % "gax" % "2.48.0"
-libraryDependencies += "com.google.api" % "gax-grpc" % "2.48.0"
+libraryDependencies += "com.google.api" % "gax" % "2.48.1"
+libraryDependencies += "com.google.api" % "gax-grpc" % "2.48.1"
 ```
 [//]: # ({x-version-update-end})
 

diff --git a/gax-java/dependencies.properties b/gax-java/dependencies.properties
@@ -8,16 +8,16 @@
 
 # Versions of oneself
 # {x-version-update-start:gax:current}
-version.gax=2.48.1-SNAPSHOT
+version.gax=2.48.1
 # {x-version-update-end}
 # {x-version-update-start:gax:current}
-version.gax_grpc=2.48.1-SNAPSHOT
+version.gax_grpc=2.48.1
 # {x-version-update-end}
 # {x-version-update-start:gax:current}
-version.gax_bom=2.48.1-SNAPSHOT
+version.gax_bom=2.48.1
 # {x-version-update-end}
 # {x-version-update-start:gax:current}
-version.gax_httpjson=2.48.1-SNAPSHOT
+version.gax_httpjson=2.48.1
 # {x-version-update-end}
 
 # Versions for dependencies which actual artifacts differ between Bazel and Gradle.

diff --git a/gax-java/gax-bom/pom.xml b/gax-java/gax-bom/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.api</groupId>
   <artifactId>gax-bom</artifactId>
-  <version>2.48.1-SNAPSHOT</version><!-- {x-version-update:gax:current} -->
+  <version>2.48.1</version><!-- {x-version-update:gax:current} -->
   <packaging>pom</packaging>
   <name>GAX (Google Api eXtensions) for Java (BOM)</name>
   <description>Google Api eXtensions for Java (BOM)</description>
@@ -43,55 +43,55 @@
       <dependency>
         <groupId>com.google.api</groupId>
         <artifactId>gax</artifactId>
-        <version>2.48.1-SNAPSHOT</version><!-- {x-version-update:gax:current} -->
+        <version>2.48.1</version><!-- {x-version-update:gax:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api</groupId>
         <artifactId>gax</artifactId>
-        <version>2.48.1-SNAPSHOT</version><!-- {x-version-update:gax:current} -->
+        <version>2.48.1</version><!-- {x-version-update:gax:current} -->
         <type>test-jar</type>
         <classifier>testlib</classifier>
       </dependency>
       <dependency>
         <groupId>com.google.api</groupId>
         <artifactId>gax</artifactId>
-        <version>2.48.1-SNAPSHOT</version><!-- {x-version-update:gax:current} -->
+        <version>2.48.1</version><!-- {x-version-update:gax:current} -->
         <classifier>testlib</classifier>
       </dependency>
       <dependency>
         <groupId>com.google.api</groupId>
         <artifactId>gax-grpc</artifactId>
-        <version>2.48.1-SNAPSHOT</version><!-- {x-version-update:gax-grpc:current} -->
+        <version>2.48.1</version><!-- {x-version-update:gax-grpc:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api</groupId>
         <artifactId>gax-grpc</artifactId>
-        <version>2.48.1-SNAPSHOT</version><!-- {x-version-update:gax-grpc:current} -->
+        <version>2.48.1</version><!-- {x-version-update:gax-grpc:current} -->
         <type>test-jar</type>
         <classifier>testlib</classifier>
       </dependency>
       <dependency>
         <groupId>com.google.api</groupId>
         <artifactId>gax-grpc</artifactId>
-        <version>2.48.1-SNAPSHOT</version><!-- {x-version-update:gax-grpc:current} -->
+        <version>2.48.1</version><!-- {x-version-update:gax-grpc:current} -->
         <classifier>testlib</classifier>
       </dependency>
       <dependency>
         <groupId>com.google.api</groupId>
         <artifactId>gax-httpjson</artifactId>
-        <version>2.48.1-SNAPSHOT</version><!-- {x-version-update:gax:current} -->
+        <version>2.48.1</version><!-- {x-version-update:gax:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api</groupId>
         <artifactId>gax-httpjson</artifactId>
-        <version>2.48.1-SNAPSHOT</version><!-- {x-version-update:gax:current} -->
+        <version>2.48.1</version><!-- {x-version-update:gax:current} -->
         <type>test-jar</type>
         <classifier>testlib</classifier>
       </dependency>
       <dependency>
         <groupId>com.google.api</groupId>
         <artifactId>gax-httpjson</artifactId>
-        <version>2.48.1-SNAPSHOT</version><!-- {x-version-update:gax:current} -->
+        <version>2.48.1</version><!-- {x-version-update:gax:current} -->
         <classifier>testlib</classifier>
       </dependency>
     </dependencies>

diff --git a/gax-java/gax-grpc/pom.xml b/gax-java/gax-grpc/pom.xml
@@ -3,15 +3,15 @@
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>gax-grpc</artifactId>
-  <version>2.48.1-SNAPSHOT</version><!-- {x-version-update:gax-grpc:current} -->
+  <version>2.48.1</version><!-- {x-version-update:gax-grpc:current} -->
   <packaging>jar</packaging>
   <name>GAX (Google Api eXtensions) for Java (gRPC)</name>
   <description>Google Api eXtensions for Java (gRPC)</description>
 
   <parent>
     <groupId>com.google.api</groupId>
     <artifactId>gax-parent</artifactId>
-    <version>2.48.1-SNAPSHOT</version><!-- {x-version-update:gax:current} -->
+    <version>2.48.1</version><!-- {x-version-update:gax:current} -->
   </parent>
 
   <dependencies>