diff options
author | Harald Musum <musum@verizonmedia.com> | 2020-01-08 08:20:13 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-08 08:20:13 +0100 |
commit | 5489a01db126d4ae6c25bc4a84ff5f2cfd4e5123 (patch) | |
tree | dc8ec40545c495f99cb2488fbd06642769d67cf7 /orchestrator | |
parent | ac86bb091d01e6299d6f3e88c531d1cd6903474d (diff) |
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, 7 insertions, 4 deletions
diff --git a/orchestrator/pom.xml b/orchestrator/pom.xml index 3ebc87010fb..d237ce3e4cc 100644 --- a/orchestrator/pom.xml +++ b/orchestrator/pom.xml @@ -75,6 +75,10 @@ <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 4191636e7fe..707c81b92a5 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,7 +1,6 @@ // 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; @@ -10,7 +9,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 com.yahoo.yolean.Exceptions; +import org.apache.commons.lang.exception.ExceptionUtils; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.test.KillSession; import org.apache.curator.test.TestingServer; @@ -220,8 +219,8 @@ public class ZookeeperStatusServiceTest { getException(item).ifPresent( throwable -> mismatchDescription .appendText("Got exception: ") - .appendText(Exceptions.toMessageString(throwable)) - .appendText(ExceptionUtils.getStackTraceRecursivelyAsString(throwable))); + .appendText(ExceptionUtils.getMessage(throwable)) + .appendText(ExceptionUtils.getFullStackTrace(throwable))); } }; } |