You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2016/06/27 08:42:26 UTC
[1/2] camel git commit: Upgrade httpasyncclient to version 4.1.2
Repository: camel
Updated Branches:
refs/heads/master 0480dead1 -> 5f2e79d81
Upgrade httpasyncclient to version 4.1.2
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fe1205dc
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fe1205dc
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fe1205dc
Branch: refs/heads/master
Commit: fe1205dc2dd13ef873ab31f13f2efbb091e0c386
Parents: 0480dea
Author: Andrea Cosentino <an...@gmail.com>
Authored: Mon Jun 27 10:28:16 2016 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Mon Jun 27 10:28:16 2016 +0200
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/fe1205dc/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 5ae346e..f2a88d7 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -246,7 +246,7 @@
<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.1</httpasyncclient-version>
+ <httpasyncclient-version>4.1.2</httpasyncclient-version>
<httpclient-version>3.1</httpclient-version>
<hystrix-version>1.5.3</hystrix-version>
<hystrix-bundle-version>1.5.3_1</hystrix-bundle-version>
[2/2] camel git commit: Use the latest http client 4.5.2 for
camel-olingo2 component too
Posted by ac...@apache.org.
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 <an...@gmail.com>
Authored: Mon Jun 27 10:40:54 2016 +0200
Committer: Andrea Cosentino <an...@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>