chore: update common templates, regenerate tests

yoshi-automation · chingor13 · commit 86ed93280550 · 2019-11-19T15:03:49.000-06:00
diff --git a/./release-please.yml b/./release-please.yml
@@ -1 +1,2 @@
 releaseType: java-yoshi
+bumpMinorPreMajor: true
diff --git 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
+esac
diff --git 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-tasks/src/test/java/com/google/cloud/tasks/v2/CloudTasksClientTest.java b/google-cloud-tasks/src/test/java/com/google/cloud/tasks/v2/CloudTasksClientTest.java
@@ -42,6 +42,7 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
+import java.util.UUID;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Assert;
@@ -60,7 +61,8 @@ public class CloudTasksClientTest {
   public static void startStaticServer() {
     mockCloudTasks = new MockCloudTasks();
     serviceHelper =
-        new MockServiceHelper("in-process-1", Arrays.<MockGrpcService>asList(mockCloudTasks));
+        new MockServiceHelper(
+            UUID.randomUUID().toString(), Arrays.<MockGrpcService>asList(mockCloudTasks));
     serviceHelper.start();
   }
 
diff --git a/google-cloud-tasks/src/test/java/com/google/cloud/tasks/v2beta2/CloudTasksClientTest.java b/google-cloud-tasks/src/test/java/com/google/cloud/tasks/v2beta2/CloudTasksClientTest.java
@@ -44,6 +44,7 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
+import java.util.UUID;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Assert;
@@ -62,7 +63,8 @@ public class CloudTasksClientTest {
   public static void startStaticServer() {
     mockCloudTasks = new MockCloudTasks();
     serviceHelper =
-        new MockServiceHelper("in-process-1", Arrays.<MockGrpcService>asList(mockCloudTasks));
+        new MockServiceHelper(
+            UUID.randomUUID().toString(), Arrays.<MockGrpcService>asList(mockCloudTasks));
     serviceHelper.start();
   }
 
diff --git a/google-cloud-tasks/src/test/java/com/google/cloud/tasks/v2beta3/CloudTasksClientTest.java b/google-cloud-tasks/src/test/java/com/google/cloud/tasks/v2beta3/CloudTasksClientTest.java
@@ -42,6 +42,7 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
+import java.util.UUID;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Assert;
@@ -60,7 +61,8 @@ public class CloudTasksClientTest {
   public static void startStaticServer() {
     mockCloudTasks = new MockCloudTasks();
     serviceHelper =
-        new MockServiceHelper("in-process-1", Arrays.<MockGrpcService>asList(mockCloudTasks));
+        new MockServiceHelper(
+            UUID.randomUUID().toString(), Arrays.<MockGrpcService>asList(mockCloudTasks));
     serviceHelper.start();
   }
 
diff --git a/synth.metadata b/synth.metadata
@@ -1,19 +1,19 @@
 {
-  "updateTime": "2019-11-14T09:00:08.361489Z",
+  "updateTime": "2019-11-19T20:00:52.199202Z",
   "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://.com/googleapis/googleapis.git",
-        "sha": "bc76ffd87360ce1cd34e3a6eac28afd5e1efda76",
-        "internalRef": "280356106"
+        "sha": "5af83f47b9656261cafcf88b0b3334521ab266b3",
+        "internalRef": "281334391"
       }
     },
     {

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`	`1`	`releaseType: java-yoshi`
	`2`	`+bumpMinorPreMajor: true`
Original file line number	Diff line number	Diff line change
`@@ -1,19 +1,19 @@`
`1`	`1`	`{`
`2`		`-"updateTime": "2019-11-14T09:00:08.361489Z",`
	`2`	`+"updateTime": "2019-11-19T20:00:52.199202Z",`
`3`	`3`	`"sources": [`
`4`	`4`	`{`
`5`	`5`	`"generator": {`
`6`	`6`	`"name": "artman",`
`7`		`-"version": "0.41.1",`
`8`		`-"dockerImage": "googleapis/artman@sha256:545c758c76c3f779037aa259023ec3d1ef2d57d2c8cd00a222cb187d63ceac5e"`
	`7`	`+"version": "0.42.1",`
	`8`	`+"dockerImage": "googleapis/artman@sha256:c773192618c608a7a0415dd95282f841f8e6bcdef7dd760a988c93b77a64bd57"`
`9`	`9`	`}`
`10`	`10`	`},`
`11`	`11`	`{`
`12`	`12`	`"git": {`
`13`	`13`	`"name": "googleapis",`
`14`	`14`	`"remote": "https://.com/googleapis/googleapis.git",`
`15`		`-"sha": "bc76ffd87360ce1cd34e3a6eac28afd5e1efda76",`
`16`		`-"internalRef": "280356106"`
	`15`	`+"sha": "5af83f47b9656261cafcf88b0b3334521ab266b3",`
	`16`	`+"internalRef": "281334391"`
`17`	`17`	`}`
`18`	`18`	`},`
`19`	`19`	`{`