From 6a2ce1f0f16233198a5f8c09672dcf6808f6a15f Mon Sep 17 00:00:00 2001 From: t-karasova Date: Fri, 4 Feb 2022 11:43:02 +0100 Subject: [PATCH] Job_type added to build.sh MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit feat: Code samples for Retail Tutorials. Search service samples Revert "feat: Code samples for Retail Tutorials. Search service samples" This reverts commit 153c92d2 build(deps): update dependency com.google.cloud:google-cloud-shared-config to v1.2.4 (#257) [![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:google-cloud-shared-config](https://togithub.com/googleapis/java-shared-config) | `1.2.2` -> `1.2.4` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.2.4/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.2.4/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.2.4/compatibility-slim/1.2.2)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.2.4/confidence-slim/1.2.2)](https://docs.renovatebot.com/merge-confidence/) | ---
googleapis/java-shared-config [Compare Source](https://togithub.com/googleapis/java-shared-config/compare/v1.2.3...v1.2.4) [Compare Source](https://togithub.com/googleapis/java-shared-config/compare/v1.2.2...v1.2.3)
--- 📅 **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-retail). deps: update dependency com.google.cloud:google-cloud-shared-dependencies to v2.6.0 (#258) [![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:google-cloud-shared-dependencies](https://togithub.com/googleapis/java-shared-dependencies) | `2.5.1` -> `2.6.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.6.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.6.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.6.0/compatibility-slim/2.5.1)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.6.0/confidence-slim/2.5.1)](https://docs.renovatebot.com/merge-confidence/) | ---
googleapis/java-shared-dependencies [Compare Source](https://togithub.com/googleapis/java-shared-dependencies/compare/v2.5.1...v2.6.0) - **java:** add -ntp flag to native image testing command ([#​1299](https://www.togithub.com/googleapis/java-shared-dependencies/issues/1299)) ([#​546](https://www.togithub.com/googleapis/java-shared-dependencies/issues/546)) ([d8bb8d9](https://www.github.com/googleapis/java-shared-dependencies/commit/d8bb8d9d8e3b8c582f768cd3164e8580ec334511)) - **java:** run Maven in plain console-friendly mode ([#​1301](https://www.togithub.com/googleapis/java-shared-dependencies/issues/1301)) ([#​557](https://www.togithub.com/googleapis/java-shared-dependencies/issues/557)) ([6b57d08](https://www.github.com/googleapis/java-shared-dependencies/commit/6b57d08816ec6c1dfb637cae022624e896930ad8)) - gRPC upgrade to 1.43.2 ([#​567](https://www.togithub.com/googleapis/java-shared-dependencies/issues/567)) ([c946655](https://www.github.com/googleapis/java-shared-dependencies/commit/c94665571f26d24fbbb3f89ef5a3db99663bfdba)) - update dependency com.google.api-client:google-api-client-bom to v1.33.0 ([#​563](https://www.togithub.com/googleapis/java-shared-dependencies/issues/563)) ([0aedddb](https://www.github.com/googleapis/java-shared-dependencies/commit/0aedddb9a535753767d56f5910f355c7a1c8509c)) - update dependency com.google.api:api-common to v2.1.2 ([2f154a3](https://www.github.com/googleapis/java-shared-dependencies/commit/2f154a3ff759211438c72859e98b314c7ff8405f)) - update dependency com.google.http-client:google-http-client-bom to v1.41.0 ([#​562](https://www.togithub.com/googleapis/java-shared-dependencies/issues/562)) ([6da0735](https://www.github.com/googleapis/java-shared-dependencies/commit/6da0735d4db9df998d11c549488a024b800bed65)) - update dependency io.grpc:grpc-bom to v1.43.1 ([#​553](https://www.togithub.com/googleapis/java-shared-dependencies/issues/553)) ([b787c8f](https://www.github.com/googleapis/java-shared-dependencies/commit/b787c8f2032b7ffc9797158c3ff214b7813f34b7)) - update dependency org.apache.httpcomponents:httpcore to v4.4.15 ([#​550](https://www.togithub.com/googleapis/java-shared-dependencies/issues/550)) ([e2d3dba](https://www.github.com/googleapis/java-shared-dependencies/commit/e2d3dbad6dd54c117abb5ab1b6137cfee4e5a32b)) - update dependency org.checkerframework:checker-qual to v3.20.0 ([#​549](https://www.togithub.com/googleapis/java-shared-dependencies/issues/549)) ([586df59](https://www.github.com/googleapis/java-shared-dependencies/commit/586df5949d4ddca11d0705d696882c32d8436c31)) - update gax.version to v2.8.0 ([#​564](https://www.togithub.com/googleapis/java-shared-dependencies/issues/564)) ([9ad5d4f](https://www.github.com/googleapis/java-shared-dependencies/commit/9ad5d4f5385753a0c5739ef400f5d346e3342b84)) - update gax.version to v2.8.1 ([2f154a3](https://www.github.com/googleapis/java-shared-dependencies/commit/2f154a3ff759211438c72859e98b314c7ff8405f)) - update google.common-protos.version to v2.7.1 ([#​561](https://www.togithub.com/googleapis/java-shared-dependencies/issues/561)) ([9aa860d](https://www.github.com/googleapis/java-shared-dependencies/commit/9aa860d92f745f1d4382eb16439bf17ac6ca8ae9)) - update google.core.version to v2.3.5 ([#​565](https://www.togithub.com/googleapis/java-shared-dependencies/issues/565)) ([2f154a3](https://www.github.com/googleapis/java-shared-dependencies/commit/2f154a3ff759211438c72859e98b314c7ff8405f)) - update iam.version to v1.2.0 ([#​547](https://www.togithub.com/googleapis/java-shared-dependencies/issues/547)) ([3232c82](https://www.github.com/googleapis/java-shared-dependencies/commit/3232c828b628cb604a200b3e569e56e758e5e11d)) - upgrading protobuf to 3.19.2 ([#​560](https://www.togithub.com/googleapis/java-shared-dependencies/issues/560)) ([7ef3325](https://www.github.com/googleapis/java-shared-dependencies/commit/7ef33250f5473348d3546210b7a534360f476101)) - update dependency com.google.api:api-common to v2.1.1 ([#​533](https://www.togithub.com/googleapis/java-shared-dependencies/issues/533)) ([4e23adb](https://www.github.com/googleapis/java-shared-dependencies/commit/4e23adb666dfaa18ae8bf869aca030153de16d62)) - update gax.version to v2.7.1 ([#​544](https://www.togithub.com/googleapis/java-shared-dependencies/issues/544)) ([5a0c480](https://www.github.com/googleapis/java-shared-dependencies/commit/5a0c480671fa834e600edc6ac6fe77967d1b79b3)) - update google.common-protos.version to v2.7.0 ([#​542](https://www.togithub.com/googleapis/java-shared-dependencies/issues/542)) ([af97eb5](https://www.github.com/googleapis/java-shared-dependencies/commit/af97eb5d9cff397080fdb3d4a6dbf7c2692e0358)) - update google.core.version to v2.3.3 ([#​534](https://www.togithub.com/googleapis/java-shared-dependencies/issues/534)) ([885acef](https://www.github.com/googleapis/java-shared-dependencies/commit/885acefe4ff5313eb53dc43b4825ca597b97dcfd))
--- 📅 **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-retail). chore: release 2.0.7 (#253) :robot: I have created a release \*beep\* \*boop\* --- * **java:** add -ntp flag to native image testing command ([#1299](https://www.github.com/googleapis/java-retail/issues/1299)) ([#250](https://www.github.com/googleapis/java-retail/issues/250)) ([dd942ab](https://www.github.com/googleapis/java-retail/commit/dd942ab9d8efd582f5c83c259c5ca6e0225c88a5)) * update dependency com.google.cloud:google-cloud-shared-dependencies to v2.6.0 ([#258](https://www.github.com/googleapis/java-retail/issues/258)) ([81f1a09](https://www.github.com/googleapis/java-retail/commit/81f1a0936e779e67d39aa4d68f19b99bea90a819)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). chore: release 2.0.8-SNAPSHOT (#260) :robot: I have created a release \*beep\* \*boop\* --- --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). chore(owlbot-java): disable re-writing clirr file in owlbot java post-processor (#1320) (#262) chore: change name to api_shortname in .repo-metadata.json (#263) chore(java): update variable name to api_shortname in README template (#1323) (#264) --- .github/.OwlBot.lock.yaml | 2 +- .github/ISSUE_TEMPLATE/bug_report.md | 2 +- .kokoro/build.sh | 34 ++++++++++++++++++++++++---- .repo-metadata.json | 2 +- CHANGELOG.md | 12 ++++++++++ google-cloud-retail-bom/pom.xml | 10 ++++---- google-cloud-retail/pom.xml | 4 ++-- grpc-google-cloud-retail-v2/pom.xml | 4 ++-- pom.xml | 3 +-- proto-google-cloud-retail-v2/pom.xml | 4 ++-- samples/snapshot/pom.xml | 6 ++--- samples/snippets/pom.xml | 8 +++---- versions.txt | 6 ++--- 13 files changed, 66 insertions(+), 31 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 3d2f8282..dddb13b8 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:a4d7b2cfc6a9d6b378a6b2458740eae15fcab28854bd23dad3a15102d2e47c87 + digest: sha256:7f737996c88586c499f7b0c25294c760f9f5eec092289a0e08d2d3f42a069ebb diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index df5ef408..cdbebcbb 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -21,7 +21,7 @@ If you are still having issues, please include as much information as possible: General, Core, and Other are also allowed as types 2. OS type and version: 3. Java version: -4. retail version(s): +4. version(s): #### Steps to reproduce diff --git a/.kokoro/build.sh b/.kokoro/build.sh index e8f4fb89..208842d2 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -47,15 +47,15 @@ set +e case ${JOB_TYPE} in test) - mvn test -B -Dclirr.skip=true -Denforcer.skip=true + mvn test -B -ntp -Dclirr.skip=true -Denforcer.skip=true RETURN_CODE=$? ;; lint) - mvn com.coveo:fmt-maven-plugin:check + mvn com.coveo:fmt-maven-plugin:check -B -ntp RETURN_CODE=$? ;; javadoc) - mvn javadoc:javadoc javadoc:test-javadoc + mvn javadoc:javadoc javadoc:test-javadoc -B -ntp RETURN_CODE=$? ;; integration) @@ -71,7 +71,7 @@ integration) ;; graalvm) # Run Unit and Integration Tests with Native Image - mvn -ntp -Pnative -Penable-integration-tests test + mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Penable-integration-tests test RETURN_CODE=$? ;; samples) @@ -103,8 +103,32 @@ samples) echo "no sample pom.xml found - skipping sample tests" fi ;; +tutorials-samples) + SAMPLES_DIR=samples/interactive-tutorials + + if [[ -f ${SAMPLES_DIR}/pom.xml ]] + then + for FILE in ${KOKORO_GFILE_DIR}/secret_manager/*-samples-secrets; do + [[ -f "$FILE" ]] || continue + source "$FILE" + done + + pushd ${SAMPLES_DIR} + mvn -B \ + -ntp \ + -DtrimStackTrace=false \ + -Dclirr.skip=true \ + -Denforcer.skip=true \ + -fae \ + verify + RETURN_CODE=$? + popd + else + echo "no interactive-tutorials pom.xml found - skipping interactive-tutorials tests" + fi + ;; clirr) - mvn -B -Denforcer.skip=true clirr:check + mvn -B -ntp -Denforcer.skip=true clirr:check RETURN_CODE=$? ;; *) diff --git a/.repo-metadata.json b/.repo-metadata.json index a3d9f9a6..568e00a0 100644 --- a/.repo-metadata.json +++ b/.repo-metadata.json @@ -1,5 +1,5 @@ { - "name": "retail", + "api_shortname": "retail", "name_pretty": "Cloud Retail", "product_documentation": "https://cloud.google.com/solutions/retail", "api_description": "Retail solutions API.", diff --git a/CHANGELOG.md b/CHANGELOG.md index 819d3784..c1d1d0f5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +### [2.0.7](https://www.github.com/googleapis/java-retail/compare/v2.0.6...v2.0.7) (2022-01-07) + + +### Bug Fixes + +* **java:** add -ntp flag to native image testing command ([#1299](https://www.github.com/googleapis/java-retail/issues/1299)) ([#250](https://www.github.com/googleapis/java-retail/issues/250)) ([dd942ab](https://www.github.com/googleapis/java-retail/commit/dd942ab9d8efd582f5c83c259c5ca6e0225c88a5)) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.6.0 ([#258](https://www.github.com/googleapis/java-retail/issues/258)) ([81f1a09](https://www.github.com/googleapis/java-retail/commit/81f1a0936e779e67d39aa4d68f19b99bea90a819)) + ### [2.0.6](https://www.github.com/googleapis/java-retail/compare/v2.0.5...v2.0.6) (2021-12-03) diff --git a/google-cloud-retail-bom/pom.xml b/google-cloud-retail-bom/pom.xml index d4415a05..e7651d86 100644 --- a/google-cloud-retail-bom/pom.xml +++ b/google-cloud-retail-bom/pom.xml @@ -3,12 +3,12 @@ 4.0.0 com.google.cloud google-cloud-retail-bom - 2.0.7-SNAPSHOT + 2.0.8-SNAPSHOT pom com.google.cloud google-cloud-shared-config - 1.2.2 + 1.2.4 Google Cloud Retail BOM @@ -57,17 +57,17 @@ com.google.cloud google-cloud-retail - 2.0.7-SNAPSHOT + 2.0.8-SNAPSHOT com.google.api.grpc grpc-google-cloud-retail-v2 - 2.0.7-SNAPSHOT + 2.0.8-SNAPSHOT com.google.api.grpc proto-google-cloud-retail-v2 - 2.0.7-SNAPSHOT + 2.0.8-SNAPSHOT diff --git a/google-cloud-retail/pom.xml b/google-cloud-retail/pom.xml index 3e3dabbd..fe61dbf0 100644 --- a/google-cloud-retail/pom.xml +++ b/google-cloud-retail/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-retail - 2.0.7-SNAPSHOT + 2.0.8-SNAPSHOT jar Google Cloud Retail https://github.com/googleapis/java-retail @@ -11,7 +11,7 @@ com.google.cloud google-cloud-retail-parent - 2.0.7-SNAPSHOT + 2.0.8-SNAPSHOT google-cloud-retail diff --git a/grpc-google-cloud-retail-v2/pom.xml b/grpc-google-cloud-retail-v2/pom.xml index 4f894504..b4b6f390 100644 --- a/grpc-google-cloud-retail-v2/pom.xml +++ b/grpc-google-cloud-retail-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-retail-v2 - 2.0.7-SNAPSHOT + 2.0.8-SNAPSHOT grpc-google-cloud-retail-v2 GRPC library for google-cloud-retail com.google.cloud google-cloud-retail-parent - 2.0.7-SNAPSHOT + 2.0.8-SNAPSHOT diff --git a/pom.xml b/pom.xml index aff17b3e..c6ad801b 100644 --- a/pom.xml +++ b/pom.xml @@ -106,7 +106,6 @@ grpc-google-cloud-retail-v2 proto-google-cloud-retail-v2 google-cloud-retail-bom - samples @@ -178,4 +177,4 @@ - \ No newline at end of file + diff --git a/proto-google-cloud-retail-v2/pom.xml b/proto-google-cloud-retail-v2/pom.xml index 08af24a7..5383c096 100644 --- a/proto-google-cloud-retail-v2/pom.xml +++ b/proto-google-cloud-retail-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-retail-v2 - 2.0.7-SNAPSHOT + 2.0.8-SNAPSHOT proto-google-cloud-retail-v2 Proto library for google-cloud-retail com.google.cloud google-cloud-retail-parent - 2.0.7-SNAPSHOT + 2.0.8-SNAPSHOT diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 4ffe57b8..7b4914f9 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -12,9 +12,9 @@ Removing or replacing it should not affect the execution of the samples in anyway. --> - com.google.cloud - google-cloud-retail-samples - 0.0.1-SNAPSHOT + com.google.cloud.samples + shared-configuration + 1.2.0 diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index e55b7276..acff7188 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -12,9 +12,9 @@ Removing or replacing it should not affect the execution of the samples in anyway. --> - com.google.cloud - google-cloud-retail-samples - 0.0.1-SNAPSHOT + com.google.cloud.samples + shared-configuration + 1.2.0 @@ -44,4 +44,4 @@ test - \ No newline at end of file + diff --git a/versions.txt b/versions.txt index 296d182e..3eba5f08 100644 --- a/versions.txt +++ b/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -google-cloud-retail:2.0.6:2.0.7-SNAPSHOT -grpc-google-cloud-retail-v2:2.0.6:2.0.7-SNAPSHOT -proto-google-cloud-retail-v2:2.0.6:2.0.7-SNAPSHOT +google-cloud-retail:2.0.7:2.0.8-SNAPSHOT +grpc-google-cloud-retail-v2:2.0.7:2.0.8-SNAPSHOT +proto-google-cloud-retail-v2:2.0.7:2.0.8-SNAPSHOT