camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acosent...@apache.org
Subject [2/2] camel git commit: Use the latest http client 4.5.2 for camel-olingo2 component too
Date Mon, 27 Jun 2016 08:42:27 GMT
Use the latest http client 4.5.2 for camel-olingo2 component too


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

Branch: refs/heads/master
Commit: 5f2e79d8198169b63429370db86df59e794f8337
Parents: fe1205d
Author: Andrea Cosentino <ancosen@gmail.com>
Authored: Mon Jun 27 10:40:54 2016 +0200
Committer: Andrea Cosentino <ancosen@gmail.com>
Committed: Mon Jun 27 10:40:54 2016 +0200

----------------------------------------------------------------------
 parent/pom.xml                                           | 1 -
 platforms/karaf/features/src/main/resources/features.xml | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/5f2e79d8/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index f2a88d7..42dc8da 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -245,7 +245,6 @@
     <httpunit-version>1.7</httpunit-version>
     <httpcore4-version>4.4.4</httpcore4-version>
     <httpclient4-version>4.5.2</httpclient4-version>
-    <httpclient4-olingo2-version>4.4.1</httpclient4-olingo2-version>
     <httpasyncclient-version>4.1.2</httpasyncclient-version>
     <httpclient-version>3.1</httpclient-version>
     <hystrix-version>1.5.3</hystrix-version>

http://git-wip-us.apache.org/repos/asf/camel/blob/5f2e79d8/platforms/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index e827fbe..816c928 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1222,7 +1222,7 @@
     <feature version='${project.version}'>camel-core</feature>
     <feature>http</feature>
     <bundle dependency='true'>mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}</bundle>
-    <bundle dependency='true'>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-olingo2-version}</bundle>
+    <bundle dependency='true'>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}</bundle>
     <bundle dependency='true'>mvn:org.apache.httpcomponents/httpasyncclient-osgi/${httpasyncclient-version}</bundle>
     <bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
     <bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>


Mime
View raw message