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/04 14:03:25 UTC

[1/3] knox git commit: KNOX-1507 - Upgrade okhttp to 2.7.5

Repository: knox
Updated Branches:
  refs/heads/master bb2066662 -> 45eee7855


KNOX-1507 - Upgrade okhttp to 2.7.5

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/c315e0c6
Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/c315e0c6
Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/c315e0c6

Branch: refs/heads/master
Commit: c315e0c6d96614466ce22aacf7ed3e79ae1005a7
Parents: bb20666
Author: Kevin Risden <kr...@apache.org>
Authored: Thu Oct 4 09:16:38 2018 -0400
Committer: Kevin Risden <kr...@apache.org>
Committed: Thu Oct 4 09:16:45 2018 -0400

----------------------------------------------------------------------
 pom.xml | 7 +++++++
 1 file changed, 7 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/knox/blob/c315e0c6/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f3477f0..8816ec7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -195,6 +195,7 @@
         <maven-enforcer-plugin.version>3.0.0-M2</maven-enforcer-plugin.version>
         <metrics.version>3.1.2</metrics.version>
         <nimbus-jose-jwt.version>4.41.2</nimbus-jose-jwt.version>
+        <okhttp.version>2.7.5</okhttp.version>
         <pac4j.version>2.1.0</pac4j.version>
         <rest-assured.version>3.1.1</rest-assured.version>
         <shiro.version>1.2.6</shiro.version>
@@ -1016,6 +1017,12 @@
             </dependency>
 
             <dependency>
+                <groupId>com.squareup.okhttp</groupId>
+                <artifactId>okhttp</artifactId>
+                <version>${okhttp.version}</version>
+            </dependency>
+
+            <dependency>
                 <groupId>org.apache.hadoop</groupId>
                 <artifactId>hadoop-auth</artifactId>
                 <version>${hadoop.version}</version>


[3/3] knox git commit: KNOX-1508 - Upgrade taglibs-standard-spec and taglibs-standard-impl to 1.2.5

Posted by kr...@apache.org.
KNOX-1508 - Upgrade taglibs-standard-spec and taglibs-standard-impl to 1.2.5

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/45eee785
Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/45eee785
Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/45eee785

Branch: refs/heads/master
Commit: 45eee785582bd003857698b49ab8b9576f9b0f82
Parents: f827495
Author: Kevin Risden <kr...@apache.org>
Authored: Thu Oct 4 09:12:45 2018 -0400
Committer: Kevin Risden <kr...@apache.org>
Committed: Thu Oct 4 10:03:12 2018 -0400

----------------------------------------------------------------------
 pom.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/knox/blob/45eee785/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c5b6e43..91cb0cc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -205,6 +205,7 @@
         <slf4j.version>1.7.25</slf4j.version>
         <spotbugs.version>3.1.7</spotbugs.version>
         <spotbugs-maven-plugin.version>3.1.6</spotbugs-maven-plugin.version>
+        <taglibs-standard.version>1.2.5</taglibs-standard.version>
         <velocity.version>1.7</velocity.version>
         <xmltool.version>3.3</xmltool.version>
         <xml-matchers.version>0.10</xml-matchers.version>
@@ -1427,6 +1428,17 @@
                 <artifactId>apache-jstl</artifactId>
                 <version>${jetty.version}</version>
             </dependency>
+            <!-- apache-jstl includes taglibs 1.2.1 which has CVEs -->
+            <dependency>
+                <groupId>org.apache.taglibs</groupId>
+                <artifactId>taglibs-standard-spec</artifactId>
+                <version>${taglibs-standard.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.taglibs</groupId>
+                <artifactId>taglibs-standard-impl</artifactId>
+                <version>${taglibs-standard.version}</version>
+            </dependency>
 
             <!-- Websocket support -->
             <dependency>


[2/3] knox git commit: KNOX-1506 - Upgrade protobuf-java to 3.6.1

Posted by kr...@apache.org.
KNOX-1506 - Upgrade protobuf-java to 3.6.1

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/f827495a
Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/f827495a
Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/f827495a

Branch: refs/heads/master
Commit: f827495a18cbd9657206320e97ac6e4e2b6685f8
Parents: c315e0c
Author: Kevin Risden <kr...@apache.org>
Authored: Thu Oct 4 09:15:09 2018 -0400
Committer: Kevin Risden <kr...@apache.org>
Committed: Thu Oct 4 10:02:55 2018 -0400

----------------------------------------------------------------------
 pom.xml | 7 +++++++
 1 file changed, 7 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/knox/blob/f827495a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8816ec7..c5b6e43 100644
--- a/pom.xml
+++ b/pom.xml
@@ -197,6 +197,7 @@
         <nimbus-jose-jwt.version>4.41.2</nimbus-jose-jwt.version>
         <okhttp.version>2.7.5</okhttp.version>
         <pac4j.version>2.1.0</pac4j.version>
+        <protobuf.version>3.6.1</protobuf.version>
         <rest-assured.version>3.1.1</rest-assured.version>
         <shiro.version>1.2.6</shiro.version>
         <shrinkwrap.version>1.2.6</shrinkwrap.version>
@@ -1023,6 +1024,12 @@
             </dependency>
 
             <dependency>
+                <groupId>com.google.protobuf</groupId>
+                <artifactId>protobuf-java</artifactId>
+                <version>${protobuf.version}</version>
+            </dependency>
+
+            <dependency>
                 <groupId>org.apache.hadoop</groupId>
                 <artifactId>hadoop-auth</artifactId>
                 <version>${hadoop.version}</version>