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 a618e43a..650d0675 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/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 0fd9c0c2..bbb1eb71 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 867d3a0d..727ea18e 100644 --- a/.repo-metadata.json +++ b/.repo-metadata.json @@ -3,7 +3,7 @@ "name_pretty": "App Engine Admin API", "product_documentation": "https://cloud.google.com/appengine/docs/admin-api/", "api_description": "you to manage your App Engine applications.", - "client_documentation": "https://googleapis.dev/java/google-cloud-appengine-admin/latest/index.html", + "client_documentation": "https://cloud.google.com/java/docs/reference/google-cloud-appengine-admin/latest/history", "release_level": "ga", "transport": "grpc", "language": "java", diff --git a/CHANGELOG.md b/CHANGELOG.md index f22feeea..949845a9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### [2.1.2](https://www.github.com/googleapis/java-appengine-admin/compare/v2.1.1...v2.1.2) (2021-10-19) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.4.0 ([#136](https://www.github.com/googleapis/java-appengine-admin/issues/136)) ([1365489](https://www.github.com/googleapis/java-appengine-admin/commit/136548935042ac67a2f7df1b3fa2fe6e9c82ef6c)) + ### [2.1.1](https://www.github.com/googleapis/java-appengine-admin/compare/v2.1.0...v2.1.1) (2021-09-22) diff --git a/README.md b/README.md index 843f2aad..64a41a7a 100644 --- a/README.md +++ b/README.md @@ -19,20 +19,20 @@ If you are using Maven, add this to your pom.xml file: com.google.cloud google-cloud-appengine-admin - 2.1.0 + 2.1.1 ``` If you are using Gradle without BOM, add this to your dependencies ```Groovy -implementation 'com.google.cloud:google-cloud-appengine-admin:2.1.0' +implementation 'com.google.cloud:google-cloud-appengine-admin:2.1.1' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-appengine-admin" % "2.1.0" +libraryDependencies += "com.google.cloud" % "google-cloud-appengine-admin" % "2.1.1" ``` ## Authentication @@ -159,7 +159,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/appengine/docs/admin-api/ -[javadocs]: https://googleapis.dev/java/google-cloud-appengine-admin/latest/index.html +[javadocs]: https://cloud.google.com/java/docs/reference/google-cloud-appengine-admin/latest/history [kokoro-badge-image-1]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-appengine-admin/java7.svg [kokoro-badge-link-1]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-appengine-admin/java7.html [kokoro-badge-image-2]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-appengine-admin/java8.svg @@ -180,10 +180,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-appengine-admin/blob/master/CONTRIBUTING.md -[code-of-conduct]: https://github.com/googleapis/java-appengine-admin/blob/master/CODE_OF_CONDUCT.md#contributor-code-of-conduct -[license]: https://github.com/googleapis/java-appengine-admin/blob/master/LICENSE +[troubleshooting]: https://github.com/googleapis/google-cloud-common/blob/main/troubleshooting/readme.md#troubleshooting +[contributing]: https://github.com/googleapis/java-appengine-admin/blob/main/CONTRIBUTING.md +[code-of-conduct]: https://github.com/googleapis/java-appengine-admin/blob/main/CODE_OF_CONDUCT.md#contributor-code-of-conduct +[license]: https://github.com/googleapis/java-appengine-admin/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=appengine.googleapis.com [libraries-bom]: https://github.com/GoogleCloudPlatform/cloud-opensource-java/wiki/The-Google-Cloud-Platform-Libraries-BOM diff --git a/google-cloud-appengine-admin-bom/pom.xml b/google-cloud-appengine-admin-bom/pom.xml index 4a59c224..5500e4c1 100644 --- a/google-cloud-appengine-admin-bom/pom.xml +++ b/google-cloud-appengine-admin-bom/pom.xml @@ -3,12 +3,12 @@ 4.0.0 com.google.cloud google-cloud-appengine-admin-bom - 2.1.1 + 2.1.2 pom com.google.cloud google-cloud-shared-config - 1.0.3 + 1.1.0 Google App Engine Admin API BOM @@ -56,17 +56,17 @@ com.google.cloud google-cloud-appengine-admin - 2.1.1 + 2.1.2 com.google.api.grpc grpc-google-cloud-appengine-admin-v1 - 2.1.1 + 2.1.2 com.google.api.grpc proto-google-cloud-appengine-admin-v1 - 2.1.1 + 2.1.2 diff --git a/google-cloud-appengine-admin/pom.xml b/google-cloud-appengine-admin/pom.xml index 96a49fc9..af2339f6 100644 --- a/google-cloud-appengine-admin/pom.xml +++ b/google-cloud-appengine-admin/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-appengine-admin - 2.1.1 + 2.1.2 jar Google App Engine Admin API https://github.com/googleapis/java-appengine-admin @@ -11,7 +11,7 @@ com.google.cloud google-cloud-appengine-admin-parent - 2.1.1 + 2.1.2 google-cloud-appengine-admin diff --git a/grpc-google-cloud-appengine-admin-v1/pom.xml b/grpc-google-cloud-appengine-admin-v1/pom.xml index d87327b6..bc5bd9b8 100644 --- a/grpc-google-cloud-appengine-admin-v1/pom.xml +++ b/grpc-google-cloud-appengine-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-appengine-admin-v1 - 2.1.1 + 2.1.2 grpc-google-cloud-appengine-admin-v1 GRPC library for google-cloud-appengine-admin com.google.cloud google-cloud-appengine-admin-parent - 2.1.1 + 2.1.2 diff --git a/pom.xml b/pom.xml index a5904659..21ef9e6c 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-appengine-admin-parent pom - 2.1.1 + 2.1.2 Google App Engine Admin API Parent https://github.com/googleapis/java-appengine-admin @@ -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-appengine-admin - 2.1.1 + 2.1.2 com.google.api.grpc grpc-google-cloud-appengine-admin-v1 - 2.1.1 + 2.1.2 com.google.api.grpc proto-google-cloud-appengine-admin-v1 - 2.1.1 + 2.1.2 com.google.cloud google-cloud-shared-dependencies - 2.3.0 + 2.4.0 pom import diff --git a/proto-google-cloud-appengine-admin-v1/pom.xml b/proto-google-cloud-appengine-admin-v1/pom.xml index 6d5087f6..b49e2a32 100644 --- a/proto-google-cloud-appengine-admin-v1/pom.xml +++ b/proto-google-cloud-appengine-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-appengine-admin-v1 - 2.1.1 + 2.1.2 proto-google-cloud-appengine-admin-v1 Proto library for google-cloud-appengine-admin com.google.cloud google-cloud-appengine-admin-parent - 2.1.1 + 2.1.2 diff --git a/renovate.json b/renovate.json index f54cefcb..d04e4090 100644 --- a/renovate.json +++ b/renovate.json @@ -70,8 +70,5 @@ } ], "semanticCommits": true, - "dependencyDashboard": true, - "dependencyDashboardLabels": [ - "type: process" - ] + "dependencyDashboard": true } diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 1dcab146..5a2e0744 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-appengine-admin - 2.1.0 + 2.1.1 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index f7b7a7e6..edfe9d41 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-appengine-admin - 2.1.0 + 2.1.1 diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 0cfb41fb..3f34a3c8 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-appengine-admin - 2.1.0 + 2.1.1 diff --git a/versions.txt b/versions.txt index f76b3043..0f25bf88 100644 --- a/versions.txt +++ b/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -google-cloud-appengine-admin:2.1.1:2.1.1 -grpc-google-cloud-appengine-admin-v1:2.1.1:2.1.1 -proto-google-cloud-appengine-admin-v1:2.1.1:2.1.1 +google-cloud-appengine-admin:2.1.2:2.1.2 +grpc-google-cloud-appengine-admin-v1:2.1.2:2.1.2 +proto-google-cloud-appengine-admin-v1:2.1.2:2.1.2