You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2020/03/26 08:54:21 UTC
[camel] branch master updated (b412d4a -> 1d49fdf)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from b412d4a Fix amqp unit tests
new ccc3e43 Upgrade spring-ws
new 29a2fbd Upgrade dependency
new 1d49fdf CAMEL-14640: Upgrade to http client 4.x for testing.
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
components/camel-spring-ws/pom.xml | 6 +++---
.../spring/ws/AddBreadcrumbHttpHeaderTestInterceptor.java | 10 +++++-----
parent/pom.xml | 4 ++--
3 files changed, 10 insertions(+), 10 deletions(-)
[camel] 01/03: Upgrade spring-ws
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit ccc3e436ff81a88c9ab53daf152ba17e879f3b66
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Mar 26 09:46:20 2020 +0100
Upgrade spring-ws
---
parent/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index d25f574..bca2114 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -618,8 +618,8 @@
<spring-version>${spring5-version}</spring-version>
<spring5-version>5.2.5.RELEASE</spring5-version>
<spring-security-version>5.3.0.RELEASE</spring-security-version>
- <spring-ws-version>3.0.7.RELEASE</spring-ws-version>
- <spring-ws-bundle-version>3.0.7.RELEASE_1</spring-ws-bundle-version>
+ <spring-ws-version>3.0.8.RELEASE</spring-ws-version>
+ <spring-ws-bundle-version>3.0.8.RELEASE_1</spring-ws-bundle-version>
<spring-xml-bundle-version>3.0.7.RELEASE_1</spring-xml-bundle-version>
<spymemcached-bundle-version>2.5_2</spymemcached-bundle-version> <!-- FIXME cmueller: not in sync! -->
<spymemcached-version>2.12.0</spymemcached-version>
[camel] 03/03: CAMEL-14640: Upgrade to http client 4.x for testing.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 1d49fdf9308a43ae843a3782145422bd09e72620
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Mar 26 09:53:40 2020 +0100
CAMEL-14640: Upgrade to http client 4.x for testing.
---
components/camel-spring-ws/pom.xml | 4 ++--
.../spring/ws/AddBreadcrumbHttpHeaderTestInterceptor.java | 10 +++++-----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/components/camel-spring-ws/pom.xml b/components/camel-spring-ws/pom.xml
index 7d45565..c2d1004 100644
--- a/components/camel-spring-ws/pom.xml
+++ b/components/camel-spring-ws/pom.xml
@@ -147,8 +147,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/AddBreadcrumbHttpHeaderTestInterceptor.java b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/AddBreadcrumbHttpHeaderTestInterceptor.java
index 0a0fde1..7daff0d 100644
--- a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/AddBreadcrumbHttpHeaderTestInterceptor.java
+++ b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/AddBreadcrumbHttpHeaderTestInterceptor.java
@@ -16,13 +16,13 @@
*/
package org.apache.camel.component.spring.ws;
-import org.apache.commons.httpclient.methods.PostMethod;
+import org.apache.http.client.methods.HttpPost;
import org.springframework.ws.client.WebServiceClientException;
import org.springframework.ws.client.support.interceptor.ClientInterceptor;
import org.springframework.ws.context.MessageContext;
import org.springframework.ws.transport.context.TransportContext;
import org.springframework.ws.transport.context.TransportContextHolder;
-import org.springframework.ws.transport.http.CommonsHttpConnection;
+import org.springframework.ws.transport.http.HttpComponentsConnection;
public class AddBreadcrumbHttpHeaderTestInterceptor implements ClientInterceptor {
@@ -30,9 +30,9 @@ public class AddBreadcrumbHttpHeaderTestInterceptor implements ClientInterceptor
public boolean handleRequest(MessageContext messageContext) throws WebServiceClientException {
// no extra op
TransportContext context = TransportContextHolder.getTransportContext();
- CommonsHttpConnection connection = (CommonsHttpConnection) context.getConnection();
- PostMethod postMethod = connection.getPostMethod();
- postMethod.addRequestHeader("breadcrumbId", "ID-Ralfs-MacBook-Pro-local-50523-1423553069254-0-5");
+ HttpComponentsConnection connection = (HttpComponentsConnection) context.getConnection();
+ HttpPost postMethod = connection.getHttpPost();
+ postMethod.addHeader("breadcrumbId", "ID-Ralfs-MacBook-Pro-local-50523-1423553069254-0-5");
return true;
}
[camel] 02/03: Upgrade dependency
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 29a2fbd072a99c055e855e470ccdf90df0665f5a
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Mar 26 09:48:41 2020 +0100
Upgrade dependency
---
components/camel-spring-ws/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/camel-spring-ws/pom.xml b/components/camel-spring-ws/pom.xml
index f7aaeff..7d45565 100644
--- a/components/camel-spring-ws/pom.xml
+++ b/components/camel-spring-ws/pom.xml
@@ -154,7 +154,7 @@
<dependency>
<groupId>net.javacrumbs</groupId>
<artifactId>smock-springws</artifactId>
- <version>0.5</version>
+ <version>0.9.0</version>
<scope>test</scope>
</dependency>
<dependency>