You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@knox.apache.org by kr...@apache.org on 2018/10/03 13:22:42 UTC
[1/2] knox git commit: KNOX-1487 - Upgrade easymock to 3.6
Repository: knox
Updated Branches:
refs/heads/master 0b14270dc -> fedfc8af7
KNOX-1487 - Upgrade easymock to 3.6
Signed-off-by: Kevin Risden <kr...@apache.org>
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 <kr...@apache.org>
Authored: Tue Oct 2 14:42:01 2018 -0400
Committer: Kevin Risden <kr...@apache.org>
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>
[2/2] knox git commit: KNOX-1489 - Upgrade jericho-html to 3.4
Posted by kr...@apache.org.
KNOX-1489 - Upgrade jericho-html to 3.4
Signed-off-by: Kevin Risden <kr...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/fedfc8af
Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/fedfc8af
Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/fedfc8af
Branch: refs/heads/master
Commit: fedfc8af76b854e55f31f5ca29c73ec85f5383cf
Parents: 683be61
Author: Kevin Risden <kr...@apache.org>
Authored: Tue Oct 2 14:50:07 2018 -0400
Committer: Kevin Risden <kr...@apache.org>
Committed: Wed Oct 3 09:22:21 2018 -0400
----------------------------------------------------------------------
gateway-provider-rewrite/pom.xml | 5 +++++
pom.xml | 9 ++++++++-
2 files changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/knox/blob/fedfc8af/gateway-provider-rewrite/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite/pom.xml b/gateway-provider-rewrite/pom.xml
index 0c3354b..926a5d6 100644
--- a/gateway-provider-rewrite/pom.xml
+++ b/gateway-provider-rewrite/pom.xml
@@ -112,6 +112,11 @@
<artifactId>javax.servlet-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ </dependency>
+
<!-- ********** ********** ********** ********** ********** ********** -->
<!-- ********** Test Dependencies ********** -->
<!-- ********** ********** ********** ********** ********** ********** -->
http://git-wip-us.apache.org/repos/asf/knox/blob/fedfc8af/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 31226d9..d33d914 100644
--- a/pom.xml
+++ b/pom.xml
@@ -176,7 +176,7 @@
<javax.servlet-api.version>3.1.0</javax.servlet-api.version>
<javax.ws.rs-api.version>2.0</javax.ws.rs-api.version>
<javax.websocket-api.version>1.1</javax.websocket-api.version>
- <jericho-html.version>3.2</jericho-html.version>
+ <jericho-html.version>3.4</jericho-html.version>
<jersey.version>2.6</jersey.version>
<jetty.version>9.2.25.v20180606</jetty.version>
<jline.version>2.14.6</jline.version>
@@ -187,6 +187,7 @@
<junit.version>4.12</junit.version>
<libpam4j.version>1.9.1</libpam4j.version>
<log4j.version>1.2.17</log4j.version>
+ <log4j2.version>2.11.1</log4j2.version>
<maven-checkstyle-plugin.version>3.0.0</maven-checkstyle-plugin.version>
<maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
<maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version>
@@ -1281,6 +1282,12 @@
</dependency>
<dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ <version>${log4j2.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-core</artifactId>
<version>${shiro.version}</version>