From a9e1932e5d2da0afe71e1ec9b6b1d01844bbbf1a Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 22 Sep 2021 20:56:17 +0000 Subject: [PATCH 01/11] chore: release 1.2.3-SNAPSHOT (#254) :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-identity-accesscontextmanager-bom/pom.xml | 10 +++++----- google-identity-accesscontextmanager/pom.xml | 4 ++-- grpc-google-identity-accesscontextmanager-v1/pom.xml | 4 ++-- pom.xml | 10 +++++----- .../pom.xml | 4 ++-- proto-google-identity-accesscontextmanager-v1/pom.xml | 6 +++--- versions.txt | 8 ++++---- 7 files changed, 23 insertions(+), 23 deletions(-) diff --git a/google-identity-accesscontextmanager-bom/pom.xml b/google-identity-accesscontextmanager-bom/pom.xml index 3a11959..dd10f8f 100644 --- a/google-identity-accesscontextmanager-bom/pom.xml +++ b/google-identity-accesscontextmanager-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-identity-accesscontextmanager-bom - 1.2.2 + 1.2.3-SNAPSHOT pom com.google.cloud @@ -65,22 +65,22 @@ com.google.cloud google-identity-accesscontextmanager - 1.2.2 + 1.2.3-SNAPSHOT com.google.api.grpc grpc-google-identity-accesscontextmanager-v1 - 1.2.2 + 1.2.3-SNAPSHOT com.google.api.grpc proto-google-identity-accesscontextmanager-v1 - 1.2.2 + 1.2.3-SNAPSHOT com.google.api.grpc proto-google-identity-accesscontextmanager-type - 1.2.2 + 1.2.3-SNAPSHOT diff --git a/google-identity-accesscontextmanager/pom.xml b/google-identity-accesscontextmanager/pom.xml index cb37a27..0555901 100644 --- a/google-identity-accesscontextmanager/pom.xml +++ b/google-identity-accesscontextmanager/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-identity-accesscontextmanager - 1.2.2 + 1.2.3-SNAPSHOT jar Google Identity Access Context Manager https://github.com/googleapis/java-accesscontextmanager @@ -11,7 +11,7 @@ com.google.cloud google-identity-accesscontextmanager-parent - 1.2.2 + 1.2.3-SNAPSHOT google-identity-accesscontextmanager diff --git a/grpc-google-identity-accesscontextmanager-v1/pom.xml b/grpc-google-identity-accesscontextmanager-v1/pom.xml index ce72f0a..2ed3399 100644 --- a/grpc-google-identity-accesscontextmanager-v1/pom.xml +++ b/grpc-google-identity-accesscontextmanager-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-identity-accesscontextmanager-v1 - 1.2.2 + 1.2.3-SNAPSHOT grpc-google-identity-accesscontextmanager-v1 GRPC library for google-identity-accesscontextmanager com.google.cloud google-identity-accesscontextmanager-parent - 1.2.2 + 1.2.3-SNAPSHOT diff --git a/pom.xml b/pom.xml index 2da8445..23debd2 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-identity-accesscontextmanager-parent pom - 1.2.2 + 1.2.3-SNAPSHOT Google Identity Access Context Manager Parent https://github.com/googleapis/java-accesscontextmanager @@ -70,22 +70,22 @@ com.google.api.grpc proto-google-identity-accesscontextmanager-type - 1.2.2 + 1.2.3-SNAPSHOT com.google.api.grpc proto-google-identity-accesscontextmanager-v1 - 1.2.2 + 1.2.3-SNAPSHOT com.google.api.grpc grpc-google-identity-accesscontextmanager-v1 - 1.2.2 + 1.2.3-SNAPSHOT com.google.cloud google-identity-accesscontextmanager - 1.2.2 + 1.2.3-SNAPSHOT junit diff --git a/proto-google-identity-accesscontextmanager-type/pom.xml b/proto-google-identity-accesscontextmanager-type/pom.xml index fb9e9d7..2173de7 100644 --- a/proto-google-identity-accesscontextmanager-type/pom.xml +++ b/proto-google-identity-accesscontextmanager-type/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-identity-accesscontextmanager-type - 1.2.2 + 1.2.3-SNAPSHOT proto-google-identity-accesscontextmanager-type PROTO library for proto-google-identity-accesscontextmanager-type com.google.cloud google-identity-accesscontextmanager-parent - 1.2.2 + 1.2.3-SNAPSHOT diff --git a/proto-google-identity-accesscontextmanager-v1/pom.xml b/proto-google-identity-accesscontextmanager-v1/pom.xml index 4f26dd6..6a88e5a 100644 --- a/proto-google-identity-accesscontextmanager-v1/pom.xml +++ b/proto-google-identity-accesscontextmanager-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-identity-accesscontextmanager-v1 - 1.2.2 + 1.2.3-SNAPSHOT proto-google-identity-accesscontextmanager-v1 PROTO library for proto-google-identity-accesscontextmanager-v1 com.google.cloud google-identity-accesscontextmanager-parent - 1.2.2 + 1.2.3-SNAPSHOT @@ -32,7 +32,7 @@ com.google.api.grpc proto-google-identity-accesscontextmanager-type - 1.2.2 + 1.2.3-SNAPSHOT diff --git a/versions.txt b/versions.txt index f32f1de..22fe466 100644 --- a/versions.txt +++ b/versions.txt @@ -1,7 +1,7 @@ # Format: # module:released-version:current-version -google-identity-accesscontextmanager:1.2.2:1.2.2 -grpc-google-identity-accesscontextmanager-v1:1.2.2:1.2.2 -proto-google-identity-accesscontextmanager-v1:1.2.2:1.2.2 -proto-google-identity-accesscontextmanager-type:1.2.2:1.2.2 +google-identity-accesscontextmanager:1.2.2:1.2.3-SNAPSHOT +grpc-google-identity-accesscontextmanager-v1:1.2.2:1.2.3-SNAPSHOT +proto-google-identity-accesscontextmanager-v1:1.2.2:1.2.3-SNAPSHOT +proto-google-identity-accesscontextmanager-type:1.2.2:1.2.3-SNAPSHOT From ab44a9f2eda2481fffdd9aa6f8323660eafe0d3b Mon Sep 17 00:00:00 2001 From: Neenu Shaji Date: Thu, 23 Sep 2021 12:20:40 -0400 Subject: [PATCH 02/11] chore: make owlbot check required (#255) --- .github/sync-repo-settings.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index efe8814..32e0ea5 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -16,6 +16,7 @@ branchProtectionRules: - units (11) - 'Kokoro - Test: Integration' - cla/google + - OwlBot Post Processor - pattern: java7 isAdminEnforced: true requiredApprovingReviewCount: 1 @@ -31,6 +32,7 @@ branchProtectionRules: - units (11) - 'Kokoro - Test: Integration' - cla/google + - OwlBot Post Processor permissionRules: - team: yoshi-admins permission: admin From 13334f4a93735021a297f1b5a4518b8c43d65be9 Mon Sep 17 00:00:00 2001 From: Neenu Shaji Date: Thu, 23 Sep 2021 12:20:44 -0400 Subject: [PATCH 03/11] chore: make owlbot check required (#256) From de7aae33f27d2311093e2c880275bb0ae30ef0dc Mon Sep 17 00:00:00 2001 From: Jeffrey Rennie Date: Thu, 23 Sep 2021 15:02:16 -0700 Subject: [PATCH 04/11] chore: relocate owl bot post processor (#250) chore: relocate owl bot post processor --- .github/.OwlBot.lock.yaml | 2 +- .github/.OwlBot.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index b750a23..67f432b 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: digest: sha256:8c50e7bab0ae5ad41ee29420b558542637104500f6256b8fe74282b0cf6144db - image: gcr.io/repo-automation-bots/owlbot-java:latest + image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest diff --git a/.github/.OwlBot.yaml b/.github/.OwlBot.yaml index 3f1b037..fe4ac6e 100644 --- a/.github/.OwlBot.yaml +++ b/.github/.OwlBot.yaml @@ -13,7 +13,7 @@ # limitations under the License. docker: - image: "gcr.io/repo-automation-bots/owlbot-java:latest" + image: "gcr.io/cloud-devrel-public-resources/owlbot-java:latest" deep-remove-regex: - "/proto-google-.*/src" From 25e82b304a2224dd71c5ca22b84742974d3b5a5f Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 28 Sep 2021 11:30:53 -0700 Subject: [PATCH 05/11] build: add jdk 17 to java units and dependency builds (#1216) (#259) * update dependencies.sh to not pass MaxPermSize when jdk 17 is used. MaxPermSize is an unrecognized flag in jdk 17. Source-Link: https://github.com/googleapis/synthtool/commit/a4be3384ccb92364795d981f2863f6986fcee620 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:13b7387edb404234610d30473ac48210ae7fe42a136335ee2b2f8a07c4c7f6a5 Co-authored-by: Owl Bot --- .github/.OwlBot.lock.yaml | 2 +- .github/blunderbuss.yml | 2 +- .github/workflows/ci.yaml | 21 +++++++++++++-------- .kokoro/dependencies.sh | 23 ++++++++++++++++++++++- renovate.json | 5 +---- 5 files changed, 38 insertions(+), 15 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 67f432b..5ff6c87 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: - digest: sha256:8c50e7bab0ae5ad41ee29420b558542637104500f6256b8fe74282b0cf6144db image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest + digest: sha256:13b7387edb404234610d30473ac48210ae7fe42a136335ee2b2f8a07c4c7f6a5 diff --git a/.github/blunderbuss.yml b/.github/blunderbuss.yml index 1a23ea4..2176b05 100644 --- a/.github/blunderbuss.yml +++ b/.github/blunderbuss.yml @@ -1,5 +1,5 @@ # Configuration for the Blunderbuss GitHub app. For more info see -# https://github.com/googleapis/repo-automation-bots/tree/master/packages/blunderbuss +# https://github.com/googleapis/repo-automation-bots/tree/main/packages/blunderbuss assign_prs_by: - labels: - samples diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 3becb5c..2425d72 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -1,7 +1,7 @@ on: push: branches: - - master + - main pull_request: name: ci jobs: @@ -9,14 +9,15 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - java: [8, 11] + java: [8, 11, 17] steps: - uses: actions/checkout@v2 - uses: stCarolas/setup-maven@v4 with: maven-version: 3.8.1 - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v2 with: + distribution: zulu java-version: ${{matrix.java}} - run: java -version - run: .kokoro/build.sh @@ -29,8 +30,9 @@ jobs: - uses: stCarolas/setup-maven@v4 with: maven-version: 3.8.1 - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v2 with: + distribution: zulu java-version: 8 - run: java -version - run: .kokoro/build.bat @@ -40,14 +42,15 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - java: [8, 11] + java: [8, 11, 17] steps: - uses: actions/checkout@v2 - uses: stCarolas/setup-maven@v4 with: maven-version: 3.8.1 - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v2 with: + distribution: zulu java-version: ${{matrix.java}} - run: java -version - run: .kokoro/dependencies.sh @@ -58,8 +61,9 @@ jobs: - uses: stCarolas/setup-maven@v4 with: maven-version: 3.8.1 - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v2 with: + distribution: zulu java-version: 8 - run: java -version - run: .kokoro/build.sh @@ -72,8 +76,9 @@ jobs: - uses: stCarolas/setup-maven@v4 with: maven-version: 3.8.1 - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v2 with: + distribution: zulu java-version: 8 - run: java -version - run: .kokoro/build.sh diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh index 9030ba8..9a5105d 100755 --- a/.kokoro/dependencies.sh +++ b/.kokoro/dependencies.sh @@ -28,7 +28,28 @@ source ${scriptDir}/common.sh java -version echo $JOB_TYPE -export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m" +function determineMavenOpts() { + local javaVersion=$( + # filter down to the version line, then pull out the version between quotes, + # then trim the version number down to its minimal number (removing any + # update or suffix number). + java -version 2>&1 | grep "version" \ + | sed -E 's/^.*"(.*?)".*$/\1/g' \ + | sed -E 's/^(1\.[0-9]\.0).*$/\1/g' + ) + + case $javaVersion in + "17") + # MaxPermSize is no longer supported as of jdk 17 + echo -n "-Xmx1024m" + ;; + *) + echo -n "-Xmx1024m -XX:MaxPermSize=128m" + ;; + esac +} + +export MAVEN_OPTS=$(determineMavenOpts) # this should run maven enforcer retry_with_backoff 3 10 \ diff --git a/renovate.json b/renovate.json index 3005b2d..4338e3a 100644 --- a/renovate.json +++ b/renovate.json @@ -70,8 +70,5 @@ } ], "semanticCommits": true, - "dependencyDashboard": true, - "dependencyDashboardLabels": [ - "type: process" - ] + "dependencyDashboard": true } From 2f1640ad063b0fa7ada2eb620e703d2c601d653f Mon Sep 17 00:00:00 2001 From: Emily Ball Date: Tue, 28 Sep 2021 11:31:08 -0700 Subject: [PATCH 06/11] chore: change branch master to main (#260) --- .github/sync-repo-settings.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index 32e0ea5..6f09d69 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -2,7 +2,7 @@ rebaseMergeAllowed: false squashMergeAllowed: true mergeCommitAllowed: false branchProtectionRules: - - pattern: master + - pattern: main isAdminEnforced: true requiredApprovingReviewCount: 1 requiresCodeOwnerReviews: true From 05353aa25cfa7a998fd6537da031425f10a85cdd Mon Sep 17 00:00:00 2001 From: Neenu Shaji Date: Wed, 29 Sep 2021 10:32:51 -0400 Subject: [PATCH 07/11] chore: change branch master to main in github configurations (#261) --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 12b5585..255f6ab 100644 --- a/README.md +++ b/README.md @@ -124,10 +124,10 @@ Java 11 | [![Kokoro CI][kokoro-badge-image-5]][kokoro-badge-link-5] [developer-console]: https://console.developers.google.com/ [create-project]: https://cloud.google.com/resource-manager/docs/creating-managing-projects [cloud-sdk]: https://cloud.google.com/sdk/ -[troubleshooting]: https://github.com/googleapis/google-cloud-common/blob/master/troubleshooting/readme.md#troubleshooting -[contributing]: https://github.com/googleapis/java-accesscontextmanager/blob/master/CONTRIBUTING.md -[code-of-conduct]: https://github.com/googleapis/java-accesscontextmanager/blob/master/CODE_OF_CONDUCT.md#contributor-code-of-conduct -[license]: https://github.com/googleapis/java-accesscontextmanager/blob/master/LICENSE +[troubleshooting]: https://github.com/googleapis/google-cloud-common/blob/main/troubleshooting/readme.md#troubleshooting +[contributing]: https://github.com/googleapis/java-accesscontextmanager/blob/main/CONTRIBUTING.md +[code-of-conduct]: https://github.com/googleapis/java-accesscontextmanager/blob/main/CODE_OF_CONDUCT.md#contributor-code-of-conduct +[license]: https://github.com/googleapis/java-accesscontextmanager/blob/main/LICENSE [enable-billing]: https://cloud.google.com/apis/docs/getting-started#enabling_billing [libraries-bom]: https://github.com/GoogleCloudPlatform/cloud-opensource-java/wiki/The-Google-Cloud-Platform-Libraries-BOM From dc4b4b0b7c5fcc290021c021f48935811a1087ac Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 13 Oct 2021 17:30:22 +0200 Subject: [PATCH 08/11] build(deps): update dependency com.google.cloud:google-cloud-shared-config to v1.1.0 (#262) 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-shared-config](https://togithub.com/googleapis/java-shared-config) | `1.0.3` -> `1.1.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.1.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.1.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.1.0/compatibility-slim/1.0.3)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.1.0/confidence-slim/1.0.3)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-shared-config ### [`v1.1.0`](https://togithub.com/googleapis/java-shared-config/blob/master/CHANGELOG.md#​110-httpswwwgithubcomgoogleapisjava-shared-configcomparev103v110-2021-10-12) [Compare Source](https://togithub.com/googleapis/java-shared-config/compare/v1.0.3...v1.1.0) ##### Features - introduce Maven configuration for GraalVM testing ([#​314](https://www.togithub.com/googleapis/java-shared-config/issues/314)) ([28fbeb8](https://www.github.com/googleapis/java-shared-config/commit/28fbeb86c4466a58a05d6933584564dbf3352e79)) ##### Bug Fixes - update doclet version ([#​332](https://www.togithub.com/googleapis/java-shared-config/issues/332)) ([3fd0350](https://www.github.com/googleapis/java-shared-config/commit/3fd035030e4f0954dd1f62f7b8ea62583685880c)) ##### Dependencies - update dependency com.puppycrawl.tools:checkstyle to v9.0.1 ([#​327](https://www.togithub.com/googleapis/java-shared-config/issues/327)) ([b6c9b65](https://www.github.com/googleapis/java-shared-config/commit/b6c9b657550db2dee6b36edbb9a6084baee125e2)) - update dependency org.graalvm.buildtools:junit-platform-native to v0.9.6 ([#​330](https://www.togithub.com/googleapis/java-shared-config/issues/330)) ([271ed7d](https://www.github.com/googleapis/java-shared-config/commit/271ed7dba35623e22fc8a7f7d477e6043e772014)) - update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.6 ([#​331](https://www.togithub.com/googleapis/java-shared-config/issues/331)) ([4f9ba15](https://www.github.com/googleapis/java-shared-config/commit/4f9ba1551df0a2d4fc8c9acca8a951afbe8cb78a)) - update dependency org.junit.vintage:junit-vintage-engine to v5.8.1 ([#​329](https://www.togithub.com/googleapis/java-shared-config/issues/329)) ([4a8789e](https://www.github.com/googleapis/java-shared-config/commit/4a8789ee814ba8a3480beecc76c16fd1cb4e5f12)) ##### [1.0.3](https://www.github.com/googleapis/java-shared-config/compare/v1.0.2...v1.0.3) (2021-09-21) ##### Bug Fixes - update java-docfx-doclet version ([#​315](https://www.togithub.com/googleapis/java-shared-config/issues/315)) ([07af07c](https://www.github.com/googleapis/java-shared-config/commit/07af07c188447ea5728ecd2700121ff477d1c58a)) ##### [1.0.2](https://www.github.com/googleapis/java-shared-config/compare/v1.0.1...v1.0.2) (2021-09-13) ##### Bug Fixes - specify animal-sniffer-maven-plugin version ([#​308](https://www.togithub.com/googleapis/java-shared-config/issues/308)) ([378bf43](https://www.github.com/googleapis/java-shared-config/commit/378bf431383306c1cdd0a4f922956c87edf321b5)) - update java docfx doclet version ([#​312](https://www.togithub.com/googleapis/java-shared-config/issues/312)) ([dd7f6e0](https://www.github.com/googleapis/java-shared-config/commit/dd7f6e0c1a7cc73831b74b4475457611a8c097d3)) ##### Dependencies - update dependency com.puppycrawl.tools:checkstyle to v9 ([#​303](https://www.togithub.com/googleapis/java-shared-config/issues/303)) ([71faea3](https://www.github.com/googleapis/java-shared-config/commit/71faea38d4132407598550e2bb4c77f9d4a4d83d)) ##### [1.0.1](https://www.github.com/googleapis/java-shared-config/compare/v1.0.0...v1.0.1) (2021-08-18) ##### Dependencies - update dependency com.puppycrawl.tools:checkstyle to v8.45.1 ([#​292](https://www.togithub.com/googleapis/java-shared-config/issues/292)) ([66bf6e6](https://www.github.com/googleapis/java-shared-config/commit/66bf6e6fb95997b9eb4b34268b8d20c2fbe9ed5a))
--- ### Configuration 📅 **Schedule**: 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 has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-accesscontextmanager). --- google-identity-accesscontextmanager-bom/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/google-identity-accesscontextmanager-bom/pom.xml b/google-identity-accesscontextmanager-bom/pom.xml index dd10f8f..0d892b7 100644 --- a/google-identity-accesscontextmanager-bom/pom.xml +++ b/google-identity-accesscontextmanager-bom/pom.xml @@ -8,7 +8,7 @@ com.google.cloud google-cloud-shared-config - 1.0.3 + 1.1.0 Google Identity Access Context Manager BOM diff --git a/pom.xml b/pom.xml index 23debd2..f131654 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 1.0.3 + 1.1.0 From 51c7c2262de4a65de087400840359eb43316f679 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Mon, 18 Oct 2021 16:52:19 +0000 Subject: [PATCH 09/11] build(java): Introduce Native Image testing build script changes (#264) --- .github/.OwlBot.lock.yaml | 2 +- .kokoro/build.sh | 5 +++++ .kokoro/presubmit/graalvm-native.cfg | 33 ++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 .kokoro/presubmit/graalvm-native.cfg diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 5ff6c87..dc53bbb 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:13b7387edb404234610d30473ac48210ae7fe42a136335ee2b2f8a07c4c7f6a5 + digest: sha256:d4b2141d65566523dfd523f63c6e6899ab1281463bce182a9f600e74b0511875 diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 9c96bbd..f2f020e 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -69,6 +69,11 @@ integration) verify RETURN_CODE=$? ;; +graalvm) + # Run Unit and Integration Tests with Native Image + mvn test -Pnative -Penable-integration-tests + 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.cfg new file mode 100644 index 0000000..4c7225e --- /dev/null +++ b/.kokoro/presubmit/graalvm-native.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-kokoro-resources/graalvm" +} + +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" +} From 4dd6a4dfd41661dd2fcdbd3a6beb6a51043eab73 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 19 Oct 2021 04:46:23 +0200 Subject: [PATCH 10/11] deps: update dependency com.google.cloud:google-cloud-shared-dependencies to v2.4.0 (#265) 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-shared-dependencies](https://togithub.com/googleapis/java-shared-dependencies) | `2.3.0` -> `2.4.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.4.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.4.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.4.0/compatibility-slim/2.3.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.4.0/confidence-slim/2.3.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-shared-dependencies ### [`v2.4.0`](https://togithub.com/googleapis/java-shared-dependencies/blob/master/CHANGELOG.md#​240-httpswwwgithubcomgoogleapisjava-shared-dependenciescompare230v240-2021-10-18) [Compare Source](https://togithub.com/googleapis/java-shared-dependencies/compare/v2.3.0...v2.4.0) ##### Dependencies - update dependency com.fasterxml.jackson:jackson-bom to v2.13.0 ([dba11b5](https://www.github.com/googleapis/java-shared-dependencies/commit/dba11b5fe14d39cdd62357e7bb1b82831c481150)) - update dependency com.google.api-client:google-api-client-bom to v1.32.2 ([dba11b5](https://www.github.com/googleapis/java-shared-dependencies/commit/dba11b5fe14d39cdd62357e7bb1b82831c481150)) - update dependency com.google.api:api-common to v2.0.5 ([dba11b5](https://www.github.com/googleapis/java-shared-dependencies/commit/dba11b5fe14d39cdd62357e7bb1b82831c481150)) - update dependency com.google.auth:google-auth-library-bom to v1.2.1 ([dba11b5](https://www.github.com/googleapis/java-shared-dependencies/commit/dba11b5fe14d39cdd62357e7bb1b82831c481150)) - update dependency com.google.guava:guava-bom to v31 ([#​498](https://www.togithub.com/googleapis/java-shared-dependencies/issues/498)) ([dba11b5](https://www.github.com/googleapis/java-shared-dependencies/commit/dba11b5fe14d39cdd62357e7bb1b82831c481150)) - update dependency com.google.http-client:google-http-client-bom to v1.40.1 ([dba11b5](https://www.github.com/googleapis/java-shared-dependencies/commit/dba11b5fe14d39cdd62357e7bb1b82831c481150)) - update dependency com.google.protobuf:protobuf-bom to v3.18.1 ([#​494](https://www.togithub.com/googleapis/java-shared-dependencies/issues/494)) ([a30e376](https://www.github.com/googleapis/java-shared-dependencies/commit/a30e3762b5fb0e2d31304d211c12eb2c1320f0c1)) - update dependency io.grpc:grpc-bom to v1.41.0 ([#​482](https://www.togithub.com/googleapis/java-shared-dependencies/issues/482)) ([8a7d227](https://www.github.com/googleapis/java-shared-dependencies/commit/8a7d227f2a1dab9ff23d247a4e6131c817804c36)) - update gax.version to v2.6.1 ([dba11b5](https://www.github.com/googleapis/java-shared-dependencies/commit/dba11b5fe14d39cdd62357e7bb1b82831c481150)) - update iam.version to v1.1.6 ([#​485](https://www.togithub.com/googleapis/java-shared-dependencies/issues/485)) ([cef7e09](https://www.github.com/googleapis/java-shared-dependencies/commit/cef7e090bbc2e3ae775fa83505f98df286ba7d42))
--- ### Configuration 📅 **Schedule**: 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 has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-accesscontextmanager). --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f131654..c1bee7e 100644 --- a/pom.xml +++ b/pom.xml @@ -62,7 +62,7 @@ com.google.cloud google-cloud-shared-dependencies - 2.3.0 + 2.4.0 pom import From a297bb8a718917e82dcbb6459062be4c1f268e12 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 19 Oct 2021 02:52:19 +0000 Subject: [PATCH 11/11] chore: release 1.2.3 (#266) :robot: I have created a release \*beep\* \*boop\* --- ### [1.2.3](https://www.github.com/googleapis/java-accesscontextmanager/compare/v1.2.2...v1.2.3) (2021-10-19) ### Dependencies * update dependency com.google.cloud:google-cloud-shared-dependencies to v2.4.0 ([#265](https://www.github.com/googleapis/java-accesscontextmanager/issues/265)) ([4dd6a4d](https://www.github.com/googleapis/java-accesscontextmanager/commit/4dd6a4dfd41661dd2fcdbd3a6beb6a51043eab73)) --- 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-identity-accesscontextmanager-bom/pom.xml | 10 +++++----- google-identity-accesscontextmanager/pom.xml | 4 ++-- grpc-google-identity-accesscontextmanager-v1/pom.xml | 4 ++-- pom.xml | 10 +++++----- .../pom.xml | 4 ++-- proto-google-identity-accesscontextmanager-v1/pom.xml | 6 +++--- versions.txt | 8 ++++---- 8 files changed, 30 insertions(+), 23 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 311e90a..8c2c0d8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### [1.2.3](https://www.github.com/googleapis/java-accesscontextmanager/compare/v1.2.2...v1.2.3) (2021-10-19) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.4.0 ([#265](https://www.github.com/googleapis/java-accesscontextmanager/issues/265)) ([4dd6a4d](https://www.github.com/googleapis/java-accesscontextmanager/commit/4dd6a4dfd41661dd2fcdbd3a6beb6a51043eab73)) + ### [1.2.2](https://www.github.com/googleapis/java-accesscontextmanager/compare/v1.2.1...v1.2.2) (2021-09-22) diff --git a/google-identity-accesscontextmanager-bom/pom.xml b/google-identity-accesscontextmanager-bom/pom.xml index 0d892b7..223cb74 100644 --- a/google-identity-accesscontextmanager-bom/pom.xml +++ b/google-identity-accesscontextmanager-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-identity-accesscontextmanager-bom - 1.2.3-SNAPSHOT + 1.2.3 pom com.google.cloud @@ -65,22 +65,22 @@ com.google.cloud google-identity-accesscontextmanager - 1.2.3-SNAPSHOT + 1.2.3 com.google.api.grpc grpc-google-identity-accesscontextmanager-v1 - 1.2.3-SNAPSHOT + 1.2.3 com.google.api.grpc proto-google-identity-accesscontextmanager-v1 - 1.2.3-SNAPSHOT + 1.2.3 com.google.api.grpc proto-google-identity-accesscontextmanager-type - 1.2.3-SNAPSHOT + 1.2.3 diff --git a/google-identity-accesscontextmanager/pom.xml b/google-identity-accesscontextmanager/pom.xml index 0555901..a3bab14 100644 --- a/google-identity-accesscontextmanager/pom.xml +++ b/google-identity-accesscontextmanager/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-identity-accesscontextmanager - 1.2.3-SNAPSHOT + 1.2.3 jar Google Identity Access Context Manager https://github.com/googleapis/java-accesscontextmanager @@ -11,7 +11,7 @@ com.google.cloud google-identity-accesscontextmanager-parent - 1.2.3-SNAPSHOT + 1.2.3 google-identity-accesscontextmanager diff --git a/grpc-google-identity-accesscontextmanager-v1/pom.xml b/grpc-google-identity-accesscontextmanager-v1/pom.xml index 2ed3399..293ae35 100644 --- a/grpc-google-identity-accesscontextmanager-v1/pom.xml +++ b/grpc-google-identity-accesscontextmanager-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-identity-accesscontextmanager-v1 - 1.2.3-SNAPSHOT + 1.2.3 grpc-google-identity-accesscontextmanager-v1 GRPC library for google-identity-accesscontextmanager com.google.cloud google-identity-accesscontextmanager-parent - 1.2.3-SNAPSHOT + 1.2.3 diff --git a/pom.xml b/pom.xml index c1bee7e..3642321 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-identity-accesscontextmanager-parent pom - 1.2.3-SNAPSHOT + 1.2.3 Google Identity Access Context Manager Parent https://github.com/googleapis/java-accesscontextmanager @@ -70,22 +70,22 @@ com.google.api.grpc proto-google-identity-accesscontextmanager-type - 1.2.3-SNAPSHOT + 1.2.3 com.google.api.grpc proto-google-identity-accesscontextmanager-v1 - 1.2.3-SNAPSHOT + 1.2.3 com.google.api.grpc grpc-google-identity-accesscontextmanager-v1 - 1.2.3-SNAPSHOT + 1.2.3 com.google.cloud google-identity-accesscontextmanager - 1.2.3-SNAPSHOT + 1.2.3 junit diff --git a/proto-google-identity-accesscontextmanager-type/pom.xml b/proto-google-identity-accesscontextmanager-type/pom.xml index 2173de7..b60a5fe 100644 --- a/proto-google-identity-accesscontextmanager-type/pom.xml +++ b/proto-google-identity-accesscontextmanager-type/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-identity-accesscontextmanager-type - 1.2.3-SNAPSHOT + 1.2.3 proto-google-identity-accesscontextmanager-type PROTO library for proto-google-identity-accesscontextmanager-type com.google.cloud google-identity-accesscontextmanager-parent - 1.2.3-SNAPSHOT + 1.2.3 diff --git a/proto-google-identity-accesscontextmanager-v1/pom.xml b/proto-google-identity-accesscontextmanager-v1/pom.xml index 6a88e5a..a9dc1b8 100644 --- a/proto-google-identity-accesscontextmanager-v1/pom.xml +++ b/proto-google-identity-accesscontextmanager-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-identity-accesscontextmanager-v1 - 1.2.3-SNAPSHOT + 1.2.3 proto-google-identity-accesscontextmanager-v1 PROTO library for proto-google-identity-accesscontextmanager-v1 com.google.cloud google-identity-accesscontextmanager-parent - 1.2.3-SNAPSHOT + 1.2.3 @@ -32,7 +32,7 @@ com.google.api.grpc proto-google-identity-accesscontextmanager-type - 1.2.3-SNAPSHOT + 1.2.3 diff --git a/versions.txt b/versions.txt index 22fe466..7cad3ce 100644 --- a/versions.txt +++ b/versions.txt @@ -1,7 +1,7 @@ # Format: # module:released-version:current-version -google-identity-accesscontextmanager:1.2.2:1.2.3-SNAPSHOT -grpc-google-identity-accesscontextmanager-v1:1.2.2:1.2.3-SNAPSHOT -proto-google-identity-accesscontextmanager-v1:1.2.2:1.2.3-SNAPSHOT -proto-google-identity-accesscontextmanager-type:1.2.2:1.2.3-SNAPSHOT +google-identity-accesscontextmanager:1.2.3:1.2.3 +grpc-google-identity-accesscontextmanager-v1:1.2.3:1.2.3 +proto-google-identity-accesscontextmanager-v1:1.2.3:1.2.3 +proto-google-identity-accesscontextmanager-type:1.2.3:1.2.3