From 54a46741603b84bba9cc938cd70c7731aad349e1 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 22 Jun 2023 04:38:12 +0000 Subject: [PATCH 1/5] chore(main): release 3.15.5-SNAPSHOT (#1379) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- google-cloud-logging-bom/pom.xml | 8 ++++---- google-cloud-logging/pom.xml | 4 ++-- .../java/com/google/cloud/logging/Instrumentation.java | 2 +- grpc-google-cloud-logging-v2/pom.xml | 4 ++-- pom.xml | 8 ++++---- proto-google-cloud-logging-v2/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 6 +++--- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/google-cloud-logging-bom/pom.xml b/google-cloud-logging-bom/pom.xml index 019de3b10..6eff2f9fa 100644 --- a/google-cloud-logging-bom/pom.xml +++ b/google-cloud-logging-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-logging-bom - 3.15.4 + 3.15.5-SNAPSHOT pom com.google.cloud @@ -53,17 +53,17 @@ com.google.cloud google-cloud-logging - 3.15.4 + 3.15.5-SNAPSHOT com.google.api.grpc grpc-google-cloud-logging-v2 - 0.104.4 + 0.104.5-SNAPSHOT com.google.api.grpc proto-google-cloud-logging-v2 - 0.104.4 + 0.104.5-SNAPSHOT diff --git a/google-cloud-logging/pom.xml b/google-cloud-logging/pom.xml index b8cca7785..c786418be 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.15.4 + 3.15.5-SNAPSHOT jar Google Cloud Logging https://github.com/googleapis/java-logging @@ -11,7 +11,7 @@ com.google.cloud google-cloud-logging-parent - 3.15.4 + 3.15.5-SNAPSHOT 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 da3df4913..7e2990b42 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.15.4"; + public static final String DEFAULT_INSTRUMENTATION_VERSION = "3.15.5-SNAPSHOT"; // {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 0407c4863..440029b89 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.104.4 + 0.104.5-SNAPSHOT grpc-google-cloud-logging-v2 GRPC library for grpc-google-cloud-logging-v2 com.google.cloud google-cloud-logging-parent - 3.15.4 + 3.15.5-SNAPSHOT diff --git a/pom.xml b/pom.xml index 18d3d23c6..8e7b7f992 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-logging-parent pom - 3.15.4 + 3.15.5-SNAPSHOT Google Cloud Logging Parent https://github.com/googleapis/java-logging @@ -61,17 +61,17 @@ com.google.api.grpc proto-google-cloud-logging-v2 - 0.104.4 + 0.104.5-SNAPSHOT com.google.api.grpc grpc-google-cloud-logging-v2 - 0.104.4 + 0.104.5-SNAPSHOT com.google.cloud google-cloud-logging - 3.15.4 + 3.15.5-SNAPSHOT diff --git a/proto-google-cloud-logging-v2/pom.xml b/proto-google-cloud-logging-v2/pom.xml index 98b29c8ff..56b03a05f 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.104.4 + 0.104.5-SNAPSHOT proto-google-cloud-logging-v2 PROTO library for proto-google-cloud-logging-v2 com.google.cloud google-cloud-logging-parent - 3.15.4 + 3.15.5-SNAPSHOT diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 988613f2a..62c362475 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-logging - 3.15.4 + 3.15.5-SNAPSHOT diff --git a/versions.txt b/versions.txt index 553d100d1..52930516b 100644 --- a/versions.txt +++ b/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -google-cloud-logging:3.15.4:3.15.4 -grpc-google-cloud-logging-v2:0.104.4:0.104.4 -proto-google-cloud-logging-v2:0.104.4:0.104.4 +google-cloud-logging:3.15.4:3.15.5-SNAPSHOT +grpc-google-cloud-logging-v2:0.104.4:0.104.5-SNAPSHOT +proto-google-cloud-logging-v2:0.104.4:0.104.5-SNAPSHOT From a53fb16b29d2d8abb287a13116ca1878a5d3175d Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Thu, 22 Jun 2023 16:28:13 +0000 Subject: [PATCH 2/5] chore: Java 8 unit test to build code in Java 17 and run tests on Java 8 (#1800) (#1381) * Our Java projects are configured to produce Java 8-compatible bytecode via https://github.com/googleapis/java-shared-config/blob/main/pom.xml#L848. This unit test change ensures this config is applied correctly. * For the repositories that mark "dependencies (8)" and "dependencies (11)" as required, they should point to only "dependencies (17)" via `.github/sync-repo-settings.yaml` and repo's Settings tab. Source-Link: https://github.com/googleapis/synthtool/commit/cbe010084fc59dc15730c86e9b8e03ddac1de050 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:32851debfefed2b66038e0141f1b5c2103bb59ba80b7475adbc10ef7abab3de7 --- .github/.OwlBot.lock.yaml | 4 ++-- .github/sync-repo-settings.yaml | 3 +-- .github/workflows/ci.yaml | 26 ++++++++++++++++++++++++-- .kokoro/build.sh | 3 ++- README.md | 6 +++--- 5 files changed, 32 insertions(+), 10 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index b8ef92bef..47a70ea40 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -13,5 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:c33bd13e1eab022b0499a3afbfb4b93ae10cb8ad89d8203a6343a88b1b78400f -# created: 2023-06-21T18:48:32.287298785Z + digest: sha256:32851debfefed2b66038e0141f1b5c2103bb59ba80b7475adbc10ef7abab3de7 +# created: 2023-06-22T15:06:52.039318836Z diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index 004908ff2..28f4a217d 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -8,8 +8,7 @@ branchProtectionRules: requiresCodeOwnerReviews: true requiresStrictStatusChecks: false requiredStatusCheckContexts: - - dependencies (8) - - dependencies (11) + - dependencies (17) - lint - clirr - units (8) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index e3bb26e37..65436cde4 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -25,7 +25,7 @@ jobs: strategy: fail-fast: false matrix: - java: [8, 11, 17] + java: [11, 17] steps: - uses: actions/checkout@v3 - uses: actions/setup-java@v3 @@ -36,6 +36,28 @@ jobs: - run: .kokoro/build.sh env: JOB_TYPE: test + units-java8: + # Building using Java 17 and run the tests with Java 8 runtime + name: "units (8)" + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 + with: + java-version: 8 + distribution: zulu + - name: "Set jvm system property environment variable for surefire plugin (unit tests)" + # Maven surefire plugin (unit tests) allows us to specify JVM to run the tests. + # https://maven.apache.org/surefire/maven-surefire-plugin/test-mojo.html#jvm + run: echo "SUREFIRE_JVM_OPT=-Djvm=${JAVA_HOME}/bin/java" >> $GITHUB_ENV + shell: bash + - uses: actions/setup-java@v3 + with: + java-version: 17 + distribution: zulu + - run: .kokoro/build.sh + env: + JOB_TYPE: test windows: runs-on: windows-latest steps: @@ -54,7 +76,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - java: [8, 11, 17] + java: [17] steps: - uses: actions/checkout@v3 - uses: actions/setup-java@v3 diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 6e937f3ca..06e31b082 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -47,7 +47,8 @@ set +e case ${JOB_TYPE} in test) - mvn test -B -ntp -Dclirr.skip=true -Denforcer.skip=true + echo "SUREFIRE_JVM_OPT: ${SUREFIRE_JVM_OPT}" + mvn test -B -ntp -Dclirr.skip=true -Denforcer.skip=true ${SUREFIRE_JVM_OPT} RETURN_CODE=$? ;; lint) diff --git a/README.md b/README.md index 730e3a350..c011a0c86 100644 --- a/README.md +++ b/README.md @@ -59,13 +59,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.15.3' +implementation 'com.google.cloud:google-cloud-logging:3.15.4' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-logging" % "3.15.3" +libraryDependencies += "com.google.cloud" % "google-cloud-logging" % "3.15.4" ``` @@ -452,7 +452,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.15.3 +[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-logging/3.15.4 [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 From 876f80cd24d5524aff7ae0cdb1f889c2809fb620 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 22 Jun 2023 19:06:58 +0200 Subject: [PATCH 3/5] chore(deps): update dependency com.google.cloud:google-cloud-logging to v3.15.4 (#1380) 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 to v3.15.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 --- README.md | 2 +- samples/install-without-bom/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c011a0c86..f07e3d0e4 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ If you are using Maven without the BOM, add this to your dependencies: com.google.cloud google-cloud-logging - 3.15.3 + 3.15.4 ``` diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index af574f9fd..60cc23fe4 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-logging - 3.15.3 + 3.15.4 From 824130227897ed17c5b8a1becf32a695d844b2bb Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 22 Jun 2023 19:41:29 +0200 Subject: [PATCH 4/5] deps: update dependency com.google.cloud:google-cloud-shared-dependencies to v3.12.0 (#1382) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8e7b7f992..6884d9e45 100644 --- a/pom.xml +++ b/pom.xml @@ -77,7 +77,7 @@ com.google.cloud google-cloud-shared-dependencies - 3.11.0 + 3.12.0 pom import From 9ad0856f9cca12ec58a6812f4e980f8729982d27 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 22 Jun 2023 18:01:06 +0000 Subject: [PATCH 5/5] chore(main): release 3.15.5 (#1383) :robot: I have created a release *beep* *boop* --- ## [3.15.5](https://github.com/googleapis/java-logging/compare/v3.15.4...v3.15.5) (2023-06-22) ### Dependencies * Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.12.0 ([#1382](https://github.com/googleapis/java-logging/issues/1382)) ([8241302](https://github.com/googleapis/java-logging/commit/824130227897ed17c5b8a1becf32a695d844b2bb)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- CHANGELOG.md | 7 +++++++ google-cloud-logging-bom/pom.xml | 8 ++++---- google-cloud-logging/pom.xml | 4 ++-- .../java/com/google/cloud/logging/Instrumentation.java | 2 +- grpc-google-cloud-logging-v2/pom.xml | 4 ++-- pom.xml | 8 ++++---- proto-google-cloud-logging-v2/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 6 +++--- 9 files changed, 26 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bfa4ee718..194a73bcd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [3.15.5](https://github.com/googleapis/java-logging/compare/v3.15.4...v3.15.5) (2023-06-22) + + +### Dependencies + +* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.12.0 ([#1382](https://github.com/googleapis/java-logging/issues/1382)) ([8241302](https://github.com/googleapis/java-logging/commit/824130227897ed17c5b8a1becf32a695d844b2bb)) + ## [3.15.4](https://github.com/googleapis/java-logging/compare/v3.15.3...v3.15.4) (2023-06-22) diff --git a/google-cloud-logging-bom/pom.xml b/google-cloud-logging-bom/pom.xml index 6eff2f9fa..d6c2887a9 100644 --- a/google-cloud-logging-bom/pom.xml +++ b/google-cloud-logging-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-logging-bom - 3.15.5-SNAPSHOT + 3.15.5 pom com.google.cloud @@ -53,17 +53,17 @@ com.google.cloud google-cloud-logging - 3.15.5-SNAPSHOT + 3.15.5 com.google.api.grpc grpc-google-cloud-logging-v2 - 0.104.5-SNAPSHOT + 0.104.5 com.google.api.grpc proto-google-cloud-logging-v2 - 0.104.5-SNAPSHOT + 0.104.5 diff --git a/google-cloud-logging/pom.xml b/google-cloud-logging/pom.xml index c786418be..263d40e63 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.15.5-SNAPSHOT + 3.15.5 jar Google Cloud Logging https://github.com/googleapis/java-logging @@ -11,7 +11,7 @@ com.google.cloud google-cloud-logging-parent - 3.15.5-SNAPSHOT + 3.15.5 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 7e2990b42..b5a359d13 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.15.5-SNAPSHOT"; + public static final String DEFAULT_INSTRUMENTATION_VERSION = "3.15.5"; // {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 440029b89..112f90766 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.104.5-SNAPSHOT + 0.104.5 grpc-google-cloud-logging-v2 GRPC library for grpc-google-cloud-logging-v2 com.google.cloud google-cloud-logging-parent - 3.15.5-SNAPSHOT + 3.15.5 diff --git a/pom.xml b/pom.xml index 6884d9e45..0650d11c4 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-logging-parent pom - 3.15.5-SNAPSHOT + 3.15.5 Google Cloud Logging Parent https://github.com/googleapis/java-logging @@ -61,17 +61,17 @@ com.google.api.grpc proto-google-cloud-logging-v2 - 0.104.5-SNAPSHOT + 0.104.5 com.google.api.grpc grpc-google-cloud-logging-v2 - 0.104.5-SNAPSHOT + 0.104.5 com.google.cloud google-cloud-logging - 3.15.5-SNAPSHOT + 3.15.5 diff --git a/proto-google-cloud-logging-v2/pom.xml b/proto-google-cloud-logging-v2/pom.xml index 56b03a05f..f9f5dd4b5 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.104.5-SNAPSHOT + 0.104.5 proto-google-cloud-logging-v2 PROTO library for proto-google-cloud-logging-v2 com.google.cloud google-cloud-logging-parent - 3.15.5-SNAPSHOT + 3.15.5 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 62c362475..e6dad4337 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-logging - 3.15.5-SNAPSHOT + 3.15.5 diff --git a/versions.txt b/versions.txt index 52930516b..491431154 100644 --- a/versions.txt +++ b/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -google-cloud-logging:3.15.4:3.15.5-SNAPSHOT -grpc-google-cloud-logging-v2:0.104.4:0.104.5-SNAPSHOT -proto-google-cloud-logging-v2:0.104.4:0.104.5-SNAPSHOT +google-cloud-logging:3.15.5:3.15.5 +grpc-google-cloud-logging-v2:0.104.5:0.104.5 +proto-google-cloud-logging-v2:0.104.5:0.104.5