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 a1da865a..932cfb34 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/.kokoro/release/publish_javadoc.sh b/.kokoro/release/publish_javadoc.sh index 109712d9..6dfc7219 100755 --- a/.kokoro/release/publish_javadoc.sh +++ b/.kokoro/release/publish_javadoc.sh @@ -33,7 +33,7 @@ python3 -m pip install gcp-docuploader # compile all packages mvn clean install -B -DskipTests=true -NAME=websecurityscanner +NAME=google-cloud-websecurityscanner VERSION=$(grep ${NAME}: versions.txt | cut -d: -f3) # build the docs diff --git a/google-cloud-websecurityscanner/src/test/java/com/google/cloud/websecurityscanner/v1alpha/WebSecurityScannerClientTest.java b/google-cloud-websecurityscanner/src/test/java/com/google/cloud/websecurityscanner/v1alpha/WebSecurityScannerClientTest.java index 2f29ff60..261ffe95 100644 --- a/google-cloud-websecurityscanner/src/test/java/com/google/cloud/websecurityscanner/v1alpha/WebSecurityScannerClientTest.java +++ b/google-cloud-websecurityscanner/src/test/java/com/google/cloud/websecurityscanner/v1alpha/WebSecurityScannerClientTest.java @@ -36,6 +36,7 @@ import java.io.IOException; import java.util.Arrays; import java.util.List; +import java.util.UUID; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; @@ -55,7 +56,7 @@ public static void startStaticServer() { mockWebSecurityScanner = new MockWebSecurityScanner(); serviceHelper = new MockServiceHelper( - "in-process-1", Arrays.asList(mockWebSecurityScanner)); + UUID.randomUUID().toString(), Arrays.asList(mockWebSecurityScanner)); serviceHelper.start(); } diff --git a/google-cloud-websecurityscanner/src/test/java/com/google/cloud/websecurityscanner/v1beta/WebSecurityScannerClientTest.java b/google-cloud-websecurityscanner/src/test/java/com/google/cloud/websecurityscanner/v1beta/WebSecurityScannerClientTest.java index 5674cd83..cf3b5f49 100644 --- a/google-cloud-websecurityscanner/src/test/java/com/google/cloud/websecurityscanner/v1beta/WebSecurityScannerClientTest.java +++ b/google-cloud-websecurityscanner/src/test/java/com/google/cloud/websecurityscanner/v1beta/WebSecurityScannerClientTest.java @@ -36,6 +36,7 @@ import java.io.IOException; import java.util.Arrays; import java.util.List; +import java.util.UUID; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; @@ -55,7 +56,7 @@ public static void startStaticServer() { mockWebSecurityScanner = new MockWebSecurityScanner(); serviceHelper = new MockServiceHelper( - "in-process-1", Arrays.asList(mockWebSecurityScanner)); + UUID.randomUUID().toString(), Arrays.asList(mockWebSecurityScanner)); serviceHelper.start(); } diff --git a/synth.metadata b/synth.metadata index 4fc9ca5d..ab4d2a45 100644 --- a/synth.metadata +++ b/synth.metadata @@ -1,19 +1,19 @@ { - "updateTime": "2019-10-26T08:01:27.313844Z", + "updateTime": "2019-11-19T20:08:35.524953Z", "sources": [ { "generator": { "name": "artman", - "version": "0.40.3", - "dockerImage": "googleapis/artman@sha256:c805f50525f5f557886c94ab76f56eaa09cb1da58c3ee95111fd34259376621a" + "version": "0.42.1", + "dockerImage": "googleapis/artman@sha256:c773192618c608a7a0415dd95282f841f8e6bcdef7dd760a988c93b77a64bd57" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "d27a44798506d28e8e6d874bd128da43f45f74c4", - "internalRef": "276716410" + "sha": "5af83f47b9656261cafcf88b0b3334521ab266b3", + "internalRef": "281334391" } }, {