Repository: knox Updated Branches: refs/heads/master 0b14270dc -> fedfc8af7
KNOX-1487 - Upgrade easymock to 3.6 Signed-off-by: Kevin Risden <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/knox/repo Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/683be618 Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/683be618 Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/683be618 Branch: refs/heads/master Commit: 683be6188fe2c9e36cfa282cea3851221b7c4ff2 Parents: 0b14270 Author: Kevin Risden <[email protected]> Authored: Tue Oct 2 14:42:01 2018 -0400 Committer: Kevin Risden <[email protected]> Committed: Wed Oct 3 08:09:27 2018 -0400 ---------------------------------------------------------------------- .../topology/simple/ProviderConfigurationParserTest.java | 7 +++---- pom.xml | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/knox/blob/683be618/gateway-server/src/test/java/org/apache/knox/gateway/topology/simple/ProviderConfigurationParserTest.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/topology/simple/ProviderConfigurationParserTest.java b/gateway-server/src/test/java/org/apache/knox/gateway/topology/simple/ProviderConfigurationParserTest.java index 0b2cafe..b8c8f3c 100644 --- a/gateway-server/src/test/java/org/apache/knox/gateway/topology/simple/ProviderConfigurationParserTest.java +++ b/gateway-server/src/test/java/org/apache/knox/gateway/topology/simple/ProviderConfigurationParserTest.java @@ -16,9 +16,8 @@ */ package org.apache.knox.gateway.topology.simple; - +import org.apache.commons.io.FileUtils; import org.apache.knox.test.TestUtils; -import org.apache.tools.ant.util.FileUtils; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -53,7 +52,7 @@ public class ProviderConfigurationParserTest { @AfterClass public static void removeTempDir() { if (tmpDir != null) { - FileUtils.delete(tmpDir); + FileUtils.deleteQuietly(tmpDir); } } @@ -314,7 +313,7 @@ public class ProviderConfigurationParserTest { try { pc = ProviderConfigurationParser.parse(testConfig.getAbsolutePath()); } finally { - FileUtils.delete(testConfig); + FileUtils.deleteQuietly(testConfig); } return pc; http://git-wip-us.apache.org/repos/asf/knox/blob/683be618/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 84cdc1d..31226d9 100644 --- a/pom.xml +++ b/pom.xml @@ -158,7 +158,7 @@ <cors-filter.version>2.6</cors-filter.version> <curator.version>4.0.1</curator.version> <curator-test.version>2.12.0</curator-test.version> - <easymock.version>3.5</easymock.version> + <easymock.version>3.6</easymock.version> <eclipselink.version>2.5.2</eclipselink.version> <ehcache.version>2.5.0</ehcache.version> <findsecbugs-plugin.version>1.8.0</findsecbugs-plugin.version>
