From 45b2ae695847d97494280f3ed2a9be9889b48f1d Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Tue, 19 Nov 2019 12:38:34 -0800 Subject: [PATCH] chore: update common templates, regenerate tests (#34) --- .github/release-please.yml | 1 + .kokoro/build.sh | 14 ++++++++++---- .kokoro/dependencies.sh | 6 +++++- .../translate/v3/TranslationServiceClientTest.java | 3 ++- .../v3beta1/TranslationServiceClientTest.java | 3 ++- synth.metadata | 10 +++++----- 6 files changed, 25 insertions(+), 12 deletions(-) diff --git a/.github/release-please.yml b/.github/release-please.yml index 82744682..dce2c845 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -1 +1,2 @@ releaseType: java-yoshi +bumpMinorPreMajor: true \ No newline at end of file diff --git a/.kokoro/build.sh b/.kokoro/build.sh index fa132f41..dc2936ef 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -27,6 +27,7 @@ echo ${JOB_TYPE} mvn install -B -V \ -DskipTests=true \ -Dclirr.skip=true \ + -Denforcer.skip=true \ -Dmaven.javadoc.skip=true \ -Dgcloud.download.skip=true \ -T 1C @@ -38,7 +39,7 @@ fi case ${JOB_TYPE} in test) - mvn test -B -Dclirr.skip=true + mvn test -B -Dclirr.skip=true -Denforcer.skip=true bash ${KOKORO_GFILE_DIR}/codecov.sh bash .kokoro/coerce_logs.sh ;; @@ -49,12 +50,17 @@ javadoc) mvn javadoc:javadoc javadoc:test-javadoc ;; integration) - mvn -B ${INTEGRATION_TEST_ARGS} -DtrimStackTrace=false -Dclirr.skip=true -fae verify + mvn -B ${INTEGRATION_TEST_ARGS} \ + -DtrimStackTrace=false \ + -Dclirr.skip=true \ + -Denforcer.skip=true \ + -fae \ + verify bash .kokoro/coerce_logs.sh ;; clirr) - mvn -B clirr:check + mvn -B -Denforcer.skip=true clirr:check ;; *) ;; -esac \ No newline at end of file +esac diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh index ac0740cd..0e96dace 100755 --- a/.kokoro/dependencies.sh +++ b/.kokoro/dependencies.sh @@ -23,5 +23,9 @@ echo $JOB_TYPE export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m" -mvn install -DskipTests=true -B -V +# this should run maven enforcer +mvn install -B -V \ + -DskipTests=true \ + -Dclirr.skip=true + mvn -B dependency:analyze -DfailOnWarning=true diff --git a/google-cloud-translate/src/test/java/com/google/cloud/translate/v3/TranslationServiceClientTest.java b/google-cloud-translate/src/test/java/com/google/cloud/translate/v3/TranslationServiceClientTest.java index c6fe7eac..42f87a35 100644 --- a/google-cloud-translate/src/test/java/com/google/cloud/translate/v3/TranslationServiceClientTest.java +++ b/google-cloud-translate/src/test/java/com/google/cloud/translate/v3/TranslationServiceClientTest.java @@ -35,6 +35,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.util.UUID; import java.util.concurrent.ExecutionException; import org.junit.After; import org.junit.AfterClass; @@ -55,7 +56,7 @@ public static void startStaticServer() { mockTranslationService = new MockTranslationService(); serviceHelper = new MockServiceHelper( - "in-process-1", Arrays.asList(mockTranslationService)); + UUID.randomUUID().toString(), Arrays.asList(mockTranslationService)); serviceHelper.start(); } diff --git a/google-cloud-translate/src/test/java/com/google/cloud/translate/v3beta1/TranslationServiceClientTest.java b/google-cloud-translate/src/test/java/com/google/cloud/translate/v3beta1/TranslationServiceClientTest.java index d0c97eeb..77c7b495 100644 --- a/google-cloud-translate/src/test/java/com/google/cloud/translate/v3beta1/TranslationServiceClientTest.java +++ b/google-cloud-translate/src/test/java/com/google/cloud/translate/v3beta1/TranslationServiceClientTest.java @@ -34,6 +34,7 @@ import java.io.IOException; import java.util.Arrays; import java.util.List; +import java.util.UUID; import java.util.concurrent.ExecutionException; import org.junit.After; import org.junit.AfterClass; @@ -54,7 +55,7 @@ public static void startStaticServer() { mockTranslationService = new MockTranslationService(); serviceHelper = new MockServiceHelper( - "in-process-1", Arrays.asList(mockTranslationService)); + UUID.randomUUID().toString(), Arrays.asList(mockTranslationService)); serviceHelper.start(); } diff --git a/synth.metadata b/synth.metadata index 4ee8195b..2cb60da5 100644 --- a/synth.metadata +++ b/synth.metadata @@ -1,19 +1,19 @@ { - "updateTime": "2019-11-14T09:02:15.755502Z", + "updateTime": "2019-11-19T20:02:52.228739Z", "sources": [ { "generator": { "name": "artman", - "version": "0.41.1", - "dockerImage": "googleapis/artman@sha256:545c758c76c3f779037aa259023ec3d1ef2d57d2c8cd00a222cb187d63ceac5e" + "version": "0.42.1", + "dockerImage": "googleapis/artman@sha256:c773192618c608a7a0415dd95282f841f8e6bcdef7dd760a988c93b77a64bd57" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "bc76ffd87360ce1cd34e3a6eac28afd5e1efda76", - "internalRef": "280356106" + "sha": "5af83f47b9656261cafcf88b0b3334521ab266b3", + "internalRef": "281334391" } }, {