diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index b750a23..dc53bbb 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 + digest: sha256:d4b2141d65566523dfd523f63c6e6899ab1281463bce182a9f600e74b0511875 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" 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/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index efe8814..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 @@ -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 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/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/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/.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" +} 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/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 diff --git a/google-identity-accesscontextmanager-bom/pom.xml b/google-identity-accesscontextmanager-bom/pom.xml index 3a11959..223cb74 100644 --- a/google-identity-accesscontextmanager-bom/pom.xml +++ b/google-identity-accesscontextmanager-bom/pom.xml @@ -3,12 +3,12 @@ 4.0.0 com.google.cloud google-identity-accesscontextmanager-bom - 1.2.2 + 1.2.3 pom com.google.cloud google-cloud-shared-config - 1.0.3 + 1.1.0 Google Identity Access Context Manager BOM @@ -65,22 +65,22 @@ com.google.cloud google-identity-accesscontextmanager - 1.2.2 + 1.2.3 com.google.api.grpc grpc-google-identity-accesscontextmanager-v1 - 1.2.2 + 1.2.3 com.google.api.grpc proto-google-identity-accesscontextmanager-v1 - 1.2.2 + 1.2.3 com.google.api.grpc proto-google-identity-accesscontextmanager-type - 1.2.2 + 1.2.3 diff --git a/google-identity-accesscontextmanager/pom.xml b/google-identity-accesscontextmanager/pom.xml index cb37a27..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.2 + 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.2 + 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 ce72f0a..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.2 + 1.2.3 grpc-google-identity-accesscontextmanager-v1 GRPC library for google-identity-accesscontextmanager com.google.cloud google-identity-accesscontextmanager-parent - 1.2.2 + 1.2.3 diff --git a/pom.xml b/pom.xml index 2da8445..3642321 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 Google Identity Access Context Manager Parent https://github.com/googleapis/java-accesscontextmanager @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 1.0.3 + 1.1.0 @@ -62,7 +62,7 @@ com.google.cloud google-cloud-shared-dependencies - 2.3.0 + 2.4.0 pom import @@ -70,22 +70,22 @@ com.google.api.grpc proto-google-identity-accesscontextmanager-type - 1.2.2 + 1.2.3 com.google.api.grpc proto-google-identity-accesscontextmanager-v1 - 1.2.2 + 1.2.3 com.google.api.grpc grpc-google-identity-accesscontextmanager-v1 - 1.2.2 + 1.2.3 com.google.cloud google-identity-accesscontextmanager - 1.2.2 + 1.2.3 junit diff --git a/proto-google-identity-accesscontextmanager-type/pom.xml b/proto-google-identity-accesscontextmanager-type/pom.xml index fb9e9d7..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.2 + 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.2 + 1.2.3 diff --git a/proto-google-identity-accesscontextmanager-v1/pom.xml b/proto-google-identity-accesscontextmanager-v1/pom.xml index 4f26dd6..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.2 + 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.2 + 1.2.3 @@ -32,7 +32,7 @@ com.google.api.grpc proto-google-identity-accesscontextmanager-type - 1.2.2 + 1.2.3 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 } diff --git a/versions.txt b/versions.txt index f32f1de..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.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.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