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 2015/11/05 21:51:23 UTC
[1/2] camel git commit: Upgrade HttpComponents HttpClient to version
4.5.1 and HttpComponents HttpCore to version 4.4.4
Repository: camel
Updated Branches:
refs/heads/master 53f3afaf3 -> 48f64e4a9
Upgrade HttpComponents HttpClient to version 4.5.1 and HttpComponents HttpCore to version 4.4.4
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fabf34b2
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fabf34b2
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fabf34b2
Branch: refs/heads/master
Commit: fabf34b2ca594cdc0deab67b9cc151abe12f2e93
Parents: 53f3afa
Author: Andrea Cosentino <an...@gmail.com>
Authored: Thu Nov 5 20:58:11 2015 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Thu Nov 5 20:58:11 2015 +0100
----------------------------------------------------------------------
components/camel-box/pom.xml | 2 +-
.../camel/component/http4/HttpNoConnectionRedeliveryTest.java | 2 +-
.../org/apache/camel/component/http4/HttpNoConnectionTest.java | 2 +-
parent/pom.xml | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/fabf34b2/components/camel-box/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-box/pom.xml b/components/camel-box/pom.xml
index 22f5fcf..23528d9 100644
--- a/components/camel-box/pom.xml
+++ b/components/camel-box/pom.xml
@@ -119,7 +119,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
- <version>${httpcore4-version}</version>
+ <version>${httpclient4-version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
http://git-wip-us.apache.org/repos/asf/camel/blob/fabf34b2/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpNoConnectionRedeliveryTest.java
----------------------------------------------------------------------
diff --git a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpNoConnectionRedeliveryTest.java b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpNoConnectionRedeliveryTest.java
index 44faf36..513b8f8 100644
--- a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpNoConnectionRedeliveryTest.java
+++ b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpNoConnectionRedeliveryTest.java
@@ -78,7 +78,7 @@ public class HttpNoConnectionRedeliveryTest extends BaseHttpTest {
assertTrue(exchange.isFailed());
ConnectException cause = assertIsInstanceOf(ConnectException.class, exchange.getException());
- assertTrue(cause.getMessage().contains("refused"));
+ assertTrue(cause.getMessage().contains("failed"));
assertEquals(true, exchange.getIn().getHeader(Exchange.REDELIVERED));
assertEquals(4, exchange.getIn().getHeader(Exchange.REDELIVERY_COUNTER));
http://git-wip-us.apache.org/repos/asf/camel/blob/fabf34b2/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpNoConnectionTest.java
----------------------------------------------------------------------
diff --git a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpNoConnectionTest.java b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpNoConnectionTest.java
index fc147b9..7c41d3c 100644
--- a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpNoConnectionTest.java
+++ b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpNoConnectionTest.java
@@ -81,7 +81,7 @@ public class HttpNoConnectionTest extends BaseHttpTest {
Exception e = reply.getException();
assertNotNull("Should have thrown an exception", e);
ConnectException cause = assertIsInstanceOf(ConnectException.class, e);
- assertTrue(cause.getMessage().contains("refused"));
+ assertTrue(cause.getMessage().contains("failed"));
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/fabf34b2/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index cb304fa..091c3a7 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -221,8 +221,8 @@
<htmlunit.version>2.15</htmlunit.version>
<htmlunit-bundle-version>2.15_1</htmlunit-bundle-version>
<httpunit-version>1.7</httpunit-version>
- <httpcore4-version>4.4.1</httpcore4-version>
- <httpclient4-version>4.4.1</httpclient4-version>
+ <httpcore4-version>4.4.4</httpcore4-version>
+ <httpclient4-version>4.5.1</httpclient4-version>
<httpasyncclient-version>4.1</httpasyncclient-version>
<httpclient-version>3.1</httpclient-version>
<ibatis-bundle-version>2.3.4.726_4</ibatis-bundle-version>
[2/2] camel git commit: Olingo2 feature require HttpClient between
4.4.0 and 4.5.0 excluded
Posted by ac...@apache.org.
Olingo2 feature require HttpClient between 4.4.0 and 4.5.0 excluded
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/48f64e4a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/48f64e4a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/48f64e4a
Branch: refs/heads/master
Commit: 48f64e4a9540f90fca78c076bad746f15ee19a4f
Parents: fabf34b
Author: Andrea Cosentino <an...@gmail.com>
Authored: Thu Nov 5 21:48:33 2015 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Thu Nov 5 21:49:41 2015 +0100
----------------------------------------------------------------------
parent/pom.xml | 1 +
platforms/karaf/features/src/main/resources/features.xml | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/48f64e4a/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 091c3a7..7a3c2e4 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -223,6 +223,7 @@
<httpunit-version>1.7</httpunit-version>
<httpcore4-version>4.4.4</httpcore4-version>
<httpclient4-version>4.5.1</httpclient4-version>
+ <httpclient4-olingo2-version>4.4.1</httpclient4-olingo2-version>
<httpasyncclient-version>4.1</httpasyncclient-version>
<httpclient-version>3.1</httpclient-version>
<ibatis-bundle-version>2.3.4.726_4</ibatis-bundle-version>
http://git-wip-us.apache.org/repos/asf/camel/blob/48f64e4a/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 a9a0e2d..94c25d5 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1104,7 +1104,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-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-olingo2-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>