Merge branch 'main' into revert-1699-temp-ignore-test

googleapis · Nov 4, 2024 · e383f9d · e383f9d
2 parents 6e92723 + a1ec68d
commit e383f9d
Show file tree

Hide file tree

Showing 17 changed files with 110 additions and 34 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.46.0
+    - uses: googleapis/sdk-platform-java/.github/scripts@v2.49.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.35.0
+        uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.39.0
         with:
           bom-path: google-cloud-logging-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.35.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.39.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.35.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.39.0"
 }
 
 env_vars: {

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,39 @@
 # Changelog
 
+## [3.20.6](https://github.com/googleapis/java-logging/compare/v3.20.5...v3.20.6) (2024-10-26)
+
+
+### Dependencies
+
+* Update sdk platform java dependencies ([#1717](https://github.com/googleapis/java-logging/issues/1717)) ([ee9ef91](https://github.com/googleapis/java-logging/commit/ee9ef91a9ebaed9faa5870a29be40b0c1531a226))
+
+## [3.20.5](https://github.com/googleapis/java-logging/compare/v3.20.4...v3.20.5) (2024-10-23)
+
+
+### Dependencies
+
+* Update sdk platform java dependencies ([#1707](https://github.com/googleapis/java-logging/issues/1707)) ([2359040](https://github.com/googleapis/java-logging/commit/23590409f5c4aaff5c741e860fc0916f7ec4c963))
+
+## [3.20.4](https://github.com/googleapis/java-logging/compare/v3.20.3...v3.20.4) (2024-10-07)
+
+
+### Bug Fixes
+
+* **deps:** Update the Java code generator (gapic-generator-java) to 2.47.0 ([90b88ee](https://github.com/googleapis/java-logging/commit/90b88ee70ee84bdcb0af4aced50b5ee61e0a706c))
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:sdk-platform-java-config to v3.37.0 ([#1702](https://github.com/googleapis/java-logging/issues/1702)) ([1f7da17](https://github.com/googleapis/java-logging/commit/1f7da17810fa22b8437edc88e4f95b3ed5cb8349))
+
+## [3.20.3](https://github.com/googleapis/java-logging/compare/v3.20.2...v3.20.3) (2024-10-01)
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:sdk-platform-java-config to v3.36.1 ([#1698](https://github.com/googleapis/java-logging/issues/1698)) ([9491512](https://github.com/googleapis/java-logging/commit/94915125fd2425ffba5ef86da0c54af3c1d2c138))
+* Update dependency org.apache.maven.plugins:maven-deploy-plugin to v3.1.3 ([2b6ea70](https://github.com/googleapis/java-logging/commit/2b6ea703aad05e714f5634fbd74e0b9bca0c51f9))
+
 ## [3.20.2](https://github.com/googleapis/java-logging/compare/v3.20.1...v3.20.2) (2024-09-12)
 
 

diff --git a/README.md b/README.md
@@ -38,7 +38,6 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
 
 If you are using Maven without the BOM, add this to your dependencies:
 
-<!-- {x-version-update-start:google-cloud-logging:released} -->
 
 ```xml
 <dependency>
@@ -52,22 +51,21 @@ If you are using Maven without the BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.47.0')
+implementation platform('com.google.cloud:libraries-bom:26.50.0')
 
 implementation 'com.google.cloud:google-cloud-logging'
 ```
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-logging:3.20.2'
+implementation 'com.google.cloud:google-cloud-logging:3.20.6'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-logging" % "3.20.2"
+libraryDependencies += "com.google.cloud" % "google-cloud-logging" % "3.20.6"
 ```
-<!-- {x-version-update-end} -->
 
 ## Authentication
 
@@ -465,7 +463,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-logging/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-logging.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-logging/3.20.2
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-logging/3.20.6
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles

diff --git a/generation_config.yaml b/generation_config.yaml
@@ -1,6 +1,6 @@
-gapic_generator_version: 2.46.0
-googleapis_commitish: 5c181aaf78bd1ae2e08c3a2971cd9e87b6e00986
-libraries_bom_version: 26.47.0
+gapic_generator_version: 2.49.0
+googleapis_commitish: 9b94dba2f7f4b601f8232bc3a3f6ef32665279b9
+libraries_bom_version: 26.50.0
 libraries:
   - api_shortname: logging
     name_pretty: Cloud Logging

diff --git a/google-cloud-logging-bom/pom.xml b/google-cloud-logging-bom/pom.xml
@@ -3,12 +3,12 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-logging-bom</artifactId>
-  <version>3.20.3-SNAPSHOT</version><!-- {x-version-update:google-cloud-logging:current} -->
+  <version>3.20.6</version><!-- {x-version-update:google-cloud-logging:current} -->
   <packaging>pom</packaging>
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>sdk-platform-java-config</artifactId>
-    <version>3.35.0</version>
+    <version>3.39.0</version>
   </parent>
 
   <name>Google Cloud logging BOM</name>
@@ -53,17 +53,17 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-logging</artifactId>
-        <version>3.20.3-SNAPSHOT</version><!-- {x-version-update:google-cloud-logging:current} -->
+        <version>3.20.6</version><!-- {x-version-update:google-cloud-logging:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>grpc-google-cloud-logging-v2</artifactId>
-        <version>0.109.3-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-logging-v2:current} -->
+        <version>0.109.6</version><!-- {x-version-update:grpc-google-cloud-logging-v2:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-logging-v2</artifactId>
-        <version>0.109.3-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-logging-v2:current} -->
+        <version>0.109.6</version><!-- {x-version-update:proto-google-cloud-logging-v2:current} -->
       </dependency>
     </dependencies>
   </dependencyManagement>

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

diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/Instrumentation.java b/google-cloud-logging/src/main/java/com/google/cloud/logging/Instrumentation.java
@@ -40,7 +40,7 @@ public final class Instrumentation {
   // See
   // https://github.com/googleapis/release-please/blob/main/docs/customizing.md#updating-arbitrary-files
   // {x-version-update-start:google-cloud-logging:current}
-  public static final String DEFAULT_INSTRUMENTATION_VERSION = "3.20.3-SNAPSHOT";
+  public static final String DEFAULT_INSTRUMENTATION_VERSION = "3.20.6";
   // {x-version-update-end}
   public static final String INSTRUMENTATION_LOG_NAME = "diagnostic-log";
   public static final int MAX_DIAGNOSTIC_VALUE_LENGTH = 14;

diff --git a/.../src/main/resources/META-INF/native-image/com.google.cloud.logging.v2/reflect-config.json b/.../src/main/resources/META-INF/native-image/com.google.cloud.logging.v2/reflect-config.json
@@ -440,6 +440,15 @@
     "allDeclaredClasses": true,
     "allPublicClasses": true
   },
+  {
+    "name": "com.google.api.MetricDescriptor$MetricDescriptorMetadata$TimeSeriesResourceHierarchyLevel",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
   {
     "name": "com.google.api.MetricDescriptor$MetricKind",
     "queryAllDeclaredConstructors": true,
@@ -674,6 +683,24 @@
     "allDeclaredClasses": true,
     "allPublicClasses": true
   },
+  {
+    "name": "com.google.api.SelectiveGapicGeneration",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.SelectiveGapicGeneration$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
   {
     "name": "com.google.logging.type.HttpRequest",
     "queryAllDeclaredConstructors": true,

diff --git a/grpc-google-cloud-logging-v2/pom.xml b/grpc-google-cloud-logging-v2/pom.xml
@@ -4,13 +4,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.api.grpc</groupId>
   <artifactId>grpc-google-cloud-logging-v2</artifactId>
-  <version>0.109.3-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-logging-v2:current} -->
+  <version>0.109.6</version><!-- {x-version-update:grpc-google-cloud-logging-v2:current} -->
   <name>grpc-google-cloud-logging-v2</name>
   <description>GRPC library for grpc-google-cloud-logging-v2</description>
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-logging-parent</artifactId>
-    <version>3.20.3-SNAPSHOT</version><!-- {x-version-update:google-cloud-logging:current} -->
+    <version>3.20.6</version><!-- {x-version-update:google-cloud-logging:current} -->
   </parent>
   <dependencies>
     <dependency>

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-logging-parent</artifactId>
   <packaging>pom</packaging>
-  <version>3.20.3-SNAPSHOT</version><!-- {x-version-update:google-cloud-logging:current} -->
+  <version>3.20.6</version><!-- {x-version-update:google-cloud-logging:current} -->
   <name>Google Cloud Logging Parent</name>
   <url>https://github.com/googleapis/java-logging</url>
   <description>
@@ -14,7 +14,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>sdk-platform-java-config</artifactId>
-    <version>3.35.0</version>
+    <version>3.39.0</version>
   </parent>
 
   <developers>
@@ -80,17 +80,17 @@
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-logging-v2</artifactId>
-        <version>0.109.3-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-logging-v2:current} -->
+        <version>0.109.6</version><!-- {x-version-update:proto-google-cloud-logging-v2:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>grpc-google-cloud-logging-v2</artifactId>
-        <version>0.109.3-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-logging-v2:current} -->
+        <version>0.109.6</version><!-- {x-version-update:grpc-google-cloud-logging-v2:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-logging</artifactId>
-        <version>3.20.3-SNAPSHOT</version><!-- {x-version-update:google-cloud-logging:current} -->
+        <version>3.20.6</version><!-- {x-version-update:google-cloud-logging:current} -->
       </dependency>
 
       <dependency>

diff --git a/proto-google-cloud-logging-v2/pom.xml b/proto-google-cloud-logging-v2/pom.xml
@@ -4,13 +4,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.api.grpc</groupId>
   <artifactId>proto-google-cloud-logging-v2</artifactId>
-  <version>0.109.3-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-logging-v2:current} -->
+  <version>0.109.6</version><!-- {x-version-update:proto-google-cloud-logging-v2:current} -->
   <name>proto-google-cloud-logging-v2</name>
   <description>PROTO library for proto-google-cloud-logging-v2</description>
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-logging-parent</artifactId>
-    <version>3.20.3-SNAPSHOT</version><!-- {x-version-update:google-cloud-logging:current} -->
+    <version>3.20.6</version><!-- {x-version-update:google-cloud-logging:current} -->
   </parent>
   <dependencies>
     <dependency>

diff --git a/renovate.json b/renovate.json
@@ -41,6 +41,16 @@
       ],
       "depNameTemplate": "com.google.cloud:sdk-platform-java-config",
       "datasourceTemplate": "maven"
+    },
+    {
+      "fileMatch": [
+        "^.github/workflows/hermetic_library_generation.yaml$"
+      ],
+      "matchStrings": [
+        "uses: googleapis/sdk-platform-java/.github/scripts@v(?<currentValue>.+?)\\n"
+      ],
+      "depNameTemplate": "com.google.api:gapic-generator-java",
+      "datasourceTemplate": "maven"
     }
   ],
   "packageRules": [
@@ -101,6 +111,13 @@
         "^com.fasterxml.jackson.core"
       ],
       "groupName": "jackson dependencies"
+    },
+    {
+      "matchPackagePatterns": [
+        "^com.google.api:gapic-generator-java",
+        "^com.google.cloud:sdk-platform-java-config"
+      ],
+      "groupName": "SDK platform Java dependencies"
     }
   ],
   "semanticCommits": true,

diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-logging</artifactId>
-      <version>3.20.3-SNAPSHOT</version>
+      <version>3.20.6</version>
     </dependency>
     <!-- {x-version-update-end} -->
     <dependency>

diff --git a/versions.txt b/versions.txt
@@ -1,6 +1,6 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-logging:3.20.2:3.20.3-SNAPSHOT
-grpc-google-cloud-logging-v2:0.109.2:0.109.3-SNAPSHOT
-proto-google-cloud-logging-v2:0.109.2:0.109.3-SNAPSHOT
+google-cloud-logging:3.20.6:3.20.6
+grpc-google-cloud-logging-v2:0.109.6:0.109.6
+proto-google-cloud-logging-v2:0.109.6:0.109.6