From 70a31e9bafef425c757b514def229a5aa989e96f Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 2 Aug 2024 10:31:50 -0400 Subject: [PATCH 01/13] chore(main): release 0.131.10-alpha-SNAPSHOT (#1345) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- pom.xml | 2 +- samples/snapshot/pom.xml | 2 +- .../java/com/google/cloud/logging/logback/LoggingAppender.java | 2 +- versions.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 10c423144..d423897c0 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 google-cloud-logging-logback - 0.131.9-alpha + 0.131.10-alpha-SNAPSHOT jar Google Cloud Logging Logback Appender https://github.com/googleapis/java-logging-logback diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index fca72f985..2d9e7ba82 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-logging-logback - 0.131.9-alpha + 0.131.10-alpha-SNAPSHOT diff --git a/src/main/java/com/google/cloud/logging/logback/LoggingAppender.java b/src/main/java/com/google/cloud/logging/logback/LoggingAppender.java index 7c3aea2e0..2a7af9164 100644 --- 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 { // 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.131.9-alpha"; + public static final String DEFAULT_INSTRUMENTATION_VERSION = "0.131.10-alpha-SNAPSHOT"; // {x-version-update-end} private static boolean instrumentationAdded = false; private static final Object instrumentationLock = new Object(); diff --git a/versions.txt b/versions.txt index e6c779428..fe9581e42 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-logging-logback:0.131.9-alpha:0.131.9-alpha +google-cloud-logging-logback:0.131.9-alpha:0.131.10-alpha-SNAPSHOT From edf04af45edb07ccc267b31be364015f45f8f734 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 2 Aug 2024 16:42:54 +0200 Subject: [PATCH 02/13] chore(deps): update dependency com.google.cloud:google-cloud-logging-logback to v0.131.8-alpha (#1337) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore(deps): update dependency com.google.cloud:google-cloud-logging-logback to v0.131.8-alpha * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot --- samples/install-without-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index f1f245218..8eb5cf2f7 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-logging-logback - 0.131.7-alpha + 0.131.8-alpha From 4c752fc6fc5d5cb512dc9630b758bb8092baadb6 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 2 Aug 2024 17:00:18 +0200 Subject: [PATCH 03/13] deps: update dependency org.easymock:easymock to v5.4.0 (#1350) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * deps: update dependency org.easymock:easymock to v5.4.0 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot --- README.md | 8 ++++---- pom.xml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 545ca7643..8698b477d 100644 --- a/README.md +++ b/README.md @@ -23,20 +23,20 @@ If you are using Maven, add this to your pom.xml file: com.google.cloud google-cloud-logging-logback - 0.131.8-alpha + 0.131.9-alpha ``` If you are using Gradle without BOM, add this to your dependencies: ```Groovy -implementation 'com.google.cloud:google-cloud-logging-logback:0.131.8-alpha' +implementation 'com.google.cloud:google-cloud-logging-logback:0.131.9-alpha' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-logging-logback" % "0.131.8-alpha" +libraryDependencies += "com.google.cloud" % "google-cloud-logging-logback" % "0.131.9-alpha" ``` @@ -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.131.8-alpha +[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-logging-logback/0.131.9-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 index d423897c0..aa864e562 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ 1.2.13 - 5.3.0 + 5.4.0 1.4.2 3.19.0 1.7.36 From 47fc8f1745c5852ad8cff429715d2dbfbd4301ee Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 2 Aug 2024 17:00:39 +0200 Subject: [PATCH 04/13] deps: update dependency com.google.cloud:sdk-platform-java-config to v3.33.0 (#1349) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * deps: update dependency com.google.cloud:sdk-platform-java-config to v3.33.0 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot --- .github/workflows/unmanaged_dependency_check.yaml | 2 +- .kokoro/presubmit/graalvm-native-17.cfg | 2 +- .kokoro/presubmit/graalvm-native.cfg | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml index 8eb9dfbd6..09f954387 100644 --- a/.github/workflows/unmanaged_dependency_check.yaml +++ b/.github/workflows/unmanaged_dependency_check.yaml @@ -14,6 +14,6 @@ jobs: shell: bash run: .kokoro/build.sh - name: Unmanaged dependency check - uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.32.0 + uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.33.0 with: bom-path: pom.xml diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg index 7d5ab3a25..7008a7215 100644 --- a/.kokoro/presubmit/graalvm-native-17.cfg +++ b/.kokoro/presubmit/graalvm-native-17.cfg @@ -3,7 +3,7 @@ # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.32.0" + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.33.0" } env_vars: { diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg index 519c2e3ce..931f9bb00 100644 --- a/.kokoro/presubmit/graalvm-native.cfg +++ b/.kokoro/presubmit/graalvm-native.cfg @@ -3,7 +3,7 @@ # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.32.0" + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.33.0" } env_vars: { diff --git a/pom.xml b/pom.xml index aa864e562..dc4e1a7f4 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ com.google.cloud sdk-platform-java-config - 3.32.0 + 3.33.0 From 2653bf7db46a5aa6a6c6d137ebe708c7848af578 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 2 Aug 2024 17:01:11 +0200 Subject: [PATCH 05/13] test(deps): update dependency com.google.truth:truth to v1.4.4 (#1347) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * test(deps): update dependency com.google.truth:truth to v1.4.4 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot --- samples/install-without-bom/pom.xml | 2 +- samples/snapshot/pom.xml | 2 +- samples/snippets/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 8eb5cf2f7..838e59b1a 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -42,7 +42,7 @@ com.google.truth truth - 1.4.2 + 1.4.4 test diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 2d9e7ba82..662bc048a 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -41,7 +41,7 @@ com.google.truth truth - 1.4.2 + 1.4.4 test diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index b4247ddaa..11c8e14e3 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -53,7 +53,7 @@ com.google.truth truth - 1.4.2 + 1.4.4 test From eec31052ef2ae25f2edc97c0a9ee20bfb7995906 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 2 Aug 2024 17:02:10 +0200 Subject: [PATCH 06/13] build(deps): update dependency org.apache.maven.plugins:maven-project-info-reports-plugin to v3.6.2 (#1339) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * build(deps): update dependency org.apache.maven.plugins:maven-project-info-reports-plugin to v3.6.2 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index dc4e1a7f4..d63d336ad 100644 --- a/pom.xml +++ b/pom.xml @@ -159,7 +159,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.5.0 + 3.6.2 From f2c34dc0b291def4fad443dfba6665bb0e68524d Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 2 Aug 2024 17:57:25 +0200 Subject: [PATCH 07/13] chore(deps): update dependency com.google.cloud:libraries-bom to v26.43.0 (#1338) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore(deps): update dependency com.google.cloud:libraries-bom to v26.43.0 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot --- samples/snippets/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 11c8e14e3..9768a9382 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 26.40.0 + 26.43.0 pom import From 6bd3de66be34f28e0a1b0a1cb7b228baf191bad6 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 2 Aug 2024 18:09:36 +0200 Subject: [PATCH 08/13] chore(deps): update dependency com.google.cloud:google-cloud-logging-logback to v0.131.9-alpha (#1353) --- samples/install-without-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 838e59b1a..7efe9d6eb 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-logging-logback - 0.131.8-alpha + 0.131.9-alpha From 2568306f1eb5dec6f08b0460a172da1347c2faf2 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 2 Aug 2024 18:09:49 +0200 Subject: [PATCH 09/13] test(deps): update dependency com.google.truth:truth to v1.4.4 (#1346) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d63d336ad..bfc4caf4c 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ 1.2.13 5.4.0 - 1.4.2 + 1.4.4 3.19.0 1.7.36 1.10.1 From 2deac4f836060bfb19c377f4a50b8dda0c9fa7fe Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 2 Aug 2024 18:10:22 +0200 Subject: [PATCH 10/13] build(deps): update dependency org.sonatype.plugins:nexus-staging-maven-plugin to v1.7.0 (#1334) --- samples/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/pom.xml b/samples/pom.xml index efdc2982d..c9e5054a5 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -46,7 +46,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.14 + 1.7.0 true From e3634d70284d2f80c03072e9aecd93b505f22551 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 2 Aug 2024 18:47:32 +0200 Subject: [PATCH 11/13] deps: update dependency com.google.cloud:google-cloud-logging to v3.20.0 (#1351) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bfc4caf4c..4d5411677 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ 1.2.13 5.4.0 1.4.4 - 3.19.0 + 3.20.0 1.7.36 1.10.1 From 8c31f67695e71da6652e6f19a284f2633c561dd3 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 2 Aug 2024 13:14:16 -0400 Subject: [PATCH 12/13] chore(main): release 0.131.10-alpha (#1352) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- CHANGELOG.md | 9 +++++++++ pom.xml | 2 +- samples/snapshot/pom.xml | 2 +- .../google/cloud/logging/logback/LoggingAppender.java | 2 +- versions.txt | 2 +- 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 590318e08..bc5b7447c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,15 @@ # Changelog +## [0.131.10-alpha](https://github.com/googleapis/java-logging-logback/compare/v0.131.9-alpha...v0.131.10-alpha) (2024-08-02) + + +### Dependencies + +* Update dependency com.google.cloud:google-cloud-logging to v3.20.0 ([#1351](https://github.com/googleapis/java-logging-logback/issues/1351)) ([e3634d7](https://github.com/googleapis/java-logging-logback/commit/e3634d70284d2f80c03072e9aecd93b505f22551)) +* Update dependency com.google.cloud:sdk-platform-java-config to v3.33.0 ([#1349](https://github.com/googleapis/java-logging-logback/issues/1349)) ([47fc8f1](https://github.com/googleapis/java-logging-logback/commit/47fc8f1745c5852ad8cff429715d2dbfbd4301ee)) +* Update dependency org.easymock:easymock to v5.4.0 ([#1350](https://github.com/googleapis/java-logging-logback/issues/1350)) ([4c752fc](https://github.com/googleapis/java-logging-logback/commit/4c752fc6fc5d5cb512dc9630b758bb8092baadb6)) + ## [0.131.9-alpha](https://github.com/googleapis/java-logging-logback/compare/v0.131.8-alpha...v0.131.9-alpha) (2024-06-26) diff --git a/pom.xml b/pom.xml index 4d5411677..ab42b4a3c 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 google-cloud-logging-logback - 0.131.10-alpha-SNAPSHOT + 0.131.10-alpha jar Google Cloud Logging Logback Appender https://github.com/googleapis/java-logging-logback diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 662bc048a..72679bb05 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-logging-logback - 0.131.10-alpha-SNAPSHOT + 0.131.10-alpha diff --git a/src/main/java/com/google/cloud/logging/logback/LoggingAppender.java b/src/main/java/com/google/cloud/logging/logback/LoggingAppender.java index 2a7af9164..8ce08e322 100644 --- 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 { // 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.131.10-alpha-SNAPSHOT"; + public static final String DEFAULT_INSTRUMENTATION_VERSION = "0.131.10-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 index fe9581e42..ba4e4b5f0 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-logging-logback:0.131.9-alpha:0.131.10-alpha-SNAPSHOT +google-cloud-logging-logback:0.131.10-alpha:0.131.10-alpha From 4a8b0c8c3262db09b2343914e573af2aab1d5933 Mon Sep 17 00:00:00 2001 From: diegomarquezp Date: Fri, 16 Aug 2024 15:20:47 +0000 Subject: [PATCH 13/13] chore: secure hermetic build workflow --- .../hermetic_library_generation.yaml | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 .github/workflows/hermetic_library_generation.yaml diff --git a/.github/workflows/hermetic_library_generation.yaml b/.github/workflows/hermetic_library_generation.yaml new file mode 100644 index 000000000..8b479f3a4 --- /dev/null +++ b/.github/workflows/hermetic_library_generation.yaml @@ -0,0 +1,43 @@ +# Copyright 2024 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# GitHub action job to test core java library features on +# downstream client libraries before they are released. +name: Hermetic library generation upon generation config change through pull requests +on: + pull_request: + +env: + HEAD_REF: ${{ github.head_ref }} + +jobs: + library_generation: + # skip pull requests come from a forked repository + if: github.event.pull_request.head.repo.full_name == github.repository + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }} + - name: Generate changed libraries + shell: bash + run: | + set -x + [ -z "$(git config user.email)" ] && git config --global user.email "cloud-java-bot@google.com" + [ -z "$(git config user.name)" ] && git config --global user.name "cloud-java-bot" + bash .github/scripts/hermetic_library_generation.sh \ + --target_branch ${{ github.base_ref }} \ + --current_branch $HEAD_REF + env: + GH_TOKEN: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}