diff --git a/.github/release-please.yml b/.github/release-please.yml index e39dbc752..8bf0efc4a 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -31,6 +31,13 @@ branches: - >- google-cloud-logging/src/main/java/com/google/cloud/logging/Instrumentation.java branch: 3.21.x + - bumpMinorPreMajor: true + handleGHRelease: true + releaseType: java-backport + extraFiles: + - >- + google-cloud-logging/src/main/java/com/google/cloud/logging/Instrumentation.java + branch: 3.22.x extraFiles: - >- google-cloud-logging/src/main/java/com/google/cloud/logging/Instrumentation.java diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index 5a1544370..0a7d29993 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -99,6 +99,25 @@ branchProtectionRules: - javadoc - library_generation - unmanaged_dependency_check + - pattern: 3.22.x + isAdminEnforced: true + requiredApprovingReviewCount: 1 + requiresCodeOwnerReviews: true + requiresStrictStatusChecks: false + requiredStatusCheckContexts: + - dependencies (17) + - lint + - clirr + - units (8) + - units (11) + - 'Kokoro - Test: Integration' + - cla/google + - 'Kokoro - Test: Java GraalVM Native Image A' + - 'Kokoro - Test: Java GraalVM Native Image B' + - 'Kokoro - Test: Java GraalVM Native Image C' + - javadoc + - library_generation + - unmanaged_dependency_check permissionRules: - team: yoshi-admins permission: admin diff --git a/.github/workflows/hermetic_library_generation.yaml b/.github/workflows/hermetic_library_generation.yaml index 7838b82ee..c01f3faec 100644 --- 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.60.0 + - uses: googleapis/sdk-platform-java/.github/scripts@v2.59.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 index 33abe0864..8d1ed1d12 100644 --- 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.50.0 + uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.50.1 with: bom-path: google-cloud-logging-bom/pom.xml diff --git a/CHANGELOG.md b/CHANGELOG.md index 41d51567b..abd7263c3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [3.23.0](https://github.com/googleapis/java-logging/compare/v3.22.6...v3.23.0) (2025-07-11) + + +### Features + +* Next release from main branch is 3.23.0 ([#1826](https://github.com/googleapis/java-logging/issues/1826)) ([f0ef15f](https://github.com/googleapis/java-logging/commit/f0ef15f609a3400460bd8074bdd05014cc388743)) + + +### Dependencies + +* Update dependency com.google.cloud:sdk-platform-java-config to v3.50.1 ([#1828](https://github.com/googleapis/java-logging/issues/1828)) ([44c3094](https://github.com/googleapis/java-logging/commit/44c3094e23450f1a8e6bb397f209b17cf37a4345)) + ## [3.22.6](https://github.com/googleapis/java-logging/compare/v3.22.5...v3.22.6) (2025-06-25) diff --git a/README.md b/README.md index 8c87204e6..1d155bc90 100644 --- a/README.md +++ b/README.md @@ -58,13 +58,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.22.6' +implementation 'com.google.cloud:google-cloud-logging:3.23.0' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-logging" % "3.22.6" +libraryDependencies += "com.google.cloud" % "google-cloud-logging" % "3.23.0" ``` ## Authentication @@ -463,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.22.6 +[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-logging/3.23.0 [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 index a78eea0cf..8d23d5d07 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,5 +1,5 @@ gapic_generator_version: 2.59.0 -googleapis_commitish: 34b323e7ee72888dd9337cce8b24233ae078f23b +googleapis_commitish: 0cdaee64d46d284e4d54afe5b429379b4c6770fc libraries_bom_version: 26.61.0 libraries: - api_shortname: logging diff --git a/google-cloud-logging-bom/pom.xml b/google-cloud-logging-bom/pom.xml index 76b3baace..c5052c39d 100644 --- a/google-cloud-logging-bom/pom.xml +++ b/google-cloud-logging-bom/pom.xml @@ -3,12 +3,12 @@ 4.0.0 com.google.cloud google-cloud-logging-bom - 3.22.6 + 3.23.0 pom com.google.cloud sdk-platform-java-config - 3.50.0 + 3.50.1 Google Cloud logging BOM @@ -53,17 +53,17 @@ com.google.cloud google-cloud-logging - 3.22.6 + 3.23.0 com.google.api.grpc grpc-google-cloud-logging-v2 - 0.111.6 + 0.112.0 com.google.api.grpc proto-google-cloud-logging-v2 - 0.111.6 + 0.112.0 diff --git a/google-cloud-logging/pom.xml b/google-cloud-logging/pom.xml index 4ae9a9fa4..94be2d5cd 100644 --- a/google-cloud-logging/pom.xml +++ b/google-cloud-logging/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-logging - 3.22.6 + 3.23.0 jar Google Cloud Logging https://github.com/googleapis/java-logging @@ -11,7 +11,7 @@ com.google.cloud google-cloud-logging-parent - 3.22.6 + 3.23.0 google-cloud-logging 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 index 8aa33a4f5..2d2fc280f 100644 --- 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.22.6"; + public static final String DEFAULT_INSTRUMENTATION_VERSION = "3.23.0"; // {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 index bd5dcdafe..fc12cfd34 100644 --- a/grpc-google-cloud-logging-v2/pom.xml +++ b/grpc-google-cloud-logging-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-logging-v2 - 0.111.6 + 0.112.0 grpc-google-cloud-logging-v2 GRPC library for grpc-google-cloud-logging-v2 com.google.cloud google-cloud-logging-parent - 3.22.6 + 3.23.0 diff --git a/pom.xml b/pom.xml index 4e3ab5658..f5b06a533 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-logging-parent pom - 3.22.6 + 3.23.0 Google Cloud Logging Parent https://github.com/googleapis/java-logging @@ -14,7 +14,7 @@ com.google.cloud sdk-platform-java-config - 3.50.0 + 3.50.1 @@ -80,17 +80,17 @@ com.google.api.grpc proto-google-cloud-logging-v2 - 0.111.6 + 0.112.0 com.google.api.grpc grpc-google-cloud-logging-v2 - 0.111.6 + 0.112.0 com.google.cloud google-cloud-logging - 3.22.6 + 3.23.0 diff --git a/proto-google-cloud-logging-v2/pom.xml b/proto-google-cloud-logging-v2/pom.xml index 601ef916b..923edfd63 100644 --- a/proto-google-cloud-logging-v2/pom.xml +++ b/proto-google-cloud-logging-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-logging-v2 - 0.111.6 + 0.112.0 proto-google-cloud-logging-v2 PROTO library for proto-google-cloud-logging-v2 com.google.cloud google-cloud-logging-parent - 3.22.6 + 3.23.0 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 01b41a9c9..a035e9f30 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-logging - 3.22.6 + 3.23.0 diff --git a/versions.txt b/versions.txt index 7c0dc7e4a..bbbc9938f 100644 --- a/versions.txt +++ b/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -google-cloud-logging:3.22.6:3.22.6 -grpc-google-cloud-logging-v2:0.111.6:0.111.6 -proto-google-cloud-logging-v2:0.111.6:0.111.6 +google-cloud-logging:3.23.0:3.23.0 +grpc-google-cloud-logging-v2:0.112.0:0.112.0 +proto-google-cloud-logging-v2:0.112.0:0.112.0