From 31469a8d04472134c927ab12d0cfd38113aad626 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Mon, 8 Nov 2021 14:06:13 -0800 Subject: [PATCH 1/6] chore: cleanup cloud RAD generation (#1269) (#353) Updating cloud rad generation to support [java-shared-config/pull/344](https://github.com/googleapis/java-shared-config/pull/344) updates and removing inclusion of README as we're not currently supporting this feature yet Source-Link: https://github.com/googleapis/synthtool/commit/99ea92a109dbcd4e2b8c179e337848ba6a25fe16 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:204b7af96e6d481f19b0ff377aa379d46bc56dd06e1cc7c523f361dd9cbfeeaa Co-authored-by: Owl Bot --- .github/.OwlBot.lock.yaml | 2 +- .kokoro/release/publish_javadoc11.sh | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 994dd04b..325daaa4 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:fecf6bd85f19eb046d913982ea36f6d434f9a49ab0545d25e31186aa64367c0c + digest: sha256:204b7af96e6d481f19b0ff377aa379d46bc56dd06e1cc7c523f361dd9cbfeeaa diff --git a/.kokoro/release/publish_javadoc11.sh b/.kokoro/release/publish_javadoc11.sh index e12f72f5..5166678d 100755 --- a/.kokoro/release/publish_javadoc11.sh +++ b/.kokoro/release/publish_javadoc11.sh @@ -36,13 +36,9 @@ mvn clean install -B -q -DskipTests=true export NAME=google-cloud-shared-config export VERSION=$(grep ${NAME}: versions.txt | cut -d: -f3) -# V3 generates docfx yml from javadoc -# generate yml -mvn clean site -B -q -P docFX - -# copy README to docfx-yml dir and rename index.md -cp README.md target/docfx-yml/index.md -# copy CHANGELOG to docfx-yml dir and rename history.md +# cloud RAD generation +mvn clean javadoc:aggregate -B -q -P docFX +# include CHANGELOG cp CHANGELOG.md target/docfx-yml/history.md pushd target/docfx-yml From caea755c30b6e84722f6feaa4e0f718d08dacc1c Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 9 Nov 2021 15:12:17 +0000 Subject: [PATCH 2/6] chore: release 1.2.2-SNAPSHOT (#352) :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 b475c7be..88e02342 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.2.1 + 1.2.2-SNAPSHOT Google Cloud https://github.com/googleapis/java-shared-config diff --git a/versions.txt b/versions.txt index ed79f330..37ff238b 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.2.1:1.2.1 +google-cloud-shared-config:1.2.1:1.2.2-SNAPSHOT From c1b3c2020b0359f035a15a6125f48d3d843bc20b Mon Sep 17 00:00:00 2001 From: Daniel Zou Date: Tue, 16 Nov 2021 13:56:49 -0500 Subject: [PATCH 3/6] chore: update dependency com.google.cloud:native-image-support (#357) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 88e02342..df7ba351 100644 --- a/pom.xml +++ b/pom.xml @@ -776,7 +776,7 @@ com.google.cloud native-image-support - 0.9.0 + 0.10.0 test From 6d7f909c9996c4af8385abee15d4267a7e9df9a0 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 16 Nov 2021 09:17:24 -1000 Subject: [PATCH 4/6] chore: update jre to 11 for linter (#1278) (#354) java-format requires JRE v11+ to run linter. It still check older code, just jre has to be 11+: https://github.com/google/google-java-format/issues/529 Updating ci.yaml template since it is applicable for all the libraries. Source-Link: https://github.com/googleapis/synthtool/commit/42a3786737c17ece39924d7025f3be481812da53 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:14ecf64ec36f67c7bf04e3dc0f68eafcc01df3955121c38862b695e2ae7515d8 Co-authored-by: Owl Bot --- .github/.OwlBot.lock.yaml | 2 +- .github/workflows/ci.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 325daaa4..886d0949 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:204b7af96e6d481f19b0ff377aa379d46bc56dd06e1cc7c523f361dd9cbfeeaa + digest: sha256:14ecf64ec36f67c7bf04e3dc0f68eafcc01df3955121c38862b695e2ae7515d8 diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 93b337c6..05de1f60 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -53,7 +53,7 @@ jobs: - uses: actions/setup-java@v2 with: distribution: zulu - java-version: 8 + java-version: 11 - run: java -version - run: .kokoro/build.sh env: From 044195865a1122d419cadae90fddbf8dc5b4a32d Mon Sep 17 00:00:00 2001 From: Neenu Shaji Date: Tue, 16 Nov 2021 15:12:27 -0500 Subject: [PATCH 5/6] fix: update dependency com.google.cloud:native-image-support to v0.10.0 (#358) From 214a3d2ad643e18a8b4f589b0dbe8ff44446bd85 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 16 Nov 2021 20:40:20 +0000 Subject: [PATCH 6/6] chore: release 1.2.2 (#359) :robot: I have created a release \*beep\* \*boop\* --- ### [1.2.2](https://www.github.com/googleapis/java-shared-config/compare/v1.2.1...v1.2.2) (2021-11-16) ### Bug Fixes * update dependency com.google.cloud:native-image-support to v0.10.0 ([#358](https://www.github.com/googleapis/java-shared-config/issues/358)) ([0441958](https://www.github.com/googleapis/java-shared-config/commit/044195865a1122d419cadae90fddbf8dc5b4a32d)) --- 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 +++++++ README.md | 2 +- pom.xml | 2 +- versions.txt | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9333f71d..14207c56 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### [1.2.2](https://www.github.com/googleapis/java-shared-config/compare/v1.2.1...v1.2.2) (2021-11-16) + + +### Bug Fixes + +* update dependency com.google.cloud:native-image-support to v0.10.0 ([#358](https://www.github.com/googleapis/java-shared-config/issues/358)) ([0441958](https://www.github.com/googleapis/java-shared-config/commit/044195865a1122d419cadae90fddbf8dc5b4a32d)) + ### [1.2.1](https://www.github.com/googleapis/java-shared-config/compare/v1.2.0...v1.2.1) (2021-11-08) diff --git a/README.md b/README.md index a5a200a5..9515f0aa 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ If you are using Maven, use this artifact as your project's parent. com.google.cloud google-cloud-shared-config - 1.2.1 + 1.2.2 ``` diff --git a/pom.xml b/pom.xml index df7ba351..80e195b5 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.2.2-SNAPSHOT + 1.2.2 Google Cloud https://github.com/googleapis/java-shared-config diff --git a/versions.txt b/versions.txt index 37ff238b..99b7d008 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.2.1:1.2.2-SNAPSHOT +google-cloud-shared-config:1.2.2:1.2.2