diff options
author | Bjørn Christian Seime <bjorn.christian@seime.no> | 2020-01-08 14:22:31 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-08 14:22:31 +0100 |
commit | a10c54b1a05326021c37d428a0e03117ef765380 (patch) | |
tree | fddfc08168d84b3c6615bb3285d7bcf65e9f7c3e /orchestrator | |
parent | bd1868da7bcfc5d24216596ebb3c7a8fb27f6fb8 (diff) |
Revert "Revert "Bjorncs/apache commons libraries cleanup""
Diffstat (limited to 'orchestrator')
-rw-r--r-- | orchestrator/pom.xml | 4 | ||||
-rw-r--r-- | orchestrator/src/test/java/com/yahoo/vespa/orchestrator/status/ZookeeperStatusServiceTest.java | 7 |
2 files changed, 4 insertions, 7 deletions
diff --git a/orchestrator/pom.xml b/orchestrator/pom.xml index d237ce3e4cc..3ebc87010fb 100644 --- a/orchestrator/pom.xml +++ b/orchestrator/pom.xml @@ -75,10 +75,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> - <dependency> <groupId>com.yahoo.vespa</groupId> <artifactId>config-provisioning</artifactId> <version>${project.version}</version> diff --git a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/status/ZookeeperStatusServiceTest.java b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/status/ZookeeperStatusServiceTest.java index 707c81b92a5..4191636e7fe 100644 --- a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/status/ZookeeperStatusServiceTest.java +++ b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/status/ZookeeperStatusServiceTest.java @@ -1,6 +1,7 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.orchestrator.status; +import com.yahoo.exception.ExceptionUtils; import com.yahoo.jdisc.Metric; import com.yahoo.jdisc.Timer; import com.yahoo.jdisc.test.TestTimer; @@ -9,7 +10,7 @@ import com.yahoo.vespa.applicationmodel.ApplicationInstanceReference; import com.yahoo.vespa.curator.Curator; import com.yahoo.vespa.orchestrator.OrchestratorContext; import com.yahoo.vespa.orchestrator.TestIds; -import org.apache.commons.lang.exception.ExceptionUtils; +import com.yahoo.yolean.Exceptions; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.test.KillSession; import org.apache.curator.test.TestingServer; @@ -219,8 +220,8 @@ public class ZookeeperStatusServiceTest { getException(item).ifPresent( throwable -> mismatchDescription .appendText("Got exception: ") - .appendText(ExceptionUtils.getMessage(throwable)) - .appendText(ExceptionUtils.getFullStackTrace(throwable))); + .appendText(Exceptions.toMessageString(throwable)) + .appendText(ExceptionUtils.getStackTraceRecursivelyAsString(throwable))); } }; } |