aboutsummaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2019-02-26 13:10:39 +0100
committerMartin Polden <mpolden@mpolden.no>2019-02-26 13:10:39 +0100
commite2ca225e6cce41aef51eeb7b1a966ad9351d0442 (patch)
treeeaf80ef1ccca186d762dffcd4f4337248f0c913a /controller-server
parentac8a79bb04a3ed6fb10ea0e39d15c88cc42d22b4 (diff)
Remove unnecessary commons-codec dependency
Diffstat (limited to 'controller-server')
-rw-r--r--controller-server/pom.xml6
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/ApplicationPackage.java4
2 files changed, 2 insertions, 8 deletions
diff --git a/controller-server/pom.xml b/controller-server/pom.xml
index 23d2bfc33d4..034f96b9445 100644
--- a/controller-server/pom.xml
+++ b/controller-server/pom.xml
@@ -124,12 +124,6 @@
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.6</version>
- </dependency>
-
<!-- test -->
<dependency>
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/ApplicationPackage.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/ApplicationPackage.java
index a0b4a888727..131164c5c5e 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/ApplicationPackage.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/ApplicationPackage.java
@@ -1,13 +1,13 @@
// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package com.yahoo.vespa.hosted.controller.application;
+import com.google.common.hash.Hashing;
import com.yahoo.component.Version;
import com.yahoo.config.application.api.DeploymentSpec;
import com.yahoo.config.application.api.ValidationOverrides;
import com.yahoo.slime.Inspector;
import com.yahoo.slime.Slime;
import com.yahoo.vespa.config.SlimeUtils;
-import org.apache.commons.codec.digest.DigestUtils;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -42,7 +42,7 @@ public class ApplicationPackage {
*/
public ApplicationPackage(byte[] zippedContent) {
this.zippedContent = Objects.requireNonNull(zippedContent, "The application package content cannot be null");
- this.contentHash = DigestUtils.shaHex(zippedContent);
+ this.contentHash = Hashing.sha1().hashBytes(zippedContent).toString();
this.deploymentSpec = extractFile("deployment.xml", zippedContent).map(DeploymentSpec::fromXml).orElse(DeploymentSpec.empty);
this.validationOverrides = extractFile("validation-overrides.xml", zippedContent).map(ValidationOverrides::fromXml).orElse(ValidationOverrides.empty);
Optional<Inspector> buildMetaObject = extractFileBytes("build-meta.json", zippedContent)