diff options
| author | Øyvind Grønnesby <oyving@verizonmedia.com> | 2019-10-08 13:00:36 +0200 |
|---|---|---|
| committer | Øyvind Grønnesby <oyving@verizonmedia.com> | 2019-10-08 13:00:36 +0200 |
| commit | 948500c2a4d52aef59ec18706ae4b8d793afb060 (patch) | |
| tree | ce305f94dbf4f90423255adc3b02fd441bcf211b /vespa-maven-plugin | |
| parent | 0d9892df0aa99e13ff83bfdeb3de8f1e8305bdcd (diff) | |
| parent | 64d8a699b668a5ed1dae0b86bd88bd3a2b40e48c (diff) | |
Merge remote-tracking branch 'origin/master' into ogronnesby/let-plugin-get-key-as-parameter
Conflicts:
hosted-api/src/main/java/ai/vespa/hosted/api/Properties.java
Diffstat (limited to 'vespa-maven-plugin')
| -rw-r--r-- | vespa-maven-plugin/src/main/java/ai/vespa/hosted/plugin/AbstractVespaMojo.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vespa-maven-plugin/src/main/java/ai/vespa/hosted/plugin/AbstractVespaMojo.java b/vespa-maven-plugin/src/main/java/ai/vespa/hosted/plugin/AbstractVespaMojo.java index 9bd995ef106..845d0ba4c1b 100644 --- a/vespa-maven-plugin/src/main/java/ai/vespa/hosted/plugin/AbstractVespaMojo.java +++ b/vespa-maven-plugin/src/main/java/ai/vespa/hosted/plugin/AbstractVespaMojo.java @@ -1,6 +1,7 @@ package ai.vespa.hosted.plugin; import ai.vespa.hosted.api.ControllerHttpClient; +import ai.vespa.hosted.api.Properties; import com.yahoo.config.provision.ApplicationId; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; @@ -69,7 +70,7 @@ public abstract class AbstractVespaMojo extends AbstractMojo { protected void setup() { tenant = firstNonBlank(tenant, project.getProperties().getProperty("tenant")); application = firstNonBlank(application, project.getProperties().getProperty("application")); - instance = firstNonBlank(instance, project.getProperties().getProperty("instance", "default")); + instance = firstNonBlank(instance, project.getProperties().getProperty("instance", Properties.user())); id = ApplicationId.from(tenant, application, instance); if (privateKey != null) { |