From da1130c2c18ae471ba02fb4bfb58f3603e61f5a0 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 28 Feb 2022 18:48:12 +0000 Subject: [PATCH 01/10] chore(main): release 3.7.1-SNAPSHOT (#885) :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 ++-- 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 +++--- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/google-cloud-logging-bom/pom.xml b/google-cloud-logging-bom/pom.xml index d521978b0..3013a70b2 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.7.0 + 3.7.1-SNAPSHOT pom com.google.cloud @@ -53,17 +53,17 @@ com.google.cloud google-cloud-logging - 3.7.0 + 3.7.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-logging-v2 - 0.96.0 + 0.96.1-SNAPSHOT com.google.api.grpc proto-google-cloud-logging-v2 - 0.96.0 + 0.96.1-SNAPSHOT diff --git a/google-cloud-logging/pom.xml b/google-cloud-logging/pom.xml index 0c720ec54..682dd9b54 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.7.0 + 3.7.1-SNAPSHOT jar Google Cloud Logging https://github.com/googleapis/java-logging @@ -11,7 +11,7 @@ com.google.cloud google-cloud-logging-parent - 3.7.0 + 3.7.1-SNAPSHOT google-cloud-logging diff --git a/grpc-google-cloud-logging-v2/pom.xml b/grpc-google-cloud-logging-v2/pom.xml index 7ef80db58..b8dd929ba 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.96.0 + 0.96.1-SNAPSHOT grpc-google-cloud-logging-v2 GRPC library for grpc-google-cloud-logging-v2 com.google.cloud google-cloud-logging-parent - 3.7.0 + 3.7.1-SNAPSHOT diff --git a/pom.xml b/pom.xml index c73cc97eb..e75192c82 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-logging-parent pom - 3.7.0 + 3.7.1-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.96.0 + 0.96.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-logging-v2 - 0.96.0 + 0.96.1-SNAPSHOT com.google.cloud google-cloud-logging - 3.7.0 + 3.7.1-SNAPSHOT diff --git a/proto-google-cloud-logging-v2/pom.xml b/proto-google-cloud-logging-v2/pom.xml index 8df55f75c..3e22c47b6 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.96.0 + 0.96.1-SNAPSHOT proto-google-cloud-logging-v2 PROTO library for proto-google-cloud-logging-v2 com.google.cloud google-cloud-logging-parent - 3.7.0 + 3.7.1-SNAPSHOT diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index ca6da66d6..5bd636bf5 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-logging - 3.7.0 + 3.7.1-SNAPSHOT diff --git a/versions.txt b/versions.txt index 7259a60d5..7be6ab7c4 100644 --- a/versions.txt +++ b/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -google-cloud-logging:3.7.0:3.7.0 -grpc-google-cloud-logging-v2:0.96.0:0.96.0 -proto-google-cloud-logging-v2:0.96.0:0.96.0 +google-cloud-logging:3.7.0:3.7.1-SNAPSHOT +grpc-google-cloud-logging-v2:0.96.0:0.96.1-SNAPSHOT +proto-google-cloud-logging-v2:0.96.0:0.96.1-SNAPSHOT From b5bf96ab58af52b3a26796cc50a5c0128ac1a15b Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Mon, 28 Feb 2022 20:40:32 +0000 Subject: [PATCH 02/10] ci: pull request template includes sample format (#1357) (#884) Source-Link: https://github.com/googleapis/synthtool/commit/e122cb03ea37652946651346736d99b9dcc4311f Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:387835a1375a0049ec44e02542c844302854c732d8291bdf8e472c0ff70a8f67 --- .github/.OwlBot.lock.yaml | 2 +- .github/PULL_REQUEST_TEMPLATE.md | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 9786771c4..9351fdfb9 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -13,4 +13,4 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:3c950ed12391ebaffd1ee66d0374766a1c50144ebe6a7a0042300b2e6bb5856b + digest: sha256:387835a1375a0049ec44e02542c844302854c732d8291bdf8e472c0ff70a8f67 diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index b1fc16274..8465fc6f5 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -5,3 +5,6 @@ Thank you for opening a Pull Request! Before submitting your PR, there are a few - [ ] Appropriate docs were updated (if necessary) Fixes # ☕️ + +If you write sample code, please follow the [samples format]( +https://github.com/GoogleCloudPlatform/java-docs-samples/blob/main/SAMPLE_FORMAT.md). From 322628132fa5446588c72c39a075b1567d5aef79 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Mon, 28 Feb 2022 21:58:15 +0100 Subject: [PATCH 03/10] build(deps): update dependency org.apache.maven.plugins:maven-project-info-reports-plugin to v3.2.2 (#881) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e75192c82..5b5a9326f 100644 --- a/pom.xml +++ b/pom.xml @@ -146,7 +146,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.2.1 + 3.2.2 From d2a125aa3bf91cfcd01e45d91fa116d645230dca Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 1 Mar 2022 18:48:12 +0100 Subject: [PATCH 04/10] chore(deps): update dependency com.google.cloud:google-cloud-logging to v3.7.0 (#886) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:google-cloud-logging](https://togithub.com/googleapis/java-logging) | `3.6.4` -> `3.7.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-logging/3.7.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-logging/3.7.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-logging/3.7.0/compatibility-slim/3.6.4)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-logging/3.7.0/confidence-slim/3.6.4)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-logging ### [`v3.7.0`](https://togithub.com/googleapis/java-logging/blob/HEAD/CHANGELOG.md#​370-httpsgithubcomgoogleapisjava-loggingcomparev364v370-2022-02-28) [Compare Source](https://togithub.com/googleapis/java-logging/compare/v3.6.4...v3.7.0) ##### Features - KMS configuration in settings ([#​877](https://togithub.com/googleapis/java-logging/issues/877)) ([27c199b](https://togithub.com/googleapis/java-logging/commit/27c199ba91b8423934788cbd6cb8e449dfc7b115)) - Update Logging API with latest changes ([27c199b](https://togithub.com/googleapis/java-logging/commit/27c199ba91b8423934788cbd6cb8e449dfc7b115)) ##### Bug Fixes - **deps:** set gson via java-shared-deps ([#​878](https://togithub.com/googleapis/java-logging/issues/878)) ([5c97fea](https://togithub.com/googleapis/java-logging/commit/5c97feadf1d4fd80618cdcee19e02e4cbabfb1ea)) ##### [3.6.4](https://togithub.com/googleapis/java-logging/compare/v3.6.3...v3.6.4) (2022-02-15) ##### Dependencies - update dependency com.google.code.gson:gson to v2.9.0 ([#​868](https://togithub.com/googleapis/java-logging/issues/868)) ([f3d6f3f](https://togithub.com/googleapis/java-logging/commit/f3d6f3f0d29d1b56f8c8fd191b4b946bc31f6e10)) ##### [3.6.3](https://togithub.com/googleapis/java-logging/compare/v3.6.2...v3.6.3) (2022-02-11) ##### Dependencies - update actions/github-script action to v6 ([#​865](https://togithub.com/googleapis/java-logging/issues/865)) ([2d05dc8](https://togithub.com/googleapis/java-logging/commit/2d05dc81b3b56ae6b5205c26719bfd3985c5b9d7)) ##### [3.6.2](https://togithub.com/googleapis/java-logging/compare/v3.6.1...v3.6.2) (2022-02-03) ##### Dependencies - **java:** update actions/github-script action to v5 ([#​1339](https://togithub.com/googleapis/java-logging/issues/1339)) ([#​851](https://togithub.com/googleapis/java-logging/issues/851)) ([7a5ee11](https://togithub.com/googleapis/java-logging/commit/7a5ee11ab17aaa36c688e1c631a4c9a65eae6352)) - update actions/github-script action to v5 ([#​849](https://togithub.com/googleapis/java-logging/issues/849)) ([286728a](https://togithub.com/googleapis/java-logging/commit/286728a941b34a67e3dccb119d6d2c13830e5c38)) - update dependency com.google.cloud:google-cloud-shared-dependencies to v2.7.0 ([#​852](https://togithub.com/googleapis/java-logging/issues/852)) ([eb2eef5](https://togithub.com/googleapis/java-logging/commit/eb2eef553ee6e9f9880f06fd6185e90367063d86)) ##### [3.6.1](https://togithub.com/googleapis/java-logging/compare/v3.6.0...v3.6.1) (2022-01-18) ##### Bug Fixes - use initialized logging option in constructor ([#​843](https://togithub.com/googleapis/java-logging/issues/843)) ([99fb678](https://togithub.com/googleapis/java-logging/commit/99fb6782f2a37be569309cc37591ce7b9c86092b)) ##### Dependencies - update dependency org.easymock:easymock to v4 ([#​830](https://togithub.com/googleapis/java-logging/issues/830)) ([21c2436](https://togithub.com/googleapis/java-logging/commit/21c243619e3b00891a0ff828e0f3e087b6e17d4b))
--- ### Configuration 📅 **Schedule**: At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Renovate will not automatically rebase this PR, because other commits have been found. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-logging). --- README.md | 6 +++--- samples/install-without-bom/pom.xml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index f4efeb4e6..c8fc95209 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ If you are using Maven without BOM, add this to your dependencies: com.google.cloud google-cloud-logging - 3.6.4 + 3.7.0 ``` @@ -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.6.4' +implementation 'com.google.cloud:google-cloud-logging:3.7.0' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-logging" % "3.6.4" +libraryDependencies += "com.google.cloud" % "google-cloud-logging" % "3.7.0" ``` ## Authentication diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index ba8299acc..05b9c6819 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.6.4 + 3.7.0 From fa8b41d6c735be2aa9d2a33dee661176e35d73fa Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 1 Mar 2022 22:32:24 +0000 Subject: [PATCH 05/10] chore: update github actions (#1361) (#888) * chore: update github actions * chore: update Source-Link: https://github.com/googleapis/synthtool/commit/1622741e6877d4b335b137ac7e07f7f32d4e5af7 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:e3746f84955528d0fe24bf2e4df89875d6ce5a036af01b9c326d61a38838523a --- .github/.OwlBot.lock.yaml | 2 +- .github/workflows/approve-readme.yaml | 2 +- .github/workflows/auto-release.yaml | 2 +- .github/workflows/ci.yaml | 20 ++++++++++---------- .github/workflows/samples.yaml | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 9351fdfb9..53941094c 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -13,4 +13,4 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:387835a1375a0049ec44e02542c844302854c732d8291bdf8e472c0ff70a8f67 + digest: sha256:e3746f84955528d0fe24bf2e4df89875d6ce5a036af01b9c326d61a38838523a diff --git a/.github/workflows/approve-readme.yaml b/.github/workflows/approve-readme.yaml index 1bb182327..f5fc7d516 100644 --- a/.github/workflows/approve-readme.yaml +++ b/.github/workflows/approve-readme.yaml @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-latest if: github.repository_owner == 'googleapis' && github.head_ref == 'autosynth-readme' steps: - - uses: actions/github-script@v5 + - uses: actions/github-script@v6 with: github-token: ${{secrets.YOSHI_APPROVER_TOKEN}} script: | diff --git a/.github/workflows/auto-release.yaml b/.github/workflows/auto-release.yaml index 18e23230d..7a106d007 100644 --- a/.github/workflows/auto-release.yaml +++ b/.github/workflows/auto-release.yaml @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-latest if: contains(github.head_ref, 'release-please') steps: - - uses: actions/github-script@v5 + - uses: actions/github-script@v6 with: github-token: ${{secrets.YOSHI_APPROVER_TOKEN}} debug: true diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 6b5e56aaa..83ef7f9c2 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -27,8 +27,8 @@ jobs: matrix: java: [8, 11, 17] steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 with: distribution: zulu java-version: ${{matrix.java}} @@ -39,8 +39,8 @@ jobs: windows: runs-on: windows-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 with: distribution: zulu java-version: 8 @@ -54,8 +54,8 @@ jobs: matrix: java: [8, 11, 17] steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 with: distribution: zulu java-version: ${{matrix.java}} @@ -64,8 +64,8 @@ jobs: lint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 with: distribution: zulu java-version: 11 @@ -76,8 +76,8 @@ jobs: clirr: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 with: distribution: zulu java-version: 8 diff --git a/.github/workflows/samples.yaml b/.github/workflows/samples.yaml index d5d964df1..de737e92a 100644 --- a/.github/workflows/samples.yaml +++ b/.github/workflows/samples.yaml @@ -20,8 +20,8 @@ jobs: checkstyle: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v1 + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 with: java-version: 8 - name: Run checkstyle From 19e9abb389ed98cdcca7ef0dfa5b07e69568f6f9 Mon Sep 17 00:00:00 2001 From: minherz Date: Wed, 2 Mar 2022 19:47:22 +0200 Subject: [PATCH 06/10] fix: do not use GAE_RUNTIME for GAE environment detection (#891) Stops using GAE_RUNTIME envvar to detect AppEngine environment. --- .../java/com/google/cloud/logging/MonitoredResourceUtil.java | 1 - .../java/com/google/cloud/logging/MonitoredResourceUtilTest.java | 1 - 2 files changed, 2 deletions(-) diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/MonitoredResourceUtil.java b/google-cloud-logging/src/main/java/com/google/cloud/logging/MonitoredResourceUtil.java index df450aee4..bba9bf8e5 100644 --- a/google-cloud-logging/src/main/java/com/google/cloud/logging/MonitoredResourceUtil.java +++ b/google-cloud-logging/src/main/java/com/google/cloud/logging/MonitoredResourceUtil.java @@ -175,7 +175,6 @@ private static Resource detectResourceType() { return Resource.CloudRun; } if (getter.getEnv("GAE_INSTANCE") != null - && getter.getEnv("GAE_RUNTIME") != null && getter.getEnv("GAE_SERVICE") != null && getter.getEnv("GAE_VERSION") != null) { return Resource.AppEngine; diff --git a/google-cloud-logging/src/test/java/com/google/cloud/logging/MonitoredResourceUtilTest.java b/google-cloud-logging/src/test/java/com/google/cloud/logging/MonitoredResourceUtilTest.java index ebcf398d9..136c8e8e6 100644 --- a/google-cloud-logging/src/test/java/com/google/cloud/logging/MonitoredResourceUtilTest.java +++ b/google-cloud-logging/src/test/java/com/google/cloud/logging/MonitoredResourceUtilTest.java @@ -155,7 +155,6 @@ public void testResourceTypeK8sContainer() { private void setupCommonGAEMocks(String mockedModuleId, String mockedVersionId) { expect(getterMock.getAttribute("instance/zone")).andReturn(MOCKED_QUALIFIED_ZONE).once(); expect(getterMock.getEnv("GAE_INSTANCE")).andReturn(MOCKED_NON_EMPTY).once(); - expect(getterMock.getEnv("GAE_RUNTIME")).andReturn(MOCKED_NON_EMPTY).once(); expect(getterMock.getEnv("GAE_SERVICE")).andReturn(mockedModuleId).times(2); expect(getterMock.getEnv("GAE_VERSION")).andReturn(mockedVersionId).times(2); expect(getterMock.getEnv(anyString())).andReturn(null).anyTimes(); From 48854405838151a4179f6d1727fc925b06d1727d Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 2 Mar 2022 18:48:32 +0100 Subject: [PATCH 07/10] deps: update dependency com.google.cloud:google-cloud-shared-dependencies to v2.8.0 (#889) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5b5a9326f..aaa7fe6de 100644 --- a/pom.xml +++ b/pom.xml @@ -77,7 +77,7 @@ com.google.cloud google-cloud-shared-dependencies - 2.7.0 + 2.8.0 pom import From d19fb1d1988c8ef85e44faba2b0f84e2b19c102a Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 2 Mar 2022 18:49:21 +0100 Subject: [PATCH 08/10] chore(deps): update dependency com.google.cloud:libraries-bom to v24.4.0 (#892) 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 v24.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 | 4 ++-- samples/snippets/pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index c8fc95209..af561067b 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file com.google.cloud libraries-bom - 24.3.0 + 24.4.0 pom import @@ -51,7 +51,7 @@ If you are using Maven without BOM, add this to your dependencies: If you are using Gradle 5.x or later, add this to your dependencies ```Groovy -implementation platform('com.google.cloud:libraries-bom:24.3.0') +implementation platform('com.google.cloud:libraries-bom:24.4.0') implementation 'com.google.cloud:google-cloud-logging' ``` diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 46c7bd61e..a867fb0e0 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -29,7 +29,7 @@ com.google.cloud libraries-bom - 24.3.0 + 24.4.0 pom import From a39804aa36deb645d6a8cc391fbcef675c33d1af Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Thu, 3 Mar 2022 10:17:02 -0800 Subject: [PATCH 09/10] chore: fix license header in build.bat (#1363) (#894) * chore: fix license header in build.bat * chore: add disctribution field for setup-java action Source-Link: https://github.com/googleapis/synthtool/commit/4fea5f40a9075f3ba205ede0b453010cf080e194 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:df8d7b2cc0dbc65871e7edd86601901a0612b272fa3f7f0eb590c5c53aa5f92e Co-authored-by: Owl Bot --- .github/.OwlBot.lock.yaml | 2 +- .github/workflows/samples.yaml | 1 + .kokoro/build.bat | 30 +++++++++++++++--------------- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 53941094c..3473042c0 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -13,4 +13,4 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:e3746f84955528d0fe24bf2e4df89875d6ce5a036af01b9c326d61a38838523a + digest: sha256:df8d7b2cc0dbc65871e7edd86601901a0612b272fa3f7f0eb590c5c53aa5f92e diff --git a/.github/workflows/samples.yaml b/.github/workflows/samples.yaml index de737e92a..912ed8b2b 100644 --- a/.github/workflows/samples.yaml +++ b/.github/workflows/samples.yaml @@ -23,6 +23,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-java@v3 with: + distribution: zulu java-version: 8 - name: Run checkstyle run: mvn -P lint --quiet --batch-mode checkstyle:check diff --git a/.kokoro/build.bat b/.kokoro/build.bat index cc602c9eb..067cf4a4c 100644 --- a/.kokoro/build.bat +++ b/.kokoro/build.bat @@ -1,18 +1,18 @@ +:: Copyright 2022 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. :: See documentation in type-shell-output.bat -# Copyright 2022 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. "C:\Program Files\Git\bin\bash.exe" %~dp0build.sh From dc0f893617d05345d1cbbf13c257d1fca389e599 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 3 Mar 2022 22:36:31 +0000 Subject: [PATCH 10/10] chore(main): release 3.7.1 (#893) :robot: I have created a release *beep* *boop* --- ### [3.7.1](https://github.com/googleapis/java-logging/compare/v3.7.0...v3.7.1) (2022-03-03) ### Bug Fixes * do not use GAE_RUNTIME for GAE environment detection ([#891](https://github.com/googleapis/java-logging/issues/891)) ([19e9abb](https://github.com/googleapis/java-logging/commit/19e9abb389ed98cdcca7ef0dfa5b07e69568f6f9)) ### Dependencies * update dependency com.google.cloud:google-cloud-shared-dependencies to v2.8.0 ([#889](https://github.com/googleapis/java-logging/issues/889)) ([4885440](https://github.com/googleapis/java-logging/commit/48854405838151a4179f6d1727fc925b06d1727d)) --- 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 | 12 ++++++++++++ google-cloud-logging-bom/pom.xml | 8 ++++---- google-cloud-logging/pom.xml | 4 ++-- 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, 30 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3c27aea11..256d7bfc4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +### [3.7.1](https://github.com/googleapis/java-logging/compare/v3.7.0...v3.7.1) (2022-03-03) + + +### Bug Fixes + +* do not use GAE_RUNTIME for GAE environment detection ([#891](https://github.com/googleapis/java-logging/issues/891)) ([19e9abb](https://github.com/googleapis/java-logging/commit/19e9abb389ed98cdcca7ef0dfa5b07e69568f6f9)) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.8.0 ([#889](https://github.com/googleapis/java-logging/issues/889)) ([4885440](https://github.com/googleapis/java-logging/commit/48854405838151a4179f6d1727fc925b06d1727d)) + ## [3.7.0](https://github.com/googleapis/java-logging/compare/v3.6.4...v3.7.0) (2022-02-28) diff --git a/google-cloud-logging-bom/pom.xml b/google-cloud-logging-bom/pom.xml index 3013a70b2..177ff8ede 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.7.1-SNAPSHOT + 3.7.1 pom com.google.cloud @@ -53,17 +53,17 @@ com.google.cloud google-cloud-logging - 3.7.1-SNAPSHOT + 3.7.1 com.google.api.grpc grpc-google-cloud-logging-v2 - 0.96.1-SNAPSHOT + 0.96.1 com.google.api.grpc proto-google-cloud-logging-v2 - 0.96.1-SNAPSHOT + 0.96.1 diff --git a/google-cloud-logging/pom.xml b/google-cloud-logging/pom.xml index 682dd9b54..b9c513a3c 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.7.1-SNAPSHOT + 3.7.1 jar Google Cloud Logging https://github.com/googleapis/java-logging @@ -11,7 +11,7 @@ com.google.cloud google-cloud-logging-parent - 3.7.1-SNAPSHOT + 3.7.1 google-cloud-logging diff --git a/grpc-google-cloud-logging-v2/pom.xml b/grpc-google-cloud-logging-v2/pom.xml index b8dd929ba..23666d151 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.96.1-SNAPSHOT + 0.96.1 grpc-google-cloud-logging-v2 GRPC library for grpc-google-cloud-logging-v2 com.google.cloud google-cloud-logging-parent - 3.7.1-SNAPSHOT + 3.7.1 diff --git a/pom.xml b/pom.xml index aaa7fe6de..9145fe3c5 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-logging-parent pom - 3.7.1-SNAPSHOT + 3.7.1 Google Cloud Logging Parent https://github.com/googleapis/java-logging @@ -61,17 +61,17 @@ com.google.api.grpc proto-google-cloud-logging-v2 - 0.96.1-SNAPSHOT + 0.96.1 com.google.api.grpc grpc-google-cloud-logging-v2 - 0.96.1-SNAPSHOT + 0.96.1 com.google.cloud google-cloud-logging - 3.7.1-SNAPSHOT + 3.7.1 diff --git a/proto-google-cloud-logging-v2/pom.xml b/proto-google-cloud-logging-v2/pom.xml index 3e22c47b6..8935ac5b4 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.96.1-SNAPSHOT + 0.96.1 proto-google-cloud-logging-v2 PROTO library for proto-google-cloud-logging-v2 com.google.cloud google-cloud-logging-parent - 3.7.1-SNAPSHOT + 3.7.1 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 5bd636bf5..9588fce5b 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-logging - 3.7.1-SNAPSHOT + 3.7.1 diff --git a/versions.txt b/versions.txt index 7be6ab7c4..178e205d4 100644 --- a/versions.txt +++ b/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -google-cloud-logging:3.7.0:3.7.1-SNAPSHOT -grpc-google-cloud-logging-v2:0.96.0:0.96.1-SNAPSHOT -proto-google-cloud-logging-v2:0.96.0:0.96.1-SNAPSHOT +google-cloud-logging:3.7.1:3.7.1 +grpc-google-cloud-logging-v2:0.96.1:0.96.1 +proto-google-cloud-logging-v2:0.96.1:0.96.1