aboutsummaryrefslogtreecommitdiffstats
path: root/vespa-maven-plugin
diff options
context:
space:
mode:
authorJon Marius Venstad <jvenstad@yahoo-inc.com>2019-05-06 16:40:48 +0200
committerJon Marius Venstad <jvenstad@yahoo-inc.com>2019-05-06 16:40:48 +0200
commita6bfd3c44e86cc78482d97c5fe3d3697b393f07b (patch)
tree15106faad283d0ccfaf76411c3e1e09c57bafddf /vespa-maven-plugin
parent726ba08018dad3254e8fcdbaa8fd5fa58e4bb30e (diff)
Remove traces of Athenz
Diffstat (limited to 'vespa-maven-plugin')
-rw-r--r--vespa-maven-plugin/src/main/java/ai/vespa/hosted/plugin/SubmitMojo.java7
1 files changed, 1 insertions, 6 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 b0bb22fad99..6f39c29963c 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
@@ -9,15 +9,10 @@ import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
-import java.io.IOException;
-import java.io.UncheckedIOException;
import java.net.URI;
-import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
-import static java.nio.charset.StandardCharsets.UTF_8;
-
/**
* Submits a Vespa application package and corresponding test jars to the hosted Vespa API.
*
@@ -71,7 +66,7 @@ public class SubmitMojo extends AbstractMojo {
ApplicationId id = ApplicationId.from(tenant, application, instance);
ControllerHttpClient controller = certificateFile == null
? ControllerHttpClient.withSignatureKey(URI.create(endpointUri), Paths.get(privateKeyFile), id)
- : ControllerHttpClient.withAthenzIdentity(URI.create(endpointUri), Paths.get(privateKeyFile), Paths.get(certificateFile));
+ : ControllerHttpClient.withKeyAndCertificate(URI.create(endpointUri), Paths.get(privateKeyFile), Paths.get(certificateFile));
Submission submission = new Submission(repository, branch, commit, authorEmail,
Paths.get(applicationZip), Paths.get(applicationTestZip));