From d5c45b83f6f7b795b1ff9fe6b8820d2289e2704f Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Tue, 29 Mar 2022 15:09:27 -0400 Subject: [PATCH 01/10] test: verifying test, lint, clirr, and graalvm in checks (#456) * test: verifying test, lint, and clirr in checks * test: trying graalvm job-type with GraalVM 22.0.0.2 * ci: adding the new builds as required checks The following simple Python script can generate the list: for j in [8, 11]: for r in ["java-trace", "java-bigquery"]: for t in ["test", "lint", "clirr"]: print(' - "build (%s, %s, %s)"' % (j, r, t)) --- .github/sync-repo-settings.yaml | 13 ++++ ...ream.yaml => downstream-dependencies.yaml} | 10 ++- .../workflows/downstream-maven-plugins.yaml | 67 +++++++++++++++++++ .kokoro/client-library-check.sh | 23 +++++-- 4 files changed, 103 insertions(+), 10 deletions(-) rename .github/workflows/{downstream.yaml => downstream-dependencies.yaml} (70%) create mode 100644 .github/workflows/downstream-maven-plugins.yaml diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index c2d7ab05..c3a74079 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -46,6 +46,19 @@ branchProtectionRules: - "dependencies (11, java-spanner)" - "dependencies (11, java-storage)" - "dependencies (11, java-pubsub)" + - "build (8, java-trace, test)" + - "build (8, java-trace, lint)" + - "build (8, java-trace, clirr)" + - "build (8, java-bigquery, test)" + - "build (8, java-bigquery, lint)" + - "build (8, java-bigquery, clirr)" + - "build (11, java-trace, test)" + - "build (11, java-trace, lint)" + - "build (11, java-trace, clirr)" + - "build (11, java-bigquery, test)" + - "build (11, java-bigquery, lint)" + - "build (11, java-bigquery, clirr)" + - "graalvm (11, java-orgpolicy)" - "cla/google" - pattern: java7 # Can admins overwrite branch protection. diff --git a/.github/workflows/downstream.yaml b/.github/workflows/downstream-dependencies.yaml similarity index 70% rename from .github/workflows/downstream.yaml rename to .github/workflows/downstream-dependencies.yaml index 8992a599..58c60f9d 100644 --- a/.github/workflows/downstream.yaml +++ b/.github/workflows/downstream-dependencies.yaml @@ -18,14 +18,12 @@ jobs: - java-storage - java-pubsub steps: - - uses: actions/checkout@v2 - - uses: stCarolas/setup-maven@v4 - with: - maven-version: 3.8.1 - - uses: actions/setup-java@v1 + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 with: + distribution: zulu java-version: ${{matrix.java}} - run: java -version - run: sudo apt-get update -y - run: sudo apt-get install libxml2-utils - - run: .kokoro/client-library-check.sh ${{matrix.repo}} + - run: .kokoro/client-library-check.sh ${{matrix.repo}} dependencies diff --git a/.github/workflows/downstream-maven-plugins.yaml b/.github/workflows/downstream-maven-plugins.yaml new file mode 100644 index 00000000..e1544540 --- /dev/null +++ b/.github/workflows/downstream-maven-plugins.yaml @@ -0,0 +1,67 @@ +on: + push: + branches: + - main + pull_request: + +# Keeping this file separate as the dependencies check would use more +# repositories than needed this downstream check for GraalVM native image and +# other Maven plugins. +name: downstream +jobs: + build: + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + java: [8, 11] + repo: + # GAPIC library + - java-trace + # Handwritten library + - java-bigquery + job-type: + - test # maven-surefire-plugin + - lint # fmt-maven-plugin and google-java-format + - clirr # clirr-maven-plugin + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 + with: + distribution: zulu + java-version: ${{matrix.java}} + - run: java -version + - run: sudo apt-get update -y + - run: sudo apt-get install libxml2-utils + - run: .kokoro/client-library-check.sh ${{matrix.repo}} ${{matrix.job-type}} + + # GraalVM job ensures the compatibility of GraaVM version above and the + # native-maven-plugin version. + graalvm: + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + java: [11] + repo: + # GAPIC library that doesn't use a real GCP project in integration tests + - java-orgpolicy + steps: + - uses: actions/checkout@v2 + - uses: stCarolas/setup-maven@v4 + with: + maven-version: 3.8.1 + - uses: ayltai/setup-graalvm@v1 + with: + java-version: ${{matrix.java}} + # When a new version of native-maven-plugin fails to run in a downstream + # library, it's likely to be an incompatibility with the GraalVM version. + # In that case, you need to upgrade the Docker container used in the + # tests in the downstream repositories (not just this value below). + # Example: https://github.com/googleapis/testing-infra-docker/pull/195 + graalvm-version: 22.0.0.2 + native-image: true + - run: java -version + - run: sudo apt-get update -y + - run: sudo apt-get install libxml2-utils + - run: .kokoro/client-library-check.sh ${{matrix.repo}} graalvm diff --git a/.kokoro/client-library-check.sh b/.kokoro/client-library-check.sh index 03cee53b..3cddeb10 100755 --- a/.kokoro/client-library-check.sh +++ b/.kokoro/client-library-check.sh @@ -21,12 +21,15 @@ set -eo pipefail # Display commands being run. set -x -if [[ $# -lt 1 ]]; +if [[ $# -ne 2 ]]; then - echo "Usage: $0 " + echo "Usage: $0 " + echo "where repo-name is java-XXX and check-type is dependencies, lint, or clirr" exit 1 fi REPO=$1 +# build.sh uses this environment variable +export JOB_TYPE=$2 ## Get the directory of the build script scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}")) @@ -61,5 +64,17 @@ set ${VERSION} save pom.xml EOF -# run dependencies script -.kokoro/dependencies.sh +case ${JOB_TYPE} in +dependencies) + .kokoro/dependencies.sh + RETURN_CODE=$? + ;; +*) + # This reads the JOB_TYPE environmental variable + .kokoro/build.sh + RETURN_CODE=$? + ;; +esac + +echo "exiting with ${RETURN_CODE}" +exit ${RETURN_CODE} From d20008df15209708fdf9d06828b567778190f4d0 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 1 Apr 2022 20:00:29 +0200 Subject: [PATCH 02/10] deps: update dependency com.google.cloud:native-image-support to v0.12.11 (#459) 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:native-image-support](https://togithub.com/googleapis/java-core) | `0.12.10` -> `0.12.11` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:native-image-support/0.12.11/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:native-image-support/0.12.11/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:native-image-support/0.12.11/compatibility-slim/0.12.10)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:native-image-support/0.12.11/confidence-slim/0.12.10)](https://docs.renovatebot.com/merge-confidence/) | --- ### 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, 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-shared-config). --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 628bea79..e5025133 100644 --- a/pom.xml +++ b/pom.xml @@ -776,7 +776,7 @@ com.google.cloud native-image-support - 0.12.10 + 0.12.11 test From 1bf67b55efa00708aea22be86bfdd0a237dc80df Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 6 Apr 2022 22:14:20 +0200 Subject: [PATCH 03/10] build(deps): update dependency org.apache.maven.plugins:maven-jxr-plugin to v3.2.0 (#447) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e5025133..d8ebd410 100644 --- a/pom.xml +++ b/pom.xml @@ -506,7 +506,7 @@ org.apache.maven.plugins maven-jxr-plugin - 3.1.1 + 3.2.0 true From 161196b6e03cc9183a73e0651d89d4b36088c9b6 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 6 Apr 2022 22:14:33 +0200 Subject: [PATCH 04/10] build(deps): update dependency org.jacoco:jacoco-maven-plugin to v0.8.8 (#463) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d8ebd410..3e4e9356 100644 --- a/pom.xml +++ b/pom.xml @@ -190,7 +190,7 @@ org.jacoco jacoco-maven-plugin - 0.8.7 + 0.8.8 org.apache.maven.plugins From 4d85a59228627050fcb83852ab99d7abd8024ace Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Wed, 6 Apr 2022 16:16:19 -0400 Subject: [PATCH 05/10] test: versioning maven-failsafe-plugin and maven-surefire-plugin together (#460) * test: versioning maven-failsafe-plugin and maven-surefire-plugin * deps: surefire v3.0.0-m6 --- pom.xml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 3e4e9356..288a50a1 100644 --- a/pom.xml +++ b/pom.xml @@ -64,6 +64,7 @@ false true 1.9 + 3.0.0-M6 /java/docs/reference/ @@ -85,7 +86,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M5 + ${surefire.version} @@ -98,7 +99,7 @@ org.apache.maven.surefire surefire-junit47 - 3.0.0-M5 + ${surefire.version} @@ -129,7 +130,8 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.0.0-M4 + + ${surefire.version} 3600 sponge_log @@ -142,7 +144,7 @@ org.apache.maven.surefire surefire-junit47 - 3.0.0-M4 + ${surefire.version} From 6e95573ade37c74519d3176eb8467d7f33a750d5 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Wed, 6 Apr 2022 13:17:11 -0700 Subject: [PATCH 06/10] chore: Enable Size-Label bot in all googleapis Java repositories (#1381) (#464) * chore: Enable Size-Label bot in all googleapis Java repositories Auto-label T-shirt size indicator should be assigned on every new pull request in all googleapis Java repositories * Remove product Remove product since it is by default true * add license header Co-authored-by: Neenu Shaji Source-Link: https://github.com/googleapis/synthtool/commit/54b2c6ac75370a4a3582431b4a3080f777ba1f11 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:fc52b202aa298a50a12c64efd04fea3884d867947effe2fa85382a246c09e813 Co-authored-by: Owl Bot Co-authored-by: Neenu Shaji --- .github/.OwlBot.lock.yaml | 3 ++- .github/auto-label.yaml | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 .github/auto-label.yaml diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 426cf83e..f60d7749 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -13,4 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:b0b1c1c89570e229b1026372a2b8989ba31495007055b8d30178b7648503eefa + digest: sha256:fc52b202aa298a50a12c64efd04fea3884d867947effe2fa85382a246c09e813 +# created: 2022-04-06T16:30:03.627422514Z diff --git a/.github/auto-label.yaml b/.github/auto-label.yaml new file mode 100644 index 00000000..4caef688 --- /dev/null +++ b/.github/auto-label.yaml @@ -0,0 +1,15 @@ +# Copyright 2021 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. +requestsize: + enabled: true From ffd07cb18ee7d45d4daee1d9ea6f6d321fdca874 Mon Sep 17 00:00:00 2001 From: Mridula <66699525+mpeddada1@users.noreply.github.com> Date: Mon, 18 Apr 2022 16:49:23 -0400 Subject: [PATCH 07/10] fix(java): remove protobuf feature from native profile (#461) --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index 288a50a1..66bd316d 100644 --- a/pom.xml +++ b/pom.xml @@ -833,7 +833,6 @@ --no-fallback --no-server - --features=com.google.cloud.nativeimage.features.ProtobufMessageFeature From b2020648816feb4740ad70acedfed470d7da5bcf Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 19 Apr 2022 00:46:59 +0200 Subject: [PATCH 08/10] deps: update dependency com.google.cloud:native-image-support to v0.13.1 (#465) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 66bd316d..9d7fac83 100644 --- a/pom.xml +++ b/pom.xml @@ -778,7 +778,7 @@ com.google.cloud native-image-support - 0.12.11 + 0.13.1 test From 5828ce8180b9748a6176aac344734c2f9201bf6b Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 19 Apr 2022 18:16:23 +0000 Subject: [PATCH 09/10] chore(main): release 1.3.3-SNAPSHOT (#458) :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). --- pom.xml | 2 +- versions.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 9d7fac83..2127fde7 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.3.2 + 1.3.3-SNAPSHOT Google Cloud https://github.com/googleapis/java-shared-config diff --git a/versions.txt b/versions.txt index 5079fd28..e26ffec8 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.3.2:1.3.2 +google-cloud-shared-config:1.3.2:1.3.3-SNAPSHOT From 7c17106350bc29523d5ef6a1a6806bf5015947a8 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 19 Apr 2022 20:34:19 +0000 Subject: [PATCH 10/10] chore(main): release 1.3.3 (#466) :robot: I have created a release *beep* *boop* --- ### [1.3.3](https://github.com/googleapis/java-shared-config/compare/v1.3.2...v1.3.3) (2022-04-19) ### Bug Fixes * **java:** remove protobuf feature from native profile ([#461](https://github.com/googleapis/java-shared-config/issues/461)) ([ffd07cb](https://github.com/googleapis/java-shared-config/commit/ffd07cb18ee7d45d4daee1d9ea6f6d321fdca874)) ### Dependencies * update dependency com.google.cloud:native-image-support to v0.12.11 ([#459](https://github.com/googleapis/java-shared-config/issues/459)) ([d20008d](https://github.com/googleapis/java-shared-config/commit/d20008df15209708fdf9d06828b567778190f4d0)) * update dependency com.google.cloud:native-image-support to v0.13.1 ([#465](https://github.com/googleapis/java-shared-config/issues/465)) ([b202064](https://github.com/googleapis/java-shared-config/commit/b2020648816feb4740ad70acedfed470d7da5bcf)) --- 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 | 13 +++++++++++++ pom.xml | 2 +- versions.txt | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d889322c..cc875d87 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,18 @@ # Changelog +### [1.3.3](https://github.com/googleapis/java-shared-config/compare/v1.3.2...v1.3.3) (2022-04-19) + + +### Bug Fixes + +* **java:** remove protobuf feature from native profile ([#461](https://github.com/googleapis/java-shared-config/issues/461)) ([ffd07cb](https://github.com/googleapis/java-shared-config/commit/ffd07cb18ee7d45d4daee1d9ea6f6d321fdca874)) + + +### Dependencies + +* update dependency com.google.cloud:native-image-support to v0.12.11 ([#459](https://github.com/googleapis/java-shared-config/issues/459)) ([d20008d](https://github.com/googleapis/java-shared-config/commit/d20008df15209708fdf9d06828b567778190f4d0)) +* update dependency com.google.cloud:native-image-support to v0.13.1 ([#465](https://github.com/googleapis/java-shared-config/issues/465)) ([b202064](https://github.com/googleapis/java-shared-config/commit/b2020648816feb4740ad70acedfed470d7da5bcf)) + ### [1.3.2](https://github.com/googleapis/java-shared-config/compare/v1.3.1...v1.3.2) (2022-03-28) diff --git a/pom.xml b/pom.xml index 2127fde7..cd599903 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.3.3-SNAPSHOT + 1.3.3 Google Cloud https://github.com/googleapis/java-shared-config diff --git a/versions.txt b/versions.txt index e26ffec8..1aca0482 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.3.2:1.3.3-SNAPSHOT +google-cloud-shared-config:1.3.3:1.3.3