Merge branch 'main' into renovate/org.graalvm.buildtools-junit-platfo…

…rm-native-0.x
googleapis · May 18, 2023 · aa92256 · aa92256
2 parents 11f7e21 + 6662345
commit aa92256
Show file tree

Hide file tree

Showing 12 changed files with 37 additions and 28 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## [3.15.1](https://github.com/googleapis/java-logging/compare/v3.15.0...v3.15.1) (2023-05-12)
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.9.0 ([#1342](https://github.com/googleapis/java-logging/issues/1342)) ([8b14ae1](https://github.com/googleapis/java-logging/commit/8b14ae17514481a5925ae3ff079cc4f1b4ad6d94))
+* Update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.22 ([#1341](https://github.com/googleapis/java-logging/issues/1341)) ([cfc0106](https://github.com/googleapis/java-logging/commit/cfc0106c359c153031bddcac7dadc292a9bb561e))
+
 ## [3.15.0](https://github.com/googleapis/java-logging/compare/v3.14.9...v3.15.0) (2023-05-06)
 
 

diff --git a/README.md b/README.md
@@ -44,7 +44,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 <dependency>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-logging</artifactId>
-  <version>3.14.9</version>
+  <version>3.15.1</version>
 </dependency>
 
 ```
@@ -59,13 +59,13 @@ 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.15.0'
+implementation 'com.google.cloud:google-cloud-logging:3.15.1'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-logging" % "3.15.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-logging" % "3.15.1"
 ```
 <!-- {x-version-update-end} -->
 
@@ -452,7 +452,8 @@ 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.15.0
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-logging/3.15.1
+
 [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/google-cloud-logging-bom/pom.xml b/google-cloud-logging-bom/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-logging-bom</artifactId>
-  <version>3.15.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-logging:current} -->
+  <version>3.15.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-logging:current} -->
   <packaging>pom</packaging>
   <parent>
     <groupId>com.google.cloud</groupId>
@@ -53,17 +53,17 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-logging</artifactId>
-        <version>3.15.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-logging:current} -->
+        <version>3.15.2-SNAPSHOT</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.104.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-logging-v2:current} -->
+        <version>0.104.2-SNAPSHOT</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.104.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-logging-v2:current} -->
+        <version>0.104.2-SNAPSHOT</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.15.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-logging:current} -->
+  <version>3.15.2-SNAPSHOT</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.15.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-logging:current} -->
+    <version>3.15.2-SNAPSHOT</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
@@ -41,7 +41,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.15.1-SNAPSHOT";
+  public static final String DEFAULT_INSTRUMENTATION_VERSION = "3.15.2-SNAPSHOT";
   // {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/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.104.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-logging-v2:current} -->
+  <version>0.104.2-SNAPSHOT</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.15.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-logging:current} -->
+    <version>3.15.2-SNAPSHOT</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.15.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-logging:current} -->
+  <version>3.15.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-logging:current} -->
   <name>Google Cloud Logging Parent</name>
   <url>https://github.com/googleapis/java-logging</url>
   <description>
@@ -61,23 +61,23 @@
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-logging-v2</artifactId>
-        <version>0.104.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-logging-v2:current} -->
+        <version>0.104.2-SNAPSHOT</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.104.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-logging-v2:current} -->
+        <version>0.104.2-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-logging-v2:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-logging</artifactId>
-        <version>3.15.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-logging:current} -->
+        <version>3.15.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-logging:current} -->
       </dependency>
 
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-shared-dependencies</artifactId>
-        <version>3.8.0</version>
+        <version>3.9.0</version>
         <type>pom</type>
         <scope>import</scope>
       </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.104.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-logging-v2:current} -->
+  <version>0.104.2-SNAPSHOT</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.15.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-logging:current} -->
+    <version>3.15.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-logging:current} -->
   </parent>
   <dependencies>
     <dependency>

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-logging</artifactId>
-      <version>3.14.9</version>
+      <version>3.15.1</version>
     </dependency>
     <!-- [END logging_install_without_bom] -->
 

diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
@@ -121,7 +121,7 @@
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-surefire-plugin
             </artifactId> <!-- Must use older version of surefire plugin for native-image testing. -->
-            <version>3.0.0</version>
+            <version>3.1.0</version>
             <configuration>
               <includes>
                 <include>**/IT*</include>
@@ -131,7 +131,7 @@
           <plugin>
             <groupId>org.graalvm.buildtools</groupId>
             <artifactId>native-maven-plugin</artifactId>
-            <version>0.9.21</version>
+            <version>0.9.22</version>
             <extensions>true</extensions>
             <configuration>
               <mainClass>com.example.logging.NativeImageLoggingSample</mainClass>

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.15.1-SNAPSHOT</version>
+      <version>3.15.2-SNAPSHOT</version>
     </dependency>
     <!-- {x-version-update-end} -->
     <dependency>
@@ -51,7 +51,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>
-        <version>3.3.0</version>
+        <version>3.4.0</version>
         <executions>
           <execution>
             <id>add-snippets-source</id>

diff --git a/versions.txt b/versions.txt
@@ -1,6 +1,6 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-logging:3.15.0:3.15.1-SNAPSHOT
-grpc-google-cloud-logging-v2:0.104.0:0.104.1-SNAPSHOT
-proto-google-cloud-logging-v2:0.104.0:0.104.1-SNAPSHOT
+google-cloud-logging:3.15.1:3.15.2-SNAPSHOT
+grpc-google-cloud-logging-v2:0.104.1:0.104.2-SNAPSHOT
+proto-google-cloud-logging-v2:0.104.1:0.104.2-SNAPSHOT