diff options
author | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2019-05-13 10:23:09 +0200 |
---|---|---|
committer | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2019-05-13 10:23:09 +0200 |
commit | edefa944eec9dba068dfa32f20fbffe9b2b53f25 (patch) | |
tree | 22745a613be72ee72f80759d8393db4e3431d868 /vespa-maven-plugin | |
parent | 8c59c78859f5e84cdd4ca93d4f841c2a87f851e3 (diff) |
Name field the same as the property, so it can be set using the same name in configuration section and on command line
Diffstat (limited to 'vespa-maven-plugin')
-rw-r--r-- | vespa-maven-plugin/src/main/java/ai/vespa/hosted/plugin/AbstractVespaMojo.java | 6 | ||||
-rw-r--r-- | vespa-maven-plugin/src/main/java/ai/vespa/hosted/plugin/DeployMojo.java | 2 |
2 files changed, 4 insertions, 4 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 b5822ff825e..fd3409dcfcb 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 @@ -21,7 +21,7 @@ public abstract class AbstractVespaMojo extends AbstractMojo { protected MavenProject project; @Parameter(property = "endpoint", defaultValue = "https://api.vespa.corp.yahoo.com:4443") // TODO jvenstad: Change default - protected String endpointUri; + protected String endpoint; @Parameter(property = "tenant") protected String tenant; @@ -58,8 +58,8 @@ public abstract class AbstractVespaMojo extends AbstractMojo { id = ApplicationId.from(tenant, application, instance); controller = certificateFile == null - ? ControllerHttpClient.withSignatureKey(URI.create(endpointUri), Paths.get(privateKeyFile), id) - : ControllerHttpClient.withKeyAndCertificate(URI.create(endpointUri), Paths.get(privateKeyFile), Paths.get(certificateFile)); + ? ControllerHttpClient.withSignatureKey(URI.create(endpoint), Paths.get(privateKeyFile), id) + : ControllerHttpClient.withKeyAndCertificate(URI.create(endpoint), Paths.get(privateKeyFile), Paths.get(certificateFile)); } protected String projectPathOf(String first, String... rest) { diff --git a/vespa-maven-plugin/src/main/java/ai/vespa/hosted/plugin/DeployMojo.java b/vespa-maven-plugin/src/main/java/ai/vespa/hosted/plugin/DeployMojo.java index 15142a6c793..7258bd587f2 100644 --- a/vespa-maven-plugin/src/main/java/ai/vespa/hosted/plugin/DeployMojo.java +++ b/vespa-maven-plugin/src/main/java/ai/vespa/hosted/plugin/DeployMojo.java @@ -48,7 +48,7 @@ public class DeployMojo extends AbstractVespaMojo { Deployment deployment = build == null ? Deployment.ofPackage(Paths.get(firstNonBlank(applicationZip, projectPathOf("target", "application.zip")))) : Deployment.ofReference(repository, branch, commit, build); - if ("true".equalsIgnoreCase(ignoreValidationErrors)) deployment = deployment.ignoringValidationErrors(); + if ("true".equalsIgnoreCase(ignoreValidationErrors)) deployment = deployment.ignoringValidationErrors(); // TODO unused, GC or fix. if (vespaVersion != null) deployment = deployment.atVersion(vespaVersion); ZoneId zone = environment == null || region == null ? controller.devZone() : ZoneId.from(environment, region); |