Skip to content

Commit 515073a

Browse files
authored
Merge branch 'main' into protobuf-ci-v4294
2 parents 54be99c + 8b13ab4 commit 515073a

File tree

9 files changed

+18
-10
lines changed

9 files changed

+18
-10
lines changed

.github/workflows/unmanaged_dependency_check.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ jobs:
1414
shell: bash
1515
run: .kokoro/build.sh
1616
- name: Unmanaged dependency check
17-
uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.50.0
17+
uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.50.1
1818
with:
1919
bom-path: pom.xml

.kokoro/presubmit/graalvm-native-a.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Configure the docker image for kokoro-trampoline.
44
env_vars: {
55
key: "TRAMPOLINE_IMAGE"
6-
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.50.0"
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.50.1"
77
}
88

99
env_vars: {

.kokoro/presubmit/graalvm-native-b.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Configure the docker image for kokoro-trampoline.
44
env_vars: {
55
key: "TRAMPOLINE_IMAGE"
6-
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.50.0"
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.50.1"
77
}
88

99
env_vars: {

.kokoro/presubmit/graalvm-native-c.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Configure the docker image for kokoro-trampoline.
44
env_vars: {
55
key: "TRAMPOLINE_IMAGE"
6-
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.50.0"
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.50.1"
77
}
88

99
env_vars: {

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
# Changelog
22

33

4+
## [0.132.11-alpha](https://github.com/googleapis/java-logging-logback/compare/v0.132.10-alpha...v0.132.11-alpha) (2025-07-11)
5+
6+
7+
### Dependencies
8+
9+
* Update dependency com.google.cloud:google-cloud-logging to v3.23.0 ([#1495](https://github.com/googleapis/java-logging-logback/issues/1495)) ([91f4721](https://github.com/googleapis/java-logging-logback/commit/91f47213672aa3f8e45612019347d78437f5a7db))
10+
* Update dependency com.google.cloud:sdk-platform-java-config to v3.50.1 ([#1493](https://github.com/googleapis/java-logging-logback/issues/1493)) ([18ba871](https://github.com/googleapis/java-logging-logback/commit/18ba871695078cd3dad126690e3b2d5551107665))
11+
412
## [0.132.10-alpha](https://github.com/googleapis/java-logging-logback/compare/v0.132.9-alpha...v0.132.10-alpha) (2025-06-25)
513

614

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66

77
<artifactId>google-cloud-logging-logback</artifactId>
8-
<version>0.132.11-alpha-SNAPSHOT</version><!-- {x-version-update:google-cloud-logging-logback:current} -->
8+
<version>0.132.11-alpha</version><!-- {x-version-update:google-cloud-logging-logback:current} -->
99
<packaging>jar</packaging>
1010
<name>Google Cloud Logging Logback Appender</name>
1111
<url>https://github.com/googleapis/java-logging-logback</url>
@@ -17,15 +17,15 @@
1717
<logback.version>1.2.13</logback.version>
1818
<easymock.version>5.6.0</easymock.version>
1919
<truth.version>1.4.4</truth.version>
20-
<logging.version>3.22.6</logging.version>
20+
<logging.version>3.23.0</logging.version>
2121
<slf4j.version>1.7.36</slf4j.version>
2222
<google.api-common.version>1.10.1</google.api-common.version>
2323
</properties>
2424

2525
<parent>
2626
<groupId>com.google.cloud</groupId>
2727
<artifactId>sdk-platform-java-config</artifactId>
28-
<version>3.50.0</version>
28+
<version>3.50.1</version>
2929
</parent>
3030

3131
<developers>

samples/snapshot/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<dependency>
2929
<groupId>com.google.cloud</groupId>
3030
<artifactId>google-cloud-logging-logback</artifactId>
31-
<version>0.132.11-alpha-SNAPSHOT</version>
31+
<version>0.132.11-alpha</version>
3232
</dependency>
3333
<!-- {x-version-update-end} -->
3434

src/main/java/com/google/cloud/logging/logback/LoggingAppender.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ public class LoggingAppender extends UnsynchronizedAppenderBase<ILoggingEvent> {
122122
// See
123123
// https://github.com/googleapis/release-please/blob/main/docs/customizing.md#updating-arbitrary-files
124124
// {x-version-update-start:google-cloud-logging-logback:current}
125-
public static final String DEFAULT_INSTRUMENTATION_VERSION = "0.132.11-alpha-SNAPSHOT";
125+
public static final String DEFAULT_INSTRUMENTATION_VERSION = "0.132.11-alpha";
126126
// {x-version-update-end}
127127
private static boolean instrumentationAdded = false;
128128
private static final Object instrumentationLock = new Object();

versions.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Format:
22
# module:released-version:current-version
33

4-
google-cloud-logging-logback:0.132.10-alpha:0.132.11-alpha-SNAPSHOT
4+
google-cloud-logging-logback:0.132.11-alpha:0.132.11-alpha

0 commit comments

Comments
 (0)