summaryrefslogtreecommitdiffstats
path: root/vespa-maven-plugin
diff options
context:
space:
mode:
authorJon Marius Venstad <jvenstad@yahoo-inc.com>2019-05-07 13:14:39 +0200
committerJon Marius Venstad <jvenstad@yahoo-inc.com>2019-05-07 13:14:39 +0200
commit2f563a74e8bcf63bbdaa71793cd55693ab0ec785 (patch)
tree5c5a6c6f90ef5a2b7cfceb2da7b8e109b11cbc4f /vespa-maven-plugin
parentcdc7f4c72c367fb368a26058aa39b678714b2b4e (diff)
Add projectId as an optional argument to SubmitMojo
Diffstat (limited to 'vespa-maven-plugin')
-rw-r--r--vespa-maven-plugin/src/main/java/ai/vespa/hosted/plugin/SubmitMojo.java13
1 files changed, 6 insertions, 7 deletions
diff --git a/vespa-maven-plugin/src/main/java/ai/vespa/hosted/plugin/SubmitMojo.java b/vespa-maven-plugin/src/main/java/ai/vespa/hosted/plugin/SubmitMojo.java
index 9bebe3c32cd..eda9ea9b799 100644
--- a/vespa-maven-plugin/src/main/java/ai/vespa/hosted/plugin/SubmitMojo.java
+++ b/vespa-maven-plugin/src/main/java/ai/vespa/hosted/plugin/SubmitMojo.java
@@ -1,17 +1,12 @@
// Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package ai.vespa.hosted.plugin;
-import ai.vespa.hosted.api.ControllerHttpClient;
import ai.vespa.hosted.api.Submission;
-import com.yahoo.config.provision.ApplicationId;
-import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
-import org.apache.maven.project.MavenProject;
-import java.net.URI;
-import java.nio.file.Path;
import java.nio.file.Paths;
+import java.util.OptionalLong;
/**
* Submits a Vespa application package and corresponding test jars to the hosted Vespa API.
@@ -39,13 +34,17 @@ public class SubmitMojo extends AbstractVespaMojo {
@Parameter(property = "commit", defaultValue = "unknown")
private String commit;
+ @Parameter(property = "projectId")
+ private Long projectId;
+
@Override
public void doExecute() {
applicationZip = firstNonBlank(applicationZip, projectPathOf("target", "application.zip"));
applicationTestZip = firstNonBlank(applicationTestZip, projectPathOf("target", "application-test.zip"));
Submission submission = new Submission(repository, branch, commit, authorEmail,
Paths.get(applicationZip),
- Paths.get(applicationTestZip));
+ Paths.get(applicationTestZip),
+ projectId == null ? OptionalLong.empty() : OptionalLong.of(projectId));
System.out.println(controller.submit(submission, id.tenant(), id.application()));
}