From d00b7e7ae9ba4b394a81aa97e144acd25fd412ac Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Mon, 26 Nov 2018 12:39:57 -0800 Subject: [PATCH 1/3] Add gcloud.download.skip option for google-cloud-gcloud-maven-plugin --- .../main/java/com/google/cloud/DownloadComponentsMojo.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/google-cloud-testing/google-cloud-gcloud-maven-plugin/src/main/java/com/google/cloud/DownloadComponentsMojo.java b/google-cloud-testing/google-cloud-gcloud-maven-plugin/src/main/java/com/google/cloud/DownloadComponentsMojo.java index 491aaf284efb..75911994c54d 100644 --- a/google-cloud-testing/google-cloud-gcloud-maven-plugin/src/main/java/com/google/cloud/DownloadComponentsMojo.java +++ b/google-cloud-testing/google-cloud-gcloud-maven-plugin/src/main/java/com/google/cloud/DownloadComponentsMojo.java @@ -77,10 +77,17 @@ public class DownloadComponentsMojo extends AbstractMojo { @Parameter(defaultValue = "false", required = true, property = "gcloud.download.force") private boolean forceRefresh; + @Parameter(defaultValue = "false", required = true, property = "gcloud.download.skip") + private boolean skip; + @Parameter(defaultValue = "${session}", readonly = true) private MavenSession session; public void execute() throws MojoExecutionException { + if (skip) { + return; + } + if (session.isOffline() && forceRefresh) { throw new MojoExecutionException("Can't force refresh when offline"); } From 3dda3b4953945ea1b40484557530283fab56b8fd Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Mon, 26 Nov 2018 12:40:22 -0800 Subject: [PATCH 2/3] Skip emulator download when doing the initial install --- .kokoro/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 13e4bf27e214..313dcccfcfb3 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -21,7 +21,7 @@ cd github/google-cloud-java/ java -version echo $JOB_TYPE -mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V +mvn install -DskipTests=true -Dmaven.javadoc.skip=true -Dgcloud.download.skip=true -B -V # prepend Kokoro root directory onto GOOGLE_APPLICATION_CREDENTIALS path if [ ! -z "$GOOGLE_APPLICATION_CREDENTIALS" ]; then From 65332292cdd2c576e661a7622245660a84c06c4f Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Mon, 26 Nov 2018 13:30:49 -0800 Subject: [PATCH 3/3] Rename `skip` to `shouldSkipDownload` --- .../main/java/com/google/cloud/DownloadComponentsMojo.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/google-cloud-testing/google-cloud-gcloud-maven-plugin/src/main/java/com/google/cloud/DownloadComponentsMojo.java b/google-cloud-testing/google-cloud-gcloud-maven-plugin/src/main/java/com/google/cloud/DownloadComponentsMojo.java index 75911994c54d..3baa1e4f7a8d 100644 --- a/google-cloud-testing/google-cloud-gcloud-maven-plugin/src/main/java/com/google/cloud/DownloadComponentsMojo.java +++ b/google-cloud-testing/google-cloud-gcloud-maven-plugin/src/main/java/com/google/cloud/DownloadComponentsMojo.java @@ -78,13 +78,13 @@ public class DownloadComponentsMojo extends AbstractMojo { private boolean forceRefresh; @Parameter(defaultValue = "false", required = true, property = "gcloud.download.skip") - private boolean skip; + private boolean shouldSkipDownload; @Parameter(defaultValue = "${session}", readonly = true) private MavenSession session; public void execute() throws MojoExecutionException { - if (skip) { + if (shouldSkipDownload) { return; }