diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index b6721276..dc53bbb5 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: - image: gcr.io/repo-automation-bots/owlbot-java:latest - digest: sha256:8c50e7bab0ae5ad41ee29420b558542637104500f6256b8fe74282b0cf6144db + image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest + digest: sha256:d4b2141d65566523dfd523f63c6e6899ab1281463bce182a9f600e74b0511875 diff --git a/.github/.OwlBot.yaml b/.github/.OwlBot.yaml index e0869457..21a244ba 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: - "/grpc-google-.*/src" diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index af6322b0..30fdb7b9 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -4,9 +4,7 @@ # For syntax help see: # https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax -# The @googleapis/cicd is the default owner for changes in this repo -* @googleapis/yoshi-java @googleapis/cicd -**/*.java @googleapis/cicd +* @googleapis/yoshi-java # The java-samples-reviewers team is the default owner for samples changes samples/**/*.java @googleapis/java-samples-reviewers diff --git a/.github/blunderbuss.yml b/.github/blunderbuss.yml index 1a23ea42..2176b054 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 32e0ea5a..6f09d695 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 diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 3becb5c0..2425d723 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 01b016df..3a539b64 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 9030ba8f..9a5105d7 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 00000000..4c7225ec --- /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/.repo-metadata.json b/.repo-metadata.json index fc5c7b60..0e41ddf7 100644 --- a/.repo-metadata.json +++ b/.repo-metadata.json @@ -3,7 +3,7 @@ "name_pretty": "Binary Authorization", "product_documentation": "https://cloud.google.com/binary-authorization/docs", "api_description": " is a service on Google Cloud that provides centralized software supply-chain security for applications that run on Google Kubernetes Engine (GKE) and Anthos clusters on VMware", - "client_documentation": "https://googleapis.dev/java/google-cloud-binary-authorization/latest/index.html", + "client_documentation": "https://cloud.google.com/java/docs/reference/google-cloud-binary-authorization/latest/history", "release_level": "beta", "transport": "grpc", "language": "java", @@ -12,6 +12,5 @@ "distribution_name": "com.google.cloud:google-cloud-binary-authorization", "api_id": "binary-authorization.googleapis.com", "requires_billing": true, - "library_type": "GAPIC_AUTO", - "codeowner_team": "@googleapis/cicd" + "library_type": "GAPIC_AUTO" } diff --git a/CHANGELOG.md b/CHANGELOG.md index e1e93252..d0f6dbbb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### [0.3.3](https://www.github.com/googleapis/java-binary-authorization/compare/v0.3.2...v0.3.3) (2021-10-19) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.4.0 ([#101](https://www.github.com/googleapis/java-binary-authorization/issues/101)) ([3f592b5](https://www.github.com/googleapis/java-binary-authorization/commit/3f592b5bd92410c7afa40e166ea26012cad26648)) + ### [0.3.2](https://www.github.com/googleapis/java-binary-authorization/compare/v0.3.1...v0.3.2) (2021-09-22) diff --git a/README.md b/README.md index f379ece0..9d45b6ba 100644 --- a/README.md +++ b/README.md @@ -165,7 +165,7 @@ Java 11 | [![Kokoro CI][kokoro-badge-image-5]][kokoro-badge-link-5] Java is a registered trademark of Oracle and/or its affiliates. [product-docs]: https://cloud.google.com/binary-authorization/docs -[javadocs]: https://googleapis.dev/java/google-cloud-binary-authorization/latest/index.html +[javadocs]: https://cloud.google.com/java/docs/reference/google-cloud-binary-authorization/latest/history [kokoro-badge-image-1]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-binary-authorization/java7.svg [kokoro-badge-link-1]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-binary-authorization/java7.html [kokoro-badge-image-2]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-binary-authorization/java8.svg @@ -186,10 +186,10 @@ Java is a registered trademark of Oracle and/or its affiliates. [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-binary-authorization/blob/master/CONTRIBUTING.md -[code-of-conduct]: https://github.com/googleapis/java-binary-authorization/blob/master/CODE_OF_CONDUCT.md#contributor-code-of-conduct -[license]: https://github.com/googleapis/java-binary-authorization/blob/master/LICENSE +[troubleshooting]: https://github.com/googleapis/google-cloud-common/blob/main/troubleshooting/readme.md#troubleshooting +[contributing]: https://github.com/googleapis/java-binary-authorization/blob/main/CONTRIBUTING.md +[code-of-conduct]: https://github.com/googleapis/java-binary-authorization/blob/main/CODE_OF_CONDUCT.md#contributor-code-of-conduct +[license]: https://github.com/googleapis/java-binary-authorization/blob/main/LICENSE [enable-billing]: https://cloud.google.com/apis/docs/getting-started#enabling_billing [enable-api]: https://console.cloud.google.com/flows/enableapi?apiid=binary-authorization.googleapis.com [libraries-bom]: https://github.com/GoogleCloudPlatform/cloud-opensource-java/wiki/The-Google-Cloud-Platform-Libraries-BOM diff --git a/google-cloud-binary-authorization-bom/pom.xml b/google-cloud-binary-authorization-bom/pom.xml index 5866bcac..088ca965 100644 --- a/google-cloud-binary-authorization-bom/pom.xml +++ b/google-cloud-binary-authorization-bom/pom.xml @@ -3,12 +3,12 @@ 4.0.0 com.google.cloud google-cloud-binary-authorization-bom - 0.3.2 + 0.3.3 pom com.google.cloud google-cloud-shared-config - 1.0.3 + 1.1.0 Google Binary Authorization BOM @@ -56,17 +56,17 @@ com.google.cloud google-cloud-binary-authorization - 0.3.2 + 0.3.3 com.google.api.grpc grpc-google-cloud-binary-authorization-v1beta1 - 0.3.2 + 0.3.3 com.google.api.grpc proto-google-cloud-binary-authorization-v1beta1 - 0.3.2 + 0.3.3 diff --git a/google-cloud-binary-authorization/pom.xml b/google-cloud-binary-authorization/pom.xml index f24b78af..f0bcb0e1 100644 --- a/google-cloud-binary-authorization/pom.xml +++ b/google-cloud-binary-authorization/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-binary-authorization - 0.3.2 + 0.3.3 jar Google Binary Authorization https://github.com/googleapis/java-binary-authorization @@ -11,7 +11,7 @@ com.google.cloud google-cloud-binary-authorization-parent - 0.3.2 + 0.3.3 google-cloud-binary-authorization diff --git a/grpc-google-cloud-binary-authorization-v1beta1/pom.xml b/grpc-google-cloud-binary-authorization-v1beta1/pom.xml index 52d6c2f7..1eb362a0 100644 --- a/grpc-google-cloud-binary-authorization-v1beta1/pom.xml +++ b/grpc-google-cloud-binary-authorization-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-binary-authorization-v1beta1 - 0.3.2 + 0.3.3 grpc-google-cloud-binary-authorization-v1beta1 GRPC library for google-cloud-binary-authorization com.google.cloud google-cloud-binary-authorization-parent - 0.3.2 + 0.3.3 diff --git a/pom.xml b/pom.xml index 46223696..6e8120ab 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-binary-authorization-parent pom - 0.3.2 + 0.3.3 Google Binary Authorization Parent https://github.com/googleapis/java-binary-authorization @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 1.0.3 + 1.1.0 @@ -60,23 +60,23 @@ com.google.cloud google-cloud-binary-authorization - 0.3.2 + 0.3.3 com.google.api.grpc grpc-google-cloud-binary-authorization-v1beta1 - 0.3.2 + 0.3.3 com.google.api.grpc proto-google-cloud-binary-authorization-v1beta1 - 0.3.2 + 0.3.3 com.google.cloud google-cloud-shared-dependencies - 2.3.0 + 2.4.0 pom import diff --git a/proto-google-cloud-binary-authorization-v1beta1/pom.xml b/proto-google-cloud-binary-authorization-v1beta1/pom.xml index 2691a548..d7a4d271 100644 --- a/proto-google-cloud-binary-authorization-v1beta1/pom.xml +++ b/proto-google-cloud-binary-authorization-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-binary-authorization-v1beta1 - 0.3.2 + 0.3.3 proto-google-cloud-binary-authorization-v1beta1 Proto library for google-cloud-binary-authorization com.google.cloud google-cloud-binary-authorization-parent - 0.3.2 + 0.3.3 diff --git a/renovate.json b/renovate.json index 4ee15828..8a97e7d3 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 4ef77ee6..e4154048 100644 --- a/versions.txt +++ b/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -google-cloud-binary-authorization:0.3.2:0.3.2 -grpc-google-cloud-binary-authorization-v1beta1:0.3.2:0.3.2 -proto-google-cloud-binary-authorization-v1beta1:0.3.2:0.3.2 +google-cloud-binary-authorization:0.3.3:0.3.3 +grpc-google-cloud-binary-authorization-v1beta1:0.3.3:0.3.3 +proto-google-cloud-binary-authorization-v1beta1:0.3.3:0.3.3