Skip to content

Commit 620518b

Browse files
cindy-pengcindy-peng
authored
Merge branch 'main' into renovate/com.google.cloud.samples-shared-configuration-1.x
2 parents f954f06 + a1ec68d commit 620518b

File tree

20 files changed

+119
-34
lines changed

20 files changed

+119
-34
lines changed

‎.github/workflows/hermetic_library_generation.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
with:
3838
fetch-depth: 0
3939
token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
40-
- uses: googleapis/sdk-platform-java/.github/scripts@v2.46.0
40+
- uses: googleapis/sdk-platform-java/.github/scripts@v2.49.0
4141
if: env.SHOULD_RUN == 'true'
4242
with:
4343
base_ref: ${{ github.base_ref }}

‎.github/workflows/unmanaged_dependency_check.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ jobs:
1717
# repository
1818
.kokoro/build.sh
1919
- name: Unmanaged dependency check
20-
uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.35.0
20+
uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.39.0
2121
with:
2222
bom-path: google-cloud-logging-bom/pom.xml

‎.kokoro/presubmit/graalvm-native-17.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.35.0"
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.39.0"
77
}
88

99
env_vars: {

‎.kokoro/presubmit/graalvm-native.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.35.0"
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.39.0"
77
}
88

99
env_vars: {

‎CHANGELOG.md‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,39 @@
11
# Changelog
22

3+
## [3.20.6](https://github.com/googleapis/java-logging/compare/v3.20.5...v3.20.6) (2024-10-26)
4+
5+
6+
### Dependencies
7+
8+
* Update sdk platform java dependencies ([#1717](https://github.com/googleapis/java-logging/issues/1717)) ([ee9ef91](https://github.com/googleapis/java-logging/commit/ee9ef91a9ebaed9faa5870a29be40b0c1531a226))
9+
10+
## [3.20.5](https://github.com/googleapis/java-logging/compare/v3.20.4...v3.20.5) (2024-10-23)
11+
12+
13+
### Dependencies
14+
15+
* Update sdk platform java dependencies ([#1707](https://github.com/googleapis/java-logging/issues/1707)) ([2359040](https://github.com/googleapis/java-logging/commit/23590409f5c4aaff5c741e860fc0916f7ec4c963))
16+
17+
## [3.20.4](https://github.com/googleapis/java-logging/compare/v3.20.3...v3.20.4) (2024-10-07)
18+
19+
20+
### Bug Fixes
21+
22+
* **deps:** Update the Java code generator (gapic-generator-java) to 2.47.0 ([90b88ee](https://github.com/googleapis/java-logging/commit/90b88ee70ee84bdcb0af4aced50b5ee61e0a706c))
23+
24+
25+
### Dependencies
26+
27+
* 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))
28+
29+
## [3.20.3](https://github.com/googleapis/java-logging/compare/v3.20.2...v3.20.3) (2024-10-01)
30+
31+
32+
### Dependencies
33+
34+
* 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))
35+
* Update dependency org.apache.maven.plugins:maven-deploy-plugin to v3.1.3 ([2b6ea70](https://github.com/googleapis/java-logging/commit/2b6ea703aad05e714f5634fbd74e0b9bca0c51f9))
36+
337
## [3.20.2](https://github.com/googleapis/java-logging/compare/v3.20.1...v3.20.2) (2024-09-12)
438

539

‎README.md‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
3838

3939
If you are using Maven without the BOM, add this to your dependencies:
4040

41-
<!-- {x-version-update-start:google-cloud-logging:released} -->
4241

4342
```xml
4443
<dependency>
@@ -52,22 +51,21 @@ If you are using Maven without the BOM, add this to your dependencies:
5251
If you are using Gradle 5.x or later, add this to your dependencies:
5352

5453
```Groovy
55-
implementation platform('com.google.cloud:libraries-bom:26.47.0')
54+
implementation platform('com.google.cloud:libraries-bom:26.50.0')
5655
5756
implementation 'com.google.cloud:google-cloud-logging'
5857
```
5958
If you are using Gradle without BOM, add this to your dependencies:
6059

6160
```Groovy
62-
implementation 'com.google.cloud:google-cloud-logging:3.20.2'
61+
implementation 'com.google.cloud:google-cloud-logging:3.20.6'
6362
```
6463

6564
If you are using SBT, add this to your dependencies:
6665

6766
```Scala
68-
libraryDependencies += "com.google.cloud" % "google-cloud-logging" % "3.20.2"
67+
libraryDependencies += "com.google.cloud" % "google-cloud-logging" % "3.20.6"
6968
```
70-
<!-- {x-version-update-end} -->
7169

7270
## Authentication
7371

@@ -465,7 +463,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
465463
[kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-logging/java11.html
466464
[stability-image]: https://img.shields.io/badge/stability-stable-green
467465
[maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-logging.svg
468-
[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-logging/3.20.2
466+
[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-logging/3.20.6
469467
[authentication]: https://github.com/googleapis/google-cloud-java#authentication
470468
[auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
471469
[predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles

‎generation_config.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
gapic_generator_version: 2.46.0
2-
googleapis_commitish: 5c181aaf78bd1ae2e08c3a2971cd9e87b6e00986
3-
libraries_bom_version: 26.47.0
1+
gapic_generator_version: 2.49.0
2+
googleapis_commitish: 9b94dba2f7f4b601f8232bc3a3f6ef32665279b9
3+
libraries_bom_version: 26.50.0
44
libraries:
55
- api_shortname: logging
66
name_pretty: Cloud Logging

‎google-cloud-logging-bom/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.google.cloud</groupId>
55
<artifactId>google-cloud-logging-bom</artifactId>
6-
<version>3.20.3-SNAPSHOT</version><!-- {x-version-update:google-cloud-logging:current} -->
6+
<version>3.20.6</version><!-- {x-version-update:google-cloud-logging:current} -->
77
<packaging>pom</packaging>
88
<parent>
99
<groupId>com.google.cloud</groupId>
1010
<artifactId>sdk-platform-java-config</artifactId>
11-
<version>3.35.0</version>
11+
<version>3.39.0</version>
1212
</parent>
1313

1414
<name>Google Cloud logging BOM</name>
@@ -53,17 +53,17 @@
5353
<dependency>
5454
<groupId>com.google.cloud</groupId>
5555
<artifactId>google-cloud-logging</artifactId>
56-
<version>3.20.3-SNAPSHOT</version><!-- {x-version-update:google-cloud-logging:current} -->
56+
<version>3.20.6</version><!-- {x-version-update:google-cloud-logging:current} -->
5757
</dependency>
5858
<dependency>
5959
<groupId>com.google.api.grpc</groupId>
6060
<artifactId>grpc-google-cloud-logging-v2</artifactId>
61-
<version>0.109.3-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-logging-v2:current} -->
61+
<version>0.109.6</version><!-- {x-version-update:grpc-google-cloud-logging-v2:current} -->
6262
</dependency>
6363
<dependency>
6464
<groupId>com.google.api.grpc</groupId>
6565
<artifactId>proto-google-cloud-logging-v2</artifactId>
66-
<version>0.109.3-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-logging-v2:current} -->
66+
<version>0.109.6</version><!-- {x-version-update:proto-google-cloud-logging-v2:current} -->
6767
</dependency>
6868
</dependencies>
6969
</dependencyManagement>

‎google-cloud-logging/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.google.cloud</groupId>
55
<artifactId>google-cloud-logging</artifactId>
6-
<version>3.20.3-SNAPSHOT</version><!-- {x-version-update:google-cloud-logging:current} -->
6+
<version>3.20.6</version><!-- {x-version-update:google-cloud-logging:current} -->
77
<packaging>jar</packaging>
88
<name>Google Cloud Logging</name>
99
<url>https://github.com/googleapis/java-logging</url>
1010
<description>Java idiomatic client for Cloud Logging</description>
1111
<parent>
1212
<groupId>com.google.cloud</groupId>
1313
<artifactId>google-cloud-logging-parent</artifactId>
14-
<version>3.20.3-SNAPSHOT</version><!-- {x-version-update:google-cloud-logging:current} -->
14+
<version>3.20.6</version><!-- {x-version-update:google-cloud-logging:current} -->
1515
</parent>
1616
<properties>
1717
<site.installationModule>google-cloud-logging</site.installationModule>

‎google-cloud-logging/src/main/java/com/google/cloud/logging/Instrumentation.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public final class Instrumentation {
4040
// See
4141
// https://github.com/googleapis/release-please/blob/main/docs/customizing.md#updating-arbitrary-files
4242
// {x-version-update-start:google-cloud-logging:current}
43-
public static final String DEFAULT_INSTRUMENTATION_VERSION = "3.20.3-SNAPSHOT";
43+
public static final String DEFAULT_INSTRUMENTATION_VERSION = "3.20.6";
4444
// {x-version-update-end}
4545
public static final String INSTRUMENTATION_LOG_NAME = "diagnostic-log";
4646
public static final int MAX_DIAGNOSTIC_VALUE_LENGTH = 14;

0 commit comments

Comments
 (0)