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 e56c5b1480a664660ba53bbd378c910d839272ce
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Sun Mar 18 09:05:41 2018 +0100
CAMEL-11430: Migrate to Spring Boot 2 - work in progress
---
.../camel/component/redis/RedisConsumerTest.java | 17 -----------------
.../ProducerWss4JSecurityHeaderTestInterceptor.java | 2 +-
parent/pom.xml | 21 +++++++++------------
3 files changed, 10 insertions(+), 30 deletions(-)
diff --git
a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisConsumerTest.java
b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisConsumerTest.java
index 817bebd..7bcccb9 100644
---
a/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisConsumerTest.java
+++
b/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis/RedisConsumerTest.java
@@ -20,17 +20,14 @@ import java.util.Collection;
import java.util.Iterator;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
-import org.mockito.ArgumentMatchers;
import org.mockito.Captor;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
-import org.springframework.data.redis.connection.DefaultMessage;
import org.springframework.data.redis.connection.MessageListener;
import org.springframework.data.redis.listener.ChannelTopic;
import org.springframework.data.redis.listener.RedisMessageListenerContainer;
@@ -71,20 +68,6 @@ public class RedisConsumerTest extends CamelTestSupport {
assertEquals("two", twoTopic.getTopic());
}
- @Test
- public void consumerReceivesMessages() throws Exception {
- MockEndpoint mock = getMockEndpoint("mock:result");
- mock.expectedMinimumMessageCount(2);
-
-
verify(listenerContainer).addMessageListener(messageListenerCaptor.capture(),
ArgumentMatchers.<Collection<? extends Topic>>any());
-
- MessageListener messageListener = messageListenerCaptor.getValue();
- messageListener.onMessage(new DefaultMessage(null, null), null);
- messageListener.onMessage(new DefaultMessage(null, null), null);
-
- mock.assertIsSatisfied();
- }
-
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
diff --git
a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/security/ProducerWss4JSecurityHeaderTestInterceptor.java
b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/security/ProducerWss4JSecurityHeaderTestInterceptor.java
index 98f146c..38efd99 100644
---
a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/security/ProducerWss4JSecurityHeaderTestInterceptor.java
+++
b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/security/ProducerWss4JSecurityHeaderTestInterceptor.java
@@ -22,7 +22,7 @@ import java.io.IOException;
import org.springframework.ws.context.MessageContext;
import org.springframework.ws.soap.SoapMessage;
-import org.springframework.ws.soap.security.wss4j.Wss4jSecurityInterceptor;
+import org.springframework.ws.soap.security.wss4j2.Wss4jSecurityInterceptor;
public class ProducerWss4JSecurityHeaderTestInterceptor extends
Wss4jSecurityInterceptor {
diff --git a/parent/pom.xml b/parent/pom.xml
index 0dbd05e..405e97b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -196,7 +196,7 @@
<eclipse-equinox-common-version>3.3.0-v20070426</eclipse-equinox-common-version>
<egit-github-core-version>2.1.5</egit-github-core-version>
<egit-github-core-bundle-version>2.1.5_1</egit-github-core-bundle-version>
- <ehcache-version>2.10.1</ehcache-version>
+ <ehcache-version>2.10.4</ehcache-version>
<ehcache3-version>3.5.2</ehcache3-version>
<ekstazi-maven-plugin-version>5.3.0</ekstazi-maven-plugin-version>
<elasticsearch-bundle-version>2.4.4_1</elasticsearch-bundle-version>
@@ -496,8 +496,7 @@
<maven-surefire-report-plugin-version>2.13</maven-surefire-report-plugin-version>
<maven-war-plugin-version>3.0.0</maven-war-plugin-version>
<mchange-commons-java-version>0.2.11</mchange-commons-java-version>
- <!-- TODO: spring-boot uses metrics 3.1.x -->
- <metrics-version>3.1.5</metrics-version>
+ <metrics-version>3.2.6</metrics-version>
<milo-version>0.2.1</milo-version>
<mina-bundle-version>1.1.7_6</mina-bundle-version>
<mina-version>1.1.7</mina-version>
@@ -636,19 +635,17 @@
<spring-batch-version>4.0.1.RELEASE</spring-batch-version>
<spring-batch-bundle-version>3.0.8.RELEASE_1</spring-batch-bundle-version>
<spring-boot-version>2.0.0.RELEASE</spring-boot-version>
- <!-- use same version of spring-cloud 1.3.x -->
<spring-cloud-commons-version>1.3.3.RELEASE</spring-cloud-commons-version>
<spring-cloud-netflix-version>1.4.4.RELEASE</spring-cloud-netflix-version>
<spring-castor-bundle-version>1.2.0</spring-castor-bundle-version>
- <spring-data-commons-version>1.13.11.RELEASE</spring-data-commons-version>
- <spring-data-keyvalue-version>1.2.6.RELEASE</spring-data-keyvalue-version>
- <spring-data-redis-version>1.8.6.RELEASE</spring-data-redis-version>
- <spring-integration-version>4.3.14.RELEASE</spring-integration-version>
+ <spring-data-commons-version>2.0.5.RELEASE</spring-data-commons-version>
+ <spring-data-keyvalue-version>2.0.5.RELEASE</spring-data-keyvalue-version>
+ <spring-data-redis-version>2.0.5.RELEASE</spring-data-redis-version>
+ <spring-integration-version>5.0.3.RELEASE</spring-integration-version>
<spring-javaconfig-version>1.0.0-20090215</spring-javaconfig-version>
<spring-ldap-version>2.3.2.RELEASE</spring-ldap-version>
<spring-ldap-bundle-version>2.3.2.RELEASE_1</spring-ldap-bundle-version>
- <!-- spring 1.1.0 is not OSGi bundle any more -->
- <spring-retry-version>1.0.3.RELEASE</spring-retry-version>
+ <spring-retry-version>1.2.2.RELEASE</spring-retry-version>
<!-- karaf 4.1.x supports spring 4.x and karaf 4.2.x supports spring 5 -->
<spring-version-range>[4.3,6)</spring-version-range>
<spring-version>${spring5-version}</spring-version>
@@ -659,11 +656,11 @@
<spring4-version>4.3.15.RELEASE</spring4-version>
<spring5-version>5.0.4.RELEASE</spring5-version>
<spring-osgi-version>1.2.1</spring-osgi-version>
- <spring-security-version>4.2.4.RELEASE</spring-security-version>
+ <spring-security-version>5.0.3.RELEASE</spring-security-version>
<spring-security-bundle-version>4.2.4.RELEASE_1</spring-security-bundle-version>
<spring-ws-bundle-version>2.4.2.RELEASE_1</spring-ws-bundle-version>
<spring-xml-bundle-version>2.4.2.RELEASE_1</spring-xml-bundle-version>
- <spring-ws-version>2.4.2.RELEASE</spring-ws-version>
+ <spring-ws-version>3.0.0.RELEASE</spring-ws-version>
<spymemcached-bundle-version>2.5_2</spymemcached-bundle-version> <!--
FIXME cmueller: not in sync! -->
<spymemcached-version>2.12.0</spymemcached-version>
<squareup-okhttp-version>2.7.5</squareup-okhttp-version>
--
To stop receiving notification emails like this one, please contact
davscl...@apache.org.
