You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by ge...@apache.org on 2016/10/10 11:52:08 UTC

[09/50] [abbrv] oozie git commit: OOZIE-2538 Update HttpClient versions to close security vulnerabilities (abhishekbafna via rkanter)

OOZIE-2538 Update HttpClient versions to close security vulnerabilities (abhishekbafna via rkanter)


Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/f132c9ba
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/f132c9ba
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/f132c9ba

Branch: refs/heads/oya
Commit: f132c9ba41f23d44c920d4ebe6e6c52c378ba818
Parents: d4d35bd
Author: Robert Kanter <rk...@cloudera.com>
Authored: Sat Sep 17 11:40:19 2016 -0700
Committer: Robert Kanter <rk...@cloudera.com>
Committed: Sat Sep 17 11:40:19 2016 -0700

----------------------------------------------------------------------
 core/pom.xml           |  4 ++--
 examples/pom.xml       |  4 ++--
 pom.xml                | 26 +++++++++++++++++---------
 release-log.txt        |  1 +
 sharelib/sqoop/pom.xml |  4 ++--
 webapp/pom.xml         |  2 --
 6 files changed, 24 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/oozie/blob/f132c9ba/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 88821c1..62ace06 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -224,8 +224,8 @@
         </dependency>
 
         <dependency>
-            <groupId>commons-httpclient</groupId>
-            <artifactId>commons-httpclient</artifactId>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
             <scope>compile</scope>
         </dependency>
 

http://git-wip-us.apache.org/repos/asf/oozie/blob/f132c9ba/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index 0452836..be4e932 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -57,8 +57,8 @@
         </dependency>
 
         <dependency>
-            <groupId>commons-httpclient</groupId>
-            <artifactId>commons-httpclient</artifactId>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
             <scope>test</scope>
         </dependency>
 

http://git-wip-us.apache.org/repos/asf/oozie/blob/f132c9ba/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index de0ce82..0712d4c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -111,6 +111,8 @@
          <jackson.version>1.8.8</jackson.version>
          <log4j.version>1.2.17</log4j.version>
          <activemq.version>5.13.3</activemq.version>
+         <httpcore.version>4.4</httpcore.version>
+         <httpclient.version>4.4</httpclient.version>
     </properties>
 
     <modules>
@@ -370,8 +372,8 @@
                         <artifactId>commons-io</artifactId>
                     </exclusion>
                     <exclusion>
-                        <groupId>commons-httpclient</groupId>
-                        <artifactId>commons-httpclient</artifactId>
+                        <groupId>org.apache.httpcomponents</groupId>
+                        <artifactId>httpclient</artifactId>
                     </exclusion>
                     <exclusion>
                         <groupId>org.apache.commons</groupId>
@@ -542,8 +544,8 @@
                         <artifactId>commons-cli</artifactId>
                     </exclusion>
                     <exclusion>
-                        <groupId>commons-httpclient</groupId>
-                        <artifactId>commons-httpclient</artifactId>
+                        <groupId>org.apache.httpcomponents</groupId>
+                        <artifactId>httpclient</artifactId>
                     </exclusion>
                     <exclusion>
                         <groupId>commons-lang</groupId>
@@ -813,8 +815,8 @@
                         <artifactId>hadoop-core</artifactId>
                     </exclusion>
                     <exclusion>
-                        <groupId>commons-httpclient</groupId>
-                        <artifactId>commons-httpclient</artifactId>
+                        <groupId>org.apache.httpcomponents</groupId>
+                        <artifactId>httpclient</artifactId>
                     </exclusion>
                     <exclusion>
                         <groupId>org.mortbay.jetty</groupId>
@@ -1353,9 +1355,15 @@
 
             <!-- examples -->
             <dependency>
-                <groupId>commons-httpclient</groupId>
-                <artifactId>commons-httpclient</artifactId>
-                <version>3.1</version>
+                <groupId>org.apache.httpcomponents</groupId>
+                <artifactId>httpclient</artifactId>
+                <version>${httpclient.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.httpcomponents</groupId>
+                <artifactId>httpcore</artifactId>
+                <version>${httpcore.version}</version>
             </dependency>
 
             <dependency>

http://git-wip-us.apache.org/repos/asf/oozie/blob/f132c9ba/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index bd4ce5c..247886c 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
 -- Oozie 4.3.0 release (trunk - unreleased)
 
+OOZIE-2538 Update HttpClient versions to close security vulnerabilities (abhishekbafna via rkanter)
 OOZIE-2037 Add TLSv1.1,TLSv1.2 (rkanter)
 OOZIE-2500 -DtestJarSimple option mentioned in minioozie doc does not work (abhishekbafna via rkanter)
 OOZIE-2552 Update ActiveMQ version for security and other fixes (asasvari via rkanter)

http://git-wip-us.apache.org/repos/asf/oozie/blob/f132c9ba/sharelib/sqoop/pom.xml
----------------------------------------------------------------------
diff --git a/sharelib/sqoop/pom.xml b/sharelib/sqoop/pom.xml
index 5b80a4f..517a37b 100644
--- a/sharelib/sqoop/pom.xml
+++ b/sharelib/sqoop/pom.xml
@@ -73,8 +73,8 @@
                     <artifactId>thrift</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>commons-httpclient</groupId>
-                    <artifactId>commons-httpclient</artifactId>
+                    <groupId>org.apache.httpcomponents</groupId>
+                    <artifactId>httpclient</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>org.slf4j</groupId>

http://git-wip-us.apache.org/repos/asf/oozie/blob/f132c9ba/webapp/pom.xml
----------------------------------------------------------------------
diff --git a/webapp/pom.xml b/webapp/pom.xml
index 7e73572..86665fc 100644
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -124,13 +124,11 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpcore</artifactId>
-            <version>4.3</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <version>4.3</version>
         </dependency>
     </dependencies>