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:43 UTC

[2/2] knox git commit: KNOX-1489 - Upgrade jericho-html to 3.4

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>