brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject [1/6] brooklyn-server git commit: Bump httpcomponents.httpcore version to 4.4.4
Date Tue, 07 Mar 2017 21:10:13 GMT
Repository: brooklyn-server
Updated Branches:
  refs/heads/master 2fe2ba095 -> dc3f44615


Bump httpcomponents.httpcore version to 4.4.4

And httpclient to 4.4.2


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

Branch: refs/heads/master
Commit: f6661167d52a124fb0bc97c54a23540bbf4e4cf6
Parents: 68a07aa
Author: Aled Sage <aled.sage@gmail.com>
Authored: Tue Jan 10 11:49:58 2017 +0000
Committer: Aled Sage <aled.sage@gmail.com>
Committed: Fri Feb 3 20:55:32 2017 +0000

----------------------------------------------------------------------
 karaf/features/src/main/feature/feature.xml | 4 ++--
 parent/pom.xml                              | 6 +++---
 pom.xml                                     | 4 +++-
 3 files changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/f6661167/karaf/features/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/karaf/features/src/main/feature/feature.xml b/karaf/features/src/main/feature/feature.xml
index 8c8d3df..509e740 100644
--- a/karaf/features/src/main/feature/feature.xml
+++ b/karaf/features/src/main/feature/feature.xml
@@ -51,8 +51,8 @@
         <bundle dependency="true">mvn:commons-codec/commons-codec/${commons-codec.version}</bundle>
         <bundle dependency="true">mvn:org.slf4j/jul-to-slf4j/${slf4j.version}</bundle>
         <bundle dependency="true">mvn:org.yaml/snakeyaml/${snakeyaml.version}</bundle>
-        <bundle dependency="true">mvn:org.apache.httpcomponents/httpcore-osgi/${httpclient.version}</bundle>
-        <bundle dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.httpcomponents/httpcore-osgi/${httpcomponents.httpcore.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/${httpcomponents.httpclient.version}</bundle>
 
         <bundle dependency="true">mvn:ch.qos.logback/logback-classic/${logback.version}</bundle>
         <bundle dependency="true">mvn:ch.qos.logback/logback-core/${logback.version}</bundle>

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/f6661167/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 7f671c7..b7e9703 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -281,7 +281,7 @@
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpcore</artifactId>
-                <version>${httpclient.version}</version>
+                <version>${httpcomponents.httpcore.version}</version>
             </dependency>
             <dependency>
                 <groupId>xml-apis</groupId>
@@ -311,13 +311,13 @@
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpclient</artifactId>
-                <version>${httpclient.version}</version>
+                <version>${httpcomponents.httpclient.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpclient</artifactId>
                 <classifier>tests</classifier>
-                <version>${httpclient.version}</version>
+                <version>${httpcomponents.httpclient.version}</version>
             </dependency>
             <dependency>
                 <groupId>aopalliance</groupId>

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/f6661167/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 60e0de5..e74077f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -118,7 +118,9 @@
         <!-- double-check downstream projects before changing jackson version -->
         <fasterxml.jackson.version>2.7.5</fasterxml.jackson.version>
         <cxf.version>3.1.4</cxf.version>
-        <httpclient.version>4.4.1</httpclient.version>
+        <httpcomponents.httpclient.version>4.5.2</httpcomponents.httpclient.version>
+        <httpcomponents.httpcore.version>4.4.4</httpcomponents.httpcore.version>
+        <httpclient.version>4.4.1</httpclient.version> <!-- kept for compatibility
in 0.11.0-SNAPSHOT, remove after -->
         <commons-lang3.version>3.3.2</commons-lang3.version>
         <groovy.version>2.3.7</groovy.version> <!-- Version supported by https://github.com/groovy/groovy-eclipse/wiki/Groovy-Eclipse-2.9.1-Release-Notes
-->
         <jsr305.version>2.0.1</jsr305.version>


Mime
View raw message