Merge branch 'main' into cindy/native-profile

googleapis · Jan 16, 2024 · ac6150a · ac6150a
2 parents b744a98 + 4704148
commit ac6150a
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Changelog
 
 
+## [0.130.30-alpha](https://github.com/googleapis/java-logging-logback/compare/v0.130.29-alpha...v0.130.30-alpha) (2024-01-11)
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:google-cloud-logging to v3.15.15 ([#1242](https://github.com/googleapis/java-logging-logback/issues/1242)) ([fea658a](https://github.com/googleapis/java-logging-logback/commit/fea658ac5116e5e74cb594ac3f8cc5ce215bbd20))
+
 ## [0.130.29-alpha](https://github.com/googleapis/java-logging-logback/compare/v0.130.28-alpha...v0.130.29-alpha) (2024-01-10)
 
 

diff --git a/README.md b/README.md
@@ -23,20 +23,20 @@ If you are using Maven, add this to your pom.xml file:
 <dependency>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-logging-logback</artifactId>
-  <version>0.130.30-alpha</version>
+  <version>0.130.29-alpha</version>
 </dependency>
 ```
 
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-logging-logback:0.130.30-alpha'
+implementation 'com.google.cloud:google-cloud-logging-logback:0.130.29-alpha'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-logging-logback" % "0.130.30-alpha"
+libraryDependencies += "com.google.cloud" % "google-cloud-logging-logback" % "0.130.29-alpha"
 ```
 <!-- {x-version-update-end} -->
 
@@ -299,7 +299,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-logback/java11.html
 [stability-image]: https://img.shields.io/badge/stability-preview-yellow
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-logging-logback.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-logging-logback/0.130.30-alpha
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-logging-logback/0.130.29-alpha
 [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/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>google-cloud-logging-logback</artifactId>
-  <version>0.130.30-alpha-SNAPSHOT</version><!-- {x-version-update:google-cloud-logging-logback:current} -->
+  <version>0.130.30-alpha</version><!-- {x-version-update:google-cloud-logging-logback:current} -->
   <packaging>jar</packaging>
   <name>Google Cloud Logging Logback Appender</name>
   <url>https://github.com/googleapis/java-logging-logback</url>
@@ -17,7 +17,7 @@
     <logback.version>1.2.13</logback.version>
     <easymock.version>5.2.0</easymock.version>
     <truth.version>1.2.0</truth.version>
-    <logging.version>3.15.14</logging.version>
+    <logging.version>3.15.15</logging.version>
     <slf4j.version>1.7.36</slf4j.version>
     <google.api-common.version>1.10.1</google.api-common.version>
   </properties>

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-logging-logback</artifactId>
-      <version>0.130.28-alpha</version>
+      <version>0.130.29-alpha</version>
     </dependency>
     <!-- [END logging-logback_install_without_bom] -->
 

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-logback</artifactId>
-      <version>0.130.30-alpha-SNAPSHOT</version>
+      <version>0.130.30-alpha</version>
     </dependency>
     <!-- {x-version-update-end} -->
 

diff --git a/src/main/java/com/google/cloud/logging/logback/LoggingAppender.java b/src/main/java/com/google/cloud/logging/logback/LoggingAppender.java
@@ -122,7 +122,7 @@ public class LoggingAppender extends UnsynchronizedAppenderBase<ILoggingEvent> {
   // See
   // https://github.com/googleapis/release-please/blob/main/docs/customizing.md#updating-arbitrary-files
   // {x-version-update-start:google-cloud-logging-logback:current}
-  public static final String DEFAULT_INSTRUMENTATION_VERSION = "0.130.30-alpha-SNAPSHOT";
+  public static final String DEFAULT_INSTRUMENTATION_VERSION = "0.130.30-alpha";
   // {x-version-update-end}
   private static boolean instrumentationAdded = false;
   private static final Object instrumentationLock = new Object();

diff --git a/versions.txt b/versions.txt
@@ -1,4 +1,4 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-logging-logback:0.130.29-alpha:0.130.30-alpha-SNAPSHOT
+google-cloud-logging-logback:0.130.30-alpha:0.130.30-alpha