From a4d9d20ff4f33663d89ed24142fc1d0f0a23f140 Mon Sep 17 00:00:00 2001 From: Diego Marquez Date: Thu, 24 Apr 2025 14:32:59 -0400 Subject: [PATCH 1/6] build: introduce testing infra for GraalVM "C" (#1460) * build: introduce testing infra for GraalVM "C" * fix: use JOB_TYPE=graalvm in job B * chore: update versions to latest --- .kokoro/build.sh | 5 --- ...raalvm-native.cfg => graalvm-native-a.cfg} | 2 +- .kokoro/presubmit/graalvm-native-b.cfg | 33 +++++++++++++++++++ ...lvm-native-17.cfg => graalvm-native-c.cfg} | 2 +- 4 files changed, 35 insertions(+), 7 deletions(-) rename .kokoro/presubmit/{graalvm-native.cfg => graalvm-native-a.cfg} (97%) create mode 100644 .kokoro/presubmit/graalvm-native-b.cfg rename .kokoro/presubmit/{graalvm-native-17.cfg => graalvm-native-c.cfg} (97%) diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 4239a1127..aec02e75e 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -75,11 +75,6 @@ graalvm) mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative test RETURN_CODE=$? ;; -graalvm17) - # Run Unit and Integration Tests with Native Image - mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative test - RETURN_CODE=$? - ;; samples) SAMPLES_DIR=samples # only run ITs in snapshot/ on presubmit PRs. run ITs in all 3 samples/ subdirectories otherwise. diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native-a.cfg similarity index 97% rename from .kokoro/presubmit/graalvm-native.cfg rename to .kokoro/presubmit/graalvm-native-a.cfg index fb1979a33..54c4b8a3d 100644 --- a/.kokoro/presubmit/graalvm-native.cfg +++ b/.kokoro/presubmit/graalvm-native-a.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.45.1" + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.46.2" } env_vars: { diff --git a/.kokoro/presubmit/graalvm-native-b.cfg b/.kokoro/presubmit/graalvm-native-b.cfg new file mode 100644 index 000000000..666fed537 --- /dev/null +++ b/.kokoro/presubmit/graalvm-native-b.cfg @@ -0,0 +1,33 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.46.2" +} + +env_vars: { + key: "JOB_TYPE" + value: "graalvm" +} + +# TODO: remove this after we've migrated all tests and scripts +env_vars: { + key: "GCLOUD_PROJECT" + value: "gcloud-devel" +} + +env_vars: { + key: "GOOGLE_CLOUD_PROJECT" + value: "gcloud-devel" +} + +env_vars: { + key: "GOOGLE_APPLICATION_CREDENTIALS" + value: "secret_manager/java-it-service-account" +} + +env_vars: { + key: "SECRET_MANAGER_KEYS" + value: "java-it-service-account" +} \ No newline at end of file diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-c.cfg similarity index 97% rename from .kokoro/presubmit/graalvm-native-17.cfg rename to .kokoro/presubmit/graalvm-native-c.cfg index 07ae08a98..cdc17b472 100644 --- a/.kokoro/presubmit/graalvm-native-17.cfg +++ b/.kokoro/presubmit/graalvm-native-c.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.45.1" + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.46.2" } env_vars: { From d88928cad267eaaea5e8e6009375deb8c9534bdd Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 25 Apr 2025 20:22:33 +0200 Subject: [PATCH 2/6] deps: update dependency com.google.cloud:sdk-platform-java-config to v3.46.2 (#1461) --- .github/workflows/unmanaged_dependency_check.yaml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml index 6b4a8e5c5..e9e27d453 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.45.1 + uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.46.2 with: bom-path: pom.xml diff --git a/pom.xml b/pom.xml index 66cb6f91e..706acb750 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ com.google.cloud sdk-platform-java-config - 3.45.1 + 3.46.2 From 1b8419bd22ad31c20b564a29210c9522162a21b3 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Sat, 26 Apr 2025 03:24:21 +0200 Subject: [PATCH 3/6] deps: update dependency com.google.cloud:google-cloud-logging to v3.22.1 (#1462) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 706acb750..534ac8e36 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ 1.2.13 5.5.0 1.4.4 - 3.22.0 + 3.22.1 1.7.36 1.10.1 From 8b6ea8c736aeb2454cb95787651862da1364b3b5 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Sat, 26 Apr 2025 03:34:21 +0200 Subject: [PATCH 4/6] deps: update dependency com.google.cloud:google-cloud-logging to v3.22.2 (#1463) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:google-cloud-logging](https://redirect.github.com/googleapis/java-logging) | `3.22.1` -> `3.22.2` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.cloud:google-cloud-logging/3.22.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.google.cloud:google-cloud-logging/3.22.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.google.cloud:google-cloud-logging/3.22.1/3.22.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.cloud:google-cloud-logging/3.22.1/3.22.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-logging (com.google.cloud:google-cloud-logging) ### [`v3.22.2`](https://redirect.github.com/googleapis/java-logging/blob/HEAD/CHANGELOG.md#3222-2025-04-25) [Compare Source](https://redirect.github.com/googleapis/java-logging/compare/v3.22.1...v3.22.2) ##### Dependencies - Update dependency com.google.cloud:sdk-platform-java-config to v3.46.2 ([#​1796](https://redirect.github.com/googleapis/java-logging/issues/1796)) ([1f88271](https://redirect.github.com/googleapis/java-logging/commit/1f882712aeb7e48a2339ffbad783813e11e74401))
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/googleapis/java-logging-logback). --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 534ac8e36..0b1d24c9d 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ 1.2.13 5.5.0 1.4.4 - 3.22.1 + 3.22.2 1.7.36 1.10.1 From f83fb875cf3a9697c18dd89ecfb3d3673474f49c Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Sat, 26 Apr 2025 01:34:28 +0000 Subject: [PATCH 5/6] chore(main): release 0.132.6-alpha-SNAPSHOT (#1458) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- 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 0b1d24c9d..e0472387b 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 google-cloud-logging-logback - 0.132.5-alpha + 0.132.6-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 ce7c0c783..3983e994d 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-logging-logback - 0.132.5-alpha + 0.132.6-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 320e9a44e..c9850973a 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.132.5-alpha"; + public static final String DEFAULT_INSTRUMENTATION_VERSION = "0.132.6-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 78cc8f6af..8ceb999b1 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-logging-logback:0.132.5-alpha:0.132.5-alpha +google-cloud-logging-logback:0.132.5-alpha:0.132.6-alpha-SNAPSHOT From e9a962417e947bd78c57701137ef61d5ea553ee3 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 25 Apr 2025 22:43:03 -0400 Subject: [PATCH 6/6] chore(main): release 0.132.6-alpha (#1464) 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 8d09dcf7e..e0e80b09a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,15 @@ # Changelog +## [0.132.6-alpha](https://github.com/googleapis/java-logging-logback/compare/v0.132.5-alpha...v0.132.6-alpha) (2025-04-26) + + +### Dependencies + +* Update dependency com.google.cloud:google-cloud-logging to v3.22.1 ([#1462](https://github.com/googleapis/java-logging-logback/issues/1462)) ([1b8419b](https://github.com/googleapis/java-logging-logback/commit/1b8419bd22ad31c20b564a29210c9522162a21b3)) +* Update dependency com.google.cloud:google-cloud-logging to v3.22.2 ([#1463](https://github.com/googleapis/java-logging-logback/issues/1463)) ([8b6ea8c](https://github.com/googleapis/java-logging-logback/commit/8b6ea8c736aeb2454cb95787651862da1364b3b5)) +* Update dependency com.google.cloud:sdk-platform-java-config to v3.46.2 ([#1461](https://github.com/googleapis/java-logging-logback/issues/1461)) ([d88928c](https://github.com/googleapis/java-logging-logback/commit/d88928cad267eaaea5e8e6009375deb8c9534bdd)) + ## [0.132.5-alpha](https://github.com/googleapis/java-logging-logback/compare/v0.132.4-alpha...v0.132.5-alpha) (2025-03-20) diff --git a/pom.xml b/pom.xml index e0472387b..4de5332d0 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 google-cloud-logging-logback - 0.132.6-alpha-SNAPSHOT + 0.132.6-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 3983e994d..d55fc07e8 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-logging-logback - 0.132.6-alpha-SNAPSHOT + 0.132.6-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 c9850973a..e358b5cd4 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.132.6-alpha-SNAPSHOT"; + public static final String DEFAULT_INSTRUMENTATION_VERSION = "0.132.6-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 8ceb999b1..9b096e9b0 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-logging-logback:0.132.5-alpha:0.132.6-alpha-SNAPSHOT +google-cloud-logging-logback:0.132.6-alpha:0.132.6-alpha