diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index 5268a737..7bf07b63 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -56,21 +56,21 @@ junit junit - 4.11 + 4.12 test + + org.springframework.integration + spring-integration-jms + 4.3.0.RC1 + compile + org.hamcrest hamcrest-all 1.3 test - - org.springframework - spring-test - 4.2.5.RELEASE - test - javax.jms jms-api @@ -79,15 +79,15 @@ org.springframework.integration - spring-integration-jms - 4.3.0.M1 + spring-integration-groovy + 4.3.0.RC1 compile - org.springframework.integration - spring-integration-groovy - 4.3.0.M1 - compile + org.springframework + spring-test + 4.3.0.RC2 + test log4j diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index 050ae584..67188d66 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -56,9 +56,15 @@ junit junit - 4.11 + 4.12 test + + org.springframework.integration + spring-integration-ftp + 4.3.0.RC1 + compile + org.hamcrest hamcrest-all @@ -68,15 +74,9 @@ org.springframework spring-test - 4.2.5.RELEASE + 4.3.0.RC2 test - - org.springframework.integration - spring-integration-ftp - 4.3.0.M1 - compile - log4j log4j diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index 489e88ac..46fdce42 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -53,10 +53,16 @@ https://github.com/spring-projects/spring-integration-samples + + org.springframework.integration + spring-integration-stream + 4.3.0.RC1 + compile + junit junit - 4.11 + 4.12 test @@ -65,12 +71,6 @@ 1.3 test - - org.springframework - spring-test - 4.2.5.RELEASE - test - org.codehaus.groovy groovy-all @@ -79,34 +79,28 @@ org.springframework.integration - spring-integration-rmi - 4.3.0.M1 - compile - - - org.springframework.integration - spring-integration-stream - 4.3.0.M1 + spring-integration-jmx + 4.3.0.RC1 compile org.springframework.integration spring-integration-groovy - 4.3.0.M1 + 4.3.0.RC1 compile + + org.springframework + spring-test + 4.3.0.RC2 + test + org.python jython-standalone 2.5.3 compile - - org.springframework.integration - spring-integration-jmx - 4.3.0.M1 - compile - log4j log4j @@ -125,6 +119,12 @@ 1.9.5 test + + org.springframework.integration + spring-integration-rmi + 4.3.0.RC1 + compile + diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index 29440e32..3eae7259 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -53,10 +53,16 @@ https://github.com/spring-projects/spring-integration-samples + + org.springframework.integration.samples + cafe-si + 4.3.0.BUILD-SNAPSHOT + compile + junit junit - 4.11 + 4.12 test @@ -66,16 +72,16 @@ test - org.springframework - spring-test - 4.2.5.RELEASE - test + org.springframework.integration + spring-integration-amqp + 4.3.0.RC1 + compile - org.springframework.integration.samples - cafe-si - 4.3.0.BUILD-SNAPSHOT - compile + org.springframework + spring-test + 4.3.0.RC2 + test log4j @@ -89,12 +95,6 @@ 1.9.5 test - - org.springframework.integration - spring-integration-amqp - 4.3.0.M1 - compile - diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index b267a7b3..19807a3b 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -53,24 +53,30 @@ https://github.com/spring-projects/spring-integration-samples + + org.springframework.integration.samples + cafe-si + 4.3.0.BUILD-SNAPSHOT + compile + junit junit - 4.11 + 4.12 test + + org.springframework.integration + spring-integration-jms + 4.3.0.RC1 + compile + org.hamcrest hamcrest-all 1.3 test - - org.springframework - spring-test - 4.2.5.RELEASE - test - org.apache.activemq activemq-broker @@ -84,16 +90,10 @@ compile - org.springframework.integration - spring-integration-jms - 4.3.0.M1 - compile - - - org.springframework.integration.samples - cafe-si - 4.3.0.BUILD-SNAPSHOT - compile + org.springframework + spring-test + 4.3.0.RC2 + test log4j diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index f65ced7c..80853b4e 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -53,10 +53,16 @@ https://github.com/spring-projects/spring-integration-samples + + org.springframework.integration + spring-integration-stream + 4.3.0.RC1 + compile + junit junit - 4.11 + 4.12 test @@ -68,15 +74,9 @@ org.springframework spring-test - 4.2.5.RELEASE + 4.3.0.RC2 test - - org.springframework.integration - spring-integration-stream - 4.3.0.M1 - compile - log4j log4j diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index a19afb63..4fb45210 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -56,7 +56,7 @@ junit junit - 4.11 + 4.12 test @@ -65,18 +65,18 @@ 1.3 test - - org.springframework - spring-test - 4.2.5.RELEASE - test - org.springframework.integration spring-integration-ip - 4.3.0.M1 + 4.3.0.RC1 compile + + org.springframework + spring-test + 4.3.0.RC2 + test + log4j log4j diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index 11a722ac..be046e91 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -52,12 +52,24 @@ https://github.com/spring-projects/spring-integration-samples + + org.springframework + spring-jdbc + 4.3.0.RC2 + compile + javax.transaction jta 1.1 compile + + junit + junit + 4.12 + test + org.slf4j jcl-over-slf4j @@ -65,9 +77,9 @@ runtime - junit - junit - 4.11 + org.springframework + spring-test + 4.3.0.RC2 test @@ -78,20 +90,8 @@ org.springframework - spring-aop - 4.2.5.RELEASE - compile - - - org.springframework - spring-context - 4.2.5.RELEASE - compile - - - org.springframework - spring-webmvc - 4.2.5.RELEASE + spring-tx + 4.3.0.RC2 compile @@ -100,6 +100,12 @@ 1.7.11 compile + + org.springframework + spring-orm + 4.3.0.RC2 + compile + commons-pool commons-pool @@ -156,20 +162,20 @@ org.springframework - spring-jdbc - 4.2.5.RELEASE + spring-aop + 4.3.0.RC2 compile org.springframework - spring-test - 4.2.5.RELEASE - test + spring-webmvc + 4.3.0.RC2 + compile - org.hibernate - hibernate-entitymanager - 4.3.11.Final + org.springframework.integration + spring-integration-ip + 4.3.0.RC1 compile @@ -178,16 +184,10 @@ 1.8.4 compile - - org.springframework - spring-orm - 4.2.5.RELEASE - compile - org.springframework spring-aspects - 4.2.5.RELEASE + 4.3.0.RC2 compile @@ -196,6 +196,12 @@ 2.2.1 compile + + org.hibernate + hibernate-entitymanager + 5.1.0.Final + compile + org.hamcrest hamcrest-all @@ -208,16 +214,10 @@ 2.0 compile - - org.springframework.integration - spring-integration-ip - 4.3.0.M1 - compile - org.springframework - spring-tx - 4.2.5.RELEASE + spring-context + 4.3.0.RC2 compile diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index 591e517c..ba81588f 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.M1 + 1.4.0.M2 org.springframework.integration.samples stomp-chat @@ -62,6 +62,12 @@ spring-integration-event compile + + junit + junit + 4.12 + test + org.springframework.boot spring-boot-starter-websocket @@ -72,12 +78,6 @@ spring-integration-groovy compile - - junit - junit - 4.11 - test - org.springframework.integration spring-integration-websocket @@ -90,14 +90,14 @@ test - org.springframework - spring-test - 4.2.5.RELEASE + org.springframework.boot + spring-boot-starter-test test - org.springframework.boot - spring-boot-starter-test + org.springframework + spring-test + 4.3.0.RC2 test diff --git a/applications/stomp-chat/src/test/java/org/springframework/integration/samples/chat/stomp/server/ApplicationTests.java b/applications/stomp-chat/src/test/java/org/springframework/integration/samples/chat/stomp/server/ApplicationTests.java index 614d5447..f95cd46f 100644 --- a/applications/stomp-chat/src/test/java/org/springframework/integration/samples/chat/stomp/server/ApplicationTests.java +++ b/applications/stomp-chat/src/test/java/org/springframework/integration/samples/chat/stomp/server/ApplicationTests.java @@ -19,19 +19,15 @@ package org.springframework.integration.samples.chat.stomp.server; import org.junit.Test; import org.junit.runner.RunWith; -import org.springframework.boot.test.IntegrationTest; -import org.springframework.boot.test.SpringApplicationConfiguration; +import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.web.WebAppConfiguration; /** * @author Artem Bilan * @since 3.0 */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = Application.class) -@WebAppConfiguration -@IntegrationTest({"server.port=0", "management.port=0"}) +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = Application.class) public class ApplicationTests { @Test diff --git a/basic/amqp-affinity/pom.xml b/basic/amqp-affinity/pom.xml index 1755bfc5..f7616f5a 100644 --- a/basic/amqp-affinity/pom.xml +++ b/basic/amqp-affinity/pom.xml @@ -54,7 +54,7 @@ junit junit - 4.11 + 4.12 test @@ -66,7 +66,7 @@ org.springframework spring-test - 4.2.5.RELEASE + 4.3.0.RC2 test diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index a0daf550..225b4eb2 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -53,10 +53,16 @@ https://github.com/spring-projects/spring-integration-samples + + org.springframework.integration + spring-integration-stream + 4.3.0.RC1 + compile + junit junit - 4.11 + 4.12 test @@ -66,16 +72,16 @@ test - org.springframework - spring-test - 4.2.5.RELEASE - test + org.springframework.integration + spring-integration-amqp + 4.3.0.RC1 + compile - org.springframework.integration - spring-integration-stream - 4.3.0.M1 - compile + org.springframework + spring-test + 4.3.0.RC2 + test log4j @@ -89,12 +95,6 @@ 1.9.5 test - - org.springframework.integration - spring-integration-amqp - 4.3.0.M1 - compile - diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index 0cab78b5..28329299 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.M1 + 1.4.0.M2 org.springframework.integration.samples barrier @@ -57,16 +57,10 @@ https://github.com/spring-projects/spring-integration-samples - - org.springframework.integration - spring-integration-core - 4.3.0.M1 - compile - junit junit - 4.11 + 4.12 test @@ -75,12 +69,6 @@ 1.3 test - - org.springframework - spring-test - 4.2.5.RELEASE - test - org.springframework.boot spring-boot-starter-test @@ -98,8 +86,8 @@ org.springframework.integration - spring-integration-http - 4.3.0.M1 + spring-integration-amqp + 4.3.0.RC1 compile @@ -108,17 +96,29 @@ compile - org.mockito - mockito-core - 1.9.5 + org.springframework + spring-test + 4.3.0.RC2 test org.springframework.integration - spring-integration-amqp - 4.3.0.M1 + spring-integration-core + 4.3.0.RC1 compile + + org.springframework.integration + spring-integration-http + 4.3.0.RC1 + compile + + + org.mockito + mockito-core + 1.9.5 + test + diff --git a/basic/barrier/src/test/java/org/springframework/integration/samples/barrier/ApplicationTests.java b/basic/barrier/src/test/java/org/springframework/integration/samples/barrier/ApplicationTests.java index 5eaf56c9..18512620 100644 --- a/basic/barrier/src/test/java/org/springframework/integration/samples/barrier/ApplicationTests.java +++ b/basic/barrier/src/test/java/org/springframework/integration/samples/barrier/ApplicationTests.java @@ -1,6 +1,5 @@ -package org.springframework.integration.samples.barrier; /* - * Copyright 2015 the original author or authors. + * Copyright 2015-2016 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,12 +14,12 @@ package org.springframework.integration.samples.barrier; * limitations under the License. */ - +package org.springframework.integration.samples.barrier; import org.junit.Test; import org.junit.runner.RunWith; -import org.springframework.boot.test.SpringApplicationConfiguration; +import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; /** @@ -28,7 +27,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; * @since 4.2 */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = Application.class) +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, classes = Application.class) public class ApplicationTests { @Test diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index 87565970..37886b72 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -53,16 +53,10 @@ https://github.com/spring-projects/spring-integration-samples - - org.springframework.integration - spring-integration-core - 4.3.0.M1 - compile - junit junit - 4.11 + 4.12 test @@ -74,9 +68,15 @@ org.springframework spring-test - 4.2.5.RELEASE + 4.3.0.RC2 test + + org.springframework.integration + spring-integration-core + 4.3.0.RC1 + compile + log4j log4j diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index d7a00c4a..71498ee2 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -54,10 +54,10 @@ - org.springframework.integration - spring-integration-core - 4.3.0.M1 - compile + junit + junit + 4.12 + test com.h2database @@ -65,12 +65,6 @@ 1.3.175 compile - - junit - junit - 4.11 - test - org.hamcrest hamcrest-all @@ -80,9 +74,15 @@ org.springframework spring-test - 4.2.5.RELEASE + 4.3.0.RC2 test + + org.springframework.integration + spring-integration-core + 4.3.0.RC1 + compile + log4j log4j diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index 938cdced..4ac05bc2 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -56,7 +56,7 @@ junit junit - 4.11 + 4.12 test @@ -65,10 +65,16 @@ 1.3 test + + org.springframework.integration + spring-integration-feed + 4.3.0.RC1 + compile + org.springframework spring-test - 4.2.5.RELEASE + 4.3.0.RC2 test @@ -83,12 +89,6 @@ 1.9.5 test - - org.springframework.integration - spring-integration-feed - 4.3.0.M1 - compile - diff --git a/basic/file/pom.xml b/basic/file/pom.xml index d6f3ee69..4cd5478a 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -56,9 +56,15 @@ junit junit - 4.11 + 4.12 test + + org.springframework.integration + spring-integration-file + 4.3.0.RC1 + compile + org.hamcrest hamcrest-all @@ -68,15 +74,9 @@ org.springframework spring-test - 4.2.5.RELEASE + 4.3.0.RC2 test - - org.springframework.integration - spring-integration-file - 4.3.0.M1 - compile - log4j log4j diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index 5ea5026c..a536543c 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -62,21 +62,21 @@ junit junit - 4.11 + 4.12 test + + org.springframework.integration + spring-integration-ftp + 4.3.0.RC1 + compile + org.hamcrest hamcrest-all 1.3 test - - org.springframework - spring-test - 4.2.5.RELEASE - test - commons-io commons-io @@ -85,9 +85,9 @@ org.springframework.integration - spring-integration-ftp - 4.3.0.M1 - compile + spring-integration-test + 4.3.0.RC1 + test org.apache.ftpserver @@ -95,6 +95,12 @@ 1.0.6 compile + + org.springframework + spring-test + 4.3.0.RC2 + test + log4j log4j @@ -113,12 +119,6 @@ 1.9.5 test - - org.springframework.integration - spring-integration-test - 4.3.0.M1 - test - diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index 1c3be0cd..dfbc8eac 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -53,16 +53,10 @@ https://github.com/spring-projects/spring-integration-samples - - org.springframework.integration - spring-integration-core - 4.3.0.M1 - compile - junit junit - 4.11 + 4.12 test @@ -74,9 +68,15 @@ org.springframework spring-test - 4.2.5.RELEASE + 4.3.0.RC2 test + + org.springframework.integration + spring-integration-core + 4.3.0.RC1 + compile + log4j log4j diff --git a/basic/http-boot/pom.xml b/basic/http-boot/pom.xml index 31ebcce7..4f2cd90d 100644 --- a/basic/http-boot/pom.xml +++ b/basic/http-boot/pom.xml @@ -54,7 +54,7 @@ junit junit - 4.11 + 4.12 test @@ -66,7 +66,7 @@ org.springframework spring-test - 4.2.5.RELEASE + 4.3.0.RC2 test diff --git a/basic/http/pom.xml b/basic/http/pom.xml index 4b4e791b..d19db013 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -52,12 +52,6 @@ https://github.com/spring-projects/spring-integration-samples - - org.springframework - spring-webmvc - 4.2.5.RELEASE - compile - javax.mail javax.mail-api @@ -67,7 +61,7 @@ junit junit - 4.11 + 4.12 test @@ -78,20 +72,8 @@ org.springframework - spring-test - 4.2.5.RELEASE - test - - - org.springframework.integration - spring-integration-http - 4.3.0.M1 - compile - - - org.springframework.integration - spring-integration-mail - 4.3.0.M1 + spring-webmvc + 4.3.0.RC2 compile @@ -100,6 +82,12 @@ 2.4 compile + + org.springframework + spring-test + 4.3.0.RC2 + test + log4j log4j @@ -112,12 +100,24 @@ 1.2.2 compile + + org.springframework.integration + spring-integration-http + 4.3.0.RC1 + compile + org.mockito mockito-core 1.9.5 test + + org.springframework.integration + spring-integration-mail + 4.3.0.RC1 + compile + diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index 9ebe37d9..82295158 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -53,36 +53,36 @@ https://github.com/spring-projects/spring-integration-samples + + junit + junit + 4.12 + test + com.h2database h2 1.3.175 compile - - junit - junit - 4.11 - test - org.hamcrest hamcrest-all 1.3 test - - org.springframework - spring-test - 4.2.5.RELEASE - test - org.springframework.integration spring-integration-jdbc - 4.3.0.M1 + 4.3.0.RC1 compile + + org.springframework + spring-test + 4.3.0.RC2 + test + log4j log4j diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index eed847a9..e43a6327 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -53,29 +53,35 @@ https://github.com/spring-projects/spring-integration-samples + + org.springframework.integration + spring-integration-stream + 4.3.0.RC1 + compile + junit junit - 4.11 + 4.12 test + + org.springframework.integration + spring-integration-jms + 4.3.0.RC1 + compile + org.hamcrest hamcrest-all 1.3 test - - org.springframework - spring-test - 4.2.5.RELEASE - test - org.springframework.integration - spring-integration-jms - 4.3.0.M1 - compile + spring-integration-test + 4.3.0.RC1 + test org.apache.activemq @@ -90,10 +96,10 @@ compile - org.springframework.integration - spring-integration-stream - 4.3.0.M1 - compile + org.springframework + spring-test + 4.3.0.RC2 + test log4j @@ -107,12 +113,6 @@ 1.9.5 test - - org.springframework.integration - spring-integration-test - 4.3.0.M1 - test - diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index c44e9f9b..b89a3ed2 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -53,10 +53,16 @@ https://github.com/spring-projects/spring-integration-samples + + org.springframework.integration + spring-integration-stream + 4.3.0.RC1 + compile + junit junit - 4.11 + 4.12 test @@ -65,24 +71,18 @@ 1.3 test - - org.springframework - spring-test - 4.2.5.RELEASE - test - - - org.springframework.integration - spring-integration-stream - 4.3.0.M1 - compile - org.springframework.integration spring-integration-jmx - 4.3.0.M1 + 4.3.0.RC1 compile + + org.springframework + spring-test + 4.3.0.RC2 + test + log4j log4j diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index c273dbe1..3eb45204 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.M1 + 1.4.0.M2 org.springframework.integration.samples jpa @@ -69,6 +69,12 @@ + + junit + junit + 4.12 + test + com.h2database h2 @@ -81,42 +87,6 @@ - - junit - junit - 4.11 - test - - - org.springframework - spring-test - 4.2.5.RELEASE - test - - - org.hibernate - hibernate-entitymanager - 4.3.11.Final - runtime - - - commons-logging - commons-logging - - - - - org.springframework.integration - spring-integration-jpa - 4.3.0.M1 - compile - - - commons-logging - commons-logging - - - org.hibernate.javax.persistence hibernate-jpa-2.1-api @@ -131,8 +101,26 @@ org.springframework - spring-instrument - 4.2.5.RELEASE + spring-test + 4.3.0.RC2 + test + + + org.springframework.integration + spring-integration-jpa + 4.3.0.RC1 + compile + + + commons-logging + commons-logging + + + + + org.hibernate + hibernate-entitymanager + 5.1.0.Final runtime @@ -175,6 +163,18 @@ + + org.springframework + spring-instrument + 4.3.0.RC2 + runtime + + + commons-logging + commons-logging + + + org.mockito mockito-core diff --git a/basic/jpa/src/main/java/org/springframework/integration/samples/jpa/EclipseLinkAutoConfiguration.java b/basic/jpa/src/main/java/org/springframework/integration/samples/jpa/EclipseLinkAutoConfiguration.java index 9bc70e0c..7205fd7a 100644 --- a/basic/jpa/src/main/java/org/springframework/integration/samples/jpa/EclipseLinkAutoConfiguration.java +++ b/basic/jpa/src/main/java/org/springframework/integration/samples/jpa/EclipseLinkAutoConfiguration.java @@ -1,15 +1,34 @@ +/* + * Copyright 2016 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.springframework.integration.samples.jpa; import java.util.HashMap; import java.util.Map; import javax.persistence.EntityManager; +import javax.sql.DataSource; +import org.springframework.beans.factory.ObjectProvider; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionOutcome; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.SpringBootCondition; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; import org.springframework.boot.autoconfigure.orm.jpa.JpaBaseConfiguration; +import org.springframework.boot.autoconfigure.orm.jpa.JpaProperties; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; @@ -21,6 +40,7 @@ import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean; import org.springframework.orm.jpa.vendor.AbstractJpaVendorAdapter; import org.springframework.orm.jpa.vendor.EclipseLinkJpaVendorAdapter; import org.springframework.transaction.annotation.EnableTransactionManagement; +import org.springframework.transaction.jta.JtaTransactionManager; import org.springframework.util.ClassUtils; /** @@ -35,6 +55,11 @@ import org.springframework.util.ClassUtils; @Profile("eclipseLink") public class EclipseLinkAutoConfiguration extends JpaBaseConfiguration { + public EclipseLinkAutoConfiguration(DataSource dataSource, JpaProperties properties, + ObjectProvider jtaTransactionManagerProvider) { + super(dataSource, properties, jtaTransactionManagerProvider); + } + @Override protected AbstractJpaVendorAdapter createJpaVendorAdapter() { return new EclipseLinkJpaVendorAdapter(); diff --git a/basic/jpa/src/main/java/org/springframework/integration/samples/jpa/OpenJpaAutoConfiguration.java b/basic/jpa/src/main/java/org/springframework/integration/samples/jpa/OpenJpaAutoConfiguration.java index 7b184687..91d3a52b 100644 --- a/basic/jpa/src/main/java/org/springframework/integration/samples/jpa/OpenJpaAutoConfiguration.java +++ b/basic/jpa/src/main/java/org/springframework/integration/samples/jpa/OpenJpaAutoConfiguration.java @@ -1,15 +1,34 @@ +/* + * Copyright 2016 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.springframework.integration.samples.jpa; import java.util.HashMap; import java.util.Map; import javax.persistence.EntityManager; +import javax.sql.DataSource; +import org.springframework.beans.factory.ObjectProvider; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionOutcome; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.SpringBootCondition; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; import org.springframework.boot.autoconfigure.orm.jpa.JpaBaseConfiguration; +import org.springframework.boot.autoconfigure.orm.jpa.JpaProperties; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; @@ -21,6 +40,7 @@ import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean; import org.springframework.orm.jpa.vendor.AbstractJpaVendorAdapter; import org.springframework.orm.jpa.vendor.OpenJpaVendorAdapter; import org.springframework.transaction.annotation.EnableTransactionManagement; +import org.springframework.transaction.jta.JtaTransactionManager; import org.springframework.util.ClassUtils; /** @@ -35,6 +55,11 @@ import org.springframework.util.ClassUtils; @Profile("openJpa") public class OpenJpaAutoConfiguration extends JpaBaseConfiguration { + public OpenJpaAutoConfiguration(DataSource dataSource, JpaProperties properties, + ObjectProvider jtaTransactionManagerProvider) { + super(dataSource, properties, jtaTransactionManagerProvider); + } + @Override protected AbstractJpaVendorAdapter createJpaVendorAdapter() { return new OpenJpaVendorAdapter(); diff --git a/basic/jpa/src/main/resources/application.yml b/basic/jpa/src/main/resources/application.yml index 4ccb5c9e..97ea467f 100644 --- a/basic/jpa/src/main/resources/application.yml +++ b/basic/jpa/src/main/resources/application.yml @@ -2,7 +2,7 @@ spring: jpa: generate-ddl: false hibernate: - ddl-auto: false + ddl-auto: none show-sql: true main: banner-mode: "off" diff --git a/basic/jpa/src/main/resources/schema.sql b/basic/jpa/src/main/resources/schema.sql index 6e2fa513..1ec4cc38 100644 --- a/basic/jpa/src/main/resources/schema.sql +++ b/basic/jpa/src/main/resources/schema.sql @@ -1,5 +1,6 @@ drop table if EXISTS PEOPLE; DROP TABLE if EXISTS OPENJPA_SEQUENCE_TABLE; +DROP TABLE if EXISTS SEQUENCE; CREATE TABLE OPENJPA_SEQUENCE_TABLE (ID TINYINT NOT NULL, SEQUENCE_VALUE BIGINT, PRIMARY KEY (ID)); diff --git a/basic/jpa/src/test/java/org/springframework/integration/samples/jpa/JpaTests.java b/basic/jpa/src/test/java/org/springframework/integration/samples/jpa/JpaTests.java index f41295aa..6209874d 100644 --- a/basic/jpa/src/test/java/org/springframework/integration/samples/jpa/JpaTests.java +++ b/basic/jpa/src/test/java/org/springframework/integration/samples/jpa/JpaTests.java @@ -26,7 +26,7 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration; -import org.springframework.boot.test.SpringApplicationConfiguration; +import org.springframework.boot.test.context.SpringBootTest; import org.springframework.integration.samples.jpa.domain.Person; import org.springframework.integration.samples.jpa.service.PersonService; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -38,7 +38,8 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; * */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = {Main.class, HibernateJpaAutoConfiguration.class}) +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, + classes = {Main.class, HibernateJpaAutoConfiguration.class}) public class JpaTests { @Autowired diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index a7368528..bf93ec9d 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.M1 + 1.4.0.M2 org.springframework.integration.samples kafka @@ -57,16 +57,10 @@ https://github.com/spring-projects/spring-integration-samples - - org.springframework.integration - spring-integration-core - 4.3.0.M1 - compile - junit junit - 4.11 + 4.12 test @@ -75,12 +69,6 @@ 1.3 test - - org.springframework - spring-test - 4.2.5.RELEASE - test - org.springframework.boot spring-boot-starter-test @@ -103,6 +91,18 @@ 1.0.0.M2 compile + + org.springframework + spring-test + 4.3.0.RC2 + test + + + org.springframework.integration + spring-integration-core + 4.3.0.RC1 + compile + org.mockito mockito-core diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index ff0f2dae..584d9594 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -68,7 +68,7 @@ junit junit - 4.11 + 4.12 test @@ -79,15 +79,15 @@ org.springframework - spring-test - 4.2.5.RELEASE - test + spring-context + 4.3.0.RC2 + compile - org.springframework.integration - spring-integration-mail - 4.3.0.M1 - compile + org.springframework + spring-test + 4.3.0.RC2 + test log4j @@ -102,9 +102,9 @@ test - org.springframework - spring-context - 4.2.5.RELEASE + org.springframework.integration + spring-integration-mail + 4.3.0.RC1 compile diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index 8f4a8ec4..29d35dac 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -56,9 +56,15 @@ junit junit - 4.11 + 4.12 test + + org.springframework.integration + spring-integration-mongodb + 4.3.0.RC1 + compile + org.hamcrest hamcrest-all @@ -68,15 +74,9 @@ org.springframework spring-test - 4.2.5.RELEASE + 4.3.0.RC2 test - - org.springframework.integration - spring-integration-mongodb - 4.3.0.M1 - compile - log4j log4j diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index 3b9451dc..580760c8 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.M1 + 1.4.0.M2 org.springframework.integration.samples mqtt @@ -57,10 +57,22 @@ https://github.com/spring-projects/spring-integration-samples + + org.springframework.integration + spring-integration-mqtt + 4.3.0.RC1 + compile + + + org.springframework.integration + spring-integration-stream + 4.3.0.RC1 + compile + junit junit - 4.11 + 4.12 test @@ -69,12 +81,6 @@ 1.3 test - - org.springframework - spring-test - 4.2.5.RELEASE - test - org.springframework.boot spring-boot-starter-integration @@ -87,16 +93,10 @@ compile - org.springframework.integration - spring-integration-stream - 4.3.0.M1 - compile - - - org.springframework.integration - spring-integration-mqtt - 4.3.0.M1 - compile + org.springframework + spring-test + 4.3.0.RC2 + test org.mockito diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index 789a3f30..61cbaec7 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -53,16 +53,10 @@ https://github.com/spring-projects/spring-integration-samples - - org.springframework.integration - spring-integration-core - 4.3.0.M1 - compile - junit junit - 4.11 + 4.12 test @@ -74,9 +68,15 @@ org.springframework spring-test - 4.2.5.RELEASE + 4.3.0.RC2 test + + org.springframework.integration + spring-integration-core + 4.3.0.RC1 + compile + log4j log4j diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index 7ff9bd23..f0099f0a 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -53,10 +53,16 @@ https://github.com/spring-projects/spring-integration-samples + + org.springframework.integration + spring-integration-stream + 4.3.0.RC1 + compile + junit junit - 4.11 + 4.12 test @@ -68,15 +74,9 @@ org.springframework spring-test - 4.2.5.RELEASE + 4.3.0.RC2 test - - org.springframework.integration - spring-integration-stream - 4.3.0.M1 - compile - log4j log4j diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index 2846fe62..a2b54830 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -56,7 +56,7 @@ junit junit - 4.11 + 4.12 test @@ -65,30 +65,30 @@ 1.3 test - - org.springframework - spring-test - 4.2.5.RELEASE - test - - - org.springframework.integration - spring-integration-sftp - 4.3.0.M1 - compile - org.apache.sshd sshd-core 0.13.0 compile + + org.springframework + spring-test + 4.3.0.RC2 + test + log4j log4j 1.2.17 compile + + org.springframework.integration + spring-integration-sftp + 4.3.0.RC1 + compile + org.mockito mockito-core diff --git a/basic/splunk/pom.xml b/basic/splunk/pom.xml index 117d8944..9eb84529 100644 --- a/basic/splunk/pom.xml +++ b/basic/splunk/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.M1 + 1.4.0.M2 org.springframework.integration.samples splunk @@ -57,16 +57,10 @@ https://github.com/spring-projects/spring-integration-samples - - org.springframework.integration - spring-integration-core - 4.3.0.M1 - compile - junit junit - 4.11 + 4.12 test @@ -75,12 +69,6 @@ 1.3 test - - org.springframework - spring-test - 4.2.5.RELEASE - test - org.springframework.boot spring-boot-starter-test @@ -91,6 +79,18 @@ spring-boot-starter-integration compile + + org.springframework + spring-test + 4.3.0.RC2 + test + + + org.springframework.integration + spring-integration-core + 4.3.0.RC1 + compile + org.mockito mockito-core diff --git a/basic/splunk/src/test/java/org/springframework/integration/samples/splunk/ApplicationTests.java b/basic/splunk/src/test/java/org/springframework/integration/samples/splunk/ApplicationTests.java index d273666b..79aaa114 100644 --- a/basic/splunk/src/test/java/org/springframework/integration/samples/splunk/ApplicationTests.java +++ b/basic/splunk/src/test/java/org/springframework/integration/samples/splunk/ApplicationTests.java @@ -19,7 +19,8 @@ package org.springframework.integration.samples.splunk; import org.junit.ClassRule; import org.junit.Test; import org.junit.runner.RunWith; -import org.springframework.boot.test.SpringApplicationConfiguration; + +import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; /** @@ -27,7 +28,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; * @since 4.2 */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = Application.class) +@SpringBootTest(classes = Application.class) public class ApplicationTests { @ClassRule diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index c369e65e..e5e192d8 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -62,7 +62,7 @@ junit junit - 4.11 + 4.12 test @@ -72,17 +72,23 @@ test - org.springframework - spring-test - 4.2.5.RELEASE - test + org.springframework.integration + spring-integration-amqp + 4.3.0.RC1 + compile org.springframework.integration spring-integration-ip - 4.3.0.M1 + 4.3.0.RC1 compile + + org.springframework + spring-test + 4.3.0.RC2 + test + log4j log4j @@ -101,12 +107,6 @@ 1.9.5 test - - org.springframework.integration - spring-integration-amqp - 4.3.0.M1 - compile - diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index ba613a5c..292f2037 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -53,18 +53,18 @@ https://github.com/spring-projects/spring-integration-samples + + junit + junit + 4.12 + test + commons-lang commons-lang 2.6 compile - - junit - junit - 4.11 - test - org.hamcrest hamcrest-all @@ -72,29 +72,29 @@ test - org.springframework - spring-test - 4.2.5.RELEASE - test + org.springframework.integration + spring-integration-test + 4.3.0.RC1 + compile org.springframework.integration spring-integration-ip - 4.3.0.M1 + 4.3.0.RC1 compile + + org.springframework + spring-test + 4.3.0.RC2 + test + log4j log4j 1.2.17 compile - - org.springframework.integration - spring-integration-test - 4.3.0.M1 - compile - org.mockito mockito-core diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index c444d909..51d00e94 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -54,46 +54,46 @@ - org.springframework - spring-webmvc - 4.2.5.RELEASE - compile + junit + junit + 4.12 + test org.springframework.integration - spring-integration-ws - 4.3.0.M1 + spring-integration-file + 4.3.0.RC1 compile - - junit - junit - 4.11 - test - org.hamcrest hamcrest-all 1.3 test + + org.springframework.integration + spring-integration-ws + 4.3.0.RC1 + compile + org.springframework - spring-test - 4.2.5.RELEASE + spring-webmvc + 4.3.0.RC2 + compile + + + org.springframework.integration + spring-integration-test + 4.3.0.RC1 test - org.springframework.integration - spring-integration-http - 4.3.0.M1 - compile - - - org.springframework.integration - spring-integration-file - 4.3.0.M1 - compile + org.springframework + spring-test + 4.3.0.RC2 + test log4j @@ -101,18 +101,18 @@ 1.2.17 compile + + org.springframework.integration + spring-integration-http + 4.3.0.RC1 + compile + org.mockito mockito-core 1.9.5 test - - org.springframework.integration - spring-integration-test - 4.3.0.M1 - test - diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index dbf38e00..47066391 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -53,10 +53,16 @@ https://github.com/spring-projects/spring-integration-samples + + org.springframework.integration + spring-integration-twitter + 4.3.0.RC1 + compile + junit junit - 4.11 + 4.12 test @@ -68,15 +74,9 @@ org.springframework spring-test - 4.2.5.RELEASE + 4.3.0.RC2 test - - org.springframework.integration - spring-integration-twitter - 4.3.0.M1 - compile - log4j log4j diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index fc7de02c..91c9c3ab 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.M1 + 1.4.0.M2 org.springframework.integration.samples web-sockets @@ -57,17 +57,17 @@ https://github.com/spring-projects/spring-integration-samples + + junit + junit + 4.12 + test + org.springframework.boot spring-boot-starter-websocket compile - - junit - junit - 4.11 - test - org.springframework.integration spring-integration-websocket @@ -80,14 +80,14 @@ test - org.springframework - spring-test - 4.2.5.RELEASE + org.springframework.boot + spring-boot-starter-test test - org.springframework.boot - spring-boot-starter-test + org.springframework + spring-test + 4.3.0.RC2 test diff --git a/basic/web-sockets/src/test/java/org/springframework/integration/samples/websocket/standard/ApplicationTests.java b/basic/web-sockets/src/test/java/org/springframework/integration/samples/websocket/standard/ApplicationTests.java index ea23753a..de3906b7 100644 --- a/basic/web-sockets/src/test/java/org/springframework/integration/samples/websocket/standard/ApplicationTests.java +++ b/basic/web-sockets/src/test/java/org/springframework/integration/samples/websocket/standard/ApplicationTests.java @@ -31,9 +31,8 @@ import java.util.concurrent.TimeUnit; import org.junit.Test; import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.test.IntegrationTest; -import org.springframework.boot.test.SpringApplicationConfiguration; +import org.springframework.boot.context.web.LocalServerPort; +import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.channel.DirectChannel; @@ -42,19 +41,16 @@ import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; import org.springframework.messaging.support.ChannelInterceptorAdapter; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.web.WebAppConfiguration; /** * @author Artem Bilan * @since 3.0 */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = Application.class) -@WebAppConfiguration -@IntegrationTest({"server.port=0", "management.port=0"}) +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = Application.class) public class ApplicationTests { - @Value("${local.server.port}") + @LocalServerPort private String port; @Test diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index 41dc8014..f9331d78 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -52,22 +52,16 @@ https://github.com/spring-projects/spring-integration-samples - - org.springframework - spring-webmvc - 4.2.5.RELEASE - compile - org.springframework.integration - spring-integration-ws - 4.3.0.M1 + spring-integration-xml + 4.3.0.RC1 compile junit junit - 4.11 + 4.12 test @@ -76,10 +70,22 @@ 1.3 test + + org.springframework.integration + spring-integration-ws + 4.3.0.RC1 + compile + + + org.springframework + spring-webmvc + 4.3.0.RC2 + compile + org.springframework spring-test - 4.2.5.RELEASE + 4.3.0.RC2 test @@ -88,12 +94,6 @@ 1.2.17 compile - - org.springframework.integration - spring-integration-xml - 4.3.0.M1 - compile - org.mockito mockito-core diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index cb8fe379..81165a93 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -55,14 +55,14 @@ org.springframework.integration - spring-integration-ws - 4.3.0.M1 + spring-integration-stream + 4.3.0.RC1 compile junit junit - 4.11 + 4.12 test @@ -72,16 +72,16 @@ test - org.springframework - spring-test - 4.2.5.RELEASE - test + org.springframework.integration + spring-integration-ws + 4.3.0.RC1 + compile - org.springframework.integration - spring-integration-stream - 4.3.0.M1 - compile + org.springframework + spring-test + 4.3.0.RC2 + test log4j diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index 0c0320d8..8fdf8f55 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -53,10 +53,16 @@ https://github.com/spring-projects/spring-integration-samples + + org.springframework.integration + spring-integration-xml + 4.3.0.RC1 + compile + junit junit - 4.11 + 4.12 test @@ -68,7 +74,7 @@ org.springframework spring-test - 4.2.5.RELEASE + 4.3.0.RC2 test @@ -77,12 +83,6 @@ 1.2.17 compile - - org.springframework.integration - spring-integration-xml - 4.3.0.M1 - compile - org.mockito mockito-core diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index dc7f0fae..cb149a86 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -56,7 +56,7 @@ junit junit - 4.11 + 4.12 test @@ -65,18 +65,18 @@ 1.3 test - - org.springframework - spring-test - 4.2.5.RELEASE - test - org.springframework.integration spring-integration-xmpp - 4.3.0.M1 + 4.3.0.RC1 compile + + org.springframework + spring-test + 4.3.0.RC2 + test + log4j log4j diff --git a/build.gradle b/build.gradle index b773a269..8538f912 100644 --- a/build.gradle +++ b/build.gradle @@ -164,7 +164,7 @@ subprojects { subproject -> derbyVersion = '10.10.1.1' eclipseLinkVersion = '2.4.2' hamcrestVersion = '1.3' - hibernateVersion = '4.3.11.Final' + hibernateVersion = '5.1.0.Final' hibernateValidatorVersion = '4.2.0.Final' ftpServerVersion = '1.0.6' flexjsonVersion = '2.0' @@ -184,7 +184,7 @@ subprojects { subproject -> jpa21ApiVersion = '1.0.0.Final' jpaApiVersion = '2.0.0' jstlVersion = '1.2' - junitVersion = '4.11' + junitVersion = '4.12' jythonVersion = '2.5.3' log4jVersion = '1.2.17' mockitoVersion = '1.9.5' @@ -199,7 +199,7 @@ subprojects { subproject -> springIntegrationKafkaVersion = '2.0.0.M1' springIntegrationSplunkVersion = '1.1.0.RELEASE' springKafkaVersion = '1.0.0.M2' - springVersion = '4.2.5.RELEASE' + springVersion = '4.3.0.RC2' springSecurityVersion = '4.0.2.RELEASE' springWebFlowVersion = '2.3.3.RELEASE' tilesJspVersion = '2.2.1' diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index 6e94c6bf..1901921a 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.M1 + 1.4.0.M2 org.springframework.integration.samples cafe-dsl @@ -58,15 +58,15 @@ - org.springframework.integration - spring-integration-core - 4.3.0.M1 + org.springframework.integration.samples + cafe-si + 4.3.0.BUILD-SNAPSHOT compile junit junit - 4.11 + 4.12 test @@ -75,12 +75,6 @@ 1.3 test - - org.springframework - spring-test - 4.2.5.RELEASE - test - com.google.guava guava @@ -110,9 +104,15 @@ compile - org.springframework.integration.samples - cafe-si - 4.3.0.BUILD-SNAPSHOT + org.springframework + spring-test + 4.3.0.RC2 + test + + + org.springframework.integration + spring-integration-core + 4.3.0.RC1 compile diff --git a/dsl/pom.xml b/dsl/pom.xml index 46b362c5..07aeec50 100644 --- a/dsl/pom.xml +++ b/dsl/pom.xml @@ -54,7 +54,7 @@ junit junit - 4.11 + 4.12 test @@ -66,7 +66,7 @@ org.springframework spring-test - 4.2.5.RELEASE + 4.3.0.RC2 test diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index 90927310..247afe16 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.M1 + 1.4.0.M2 org.springframework.integration.samples si4demo @@ -69,6 +69,12 @@ 1.5.2 compile + + junit + junit + 4.12 + test + com.sun.mail pop3 @@ -76,22 +82,16 @@ compile - junit - junit - 4.11 - test + org.springframework.boot + spring-boot-starter-web + compile org.springframework spring-test - 4.2.5.RELEASE + 4.3.0.RC2 test - - org.springframework.boot - spring-boot-starter-web - compile - com.rometools rome diff --git a/dsl/si4demo/src/test/java/org/springframework/integration/samples/si4demo/ApplicationTests.java b/dsl/si4demo/src/test/java/org/springframework/integration/samples/si4demo/ApplicationTests.java index 40d86611..89798b00 100644 --- a/dsl/si4demo/src/test/java/org/springframework/integration/samples/si4demo/ApplicationTests.java +++ b/dsl/si4demo/src/test/java/org/springframework/integration/samples/si4demo/ApplicationTests.java @@ -3,14 +3,12 @@ package org.springframework.integration.samples.si4demo; import org.junit.Test; import org.junit.runner.RunWith; -import org.springframework.boot.test.SpringApplicationConfiguration; +import org.springframework.boot.test.context.SpringBootTest; import org.springframework.integration.samples.si4demo.annotations.Application; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.web.WebAppConfiguration; @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = Application.class) -@WebAppConfiguration +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = Application.class) public class ApplicationTests { @Test diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index e8a78e67..9ca6913f 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -53,16 +53,10 @@ https://github.com/spring-projects/spring-integration-samples - - org.springframework.integration - spring-integration-core - 4.3.0.M1 - compile - junit junit - 4.11 + 4.12 test @@ -71,18 +65,24 @@ 1.3 test - - org.springframework - spring-test - 4.2.5.RELEASE - test - io.projectreactor reactor-stream 2.0.7.RELEASE compile + + org.springframework + spring-test + 4.3.0.RC2 + test + + + org.springframework.integration + spring-integration-core + 4.3.0.RC1 + compile + log4j log4j diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index 0cd450ce..4ccbe8be 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -53,16 +53,10 @@ https://github.com/spring-projects/spring-integration-samples - - org.springframework.integration - spring-integration-core - 4.3.0.M1 - compile - junit junit - 4.11 + 4.12 test @@ -74,9 +68,15 @@ org.springframework spring-test - 4.2.5.RELEASE + 4.3.0.RC2 test + + org.springframework.integration + spring-integration-core + 4.3.0.RC1 + compile + log4j log4j diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index c7db8262..f7b34311 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -53,10 +53,16 @@ https://github.com/spring-projects/spring-integration-samples + + org.springframework.integration + spring-integration-stream + 4.3.0.RC1 + compile + junit junit - 4.11 + 4.12 test @@ -68,15 +74,9 @@ org.springframework spring-test - 4.2.5.RELEASE + 4.3.0.RC2 test - - org.springframework.integration - spring-integration-stream - 4.3.0.M1 - compile - log4j log4j diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index fa9ec5f8..7e00b802 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -56,9 +56,15 @@ junit junit - 4.11 + 4.12 test + + org.springframework.integration + spring-integration-file + 4.3.0.RC1 + compile + org.hamcrest hamcrest-all @@ -68,15 +74,9 @@ org.springframework spring-test - 4.2.5.RELEASE + 4.3.0.RC2 test - - org.springframework.integration - spring-integration-file - 4.3.0.M1 - compile - log4j log4j diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index 4f38503e..0ce367bb 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -68,33 +68,33 @@ junit junit - 4.11 + 4.12 test + + org.springframework.integration + spring-integration-file + 4.3.0.RC1 + compile + org.hamcrest hamcrest-all 1.3 test - - org.springframework - spring-test - 4.2.5.RELEASE - test - - - org.springframework.integration - spring-integration-mail - 4.3.0.M1 - compile - commons-io commons-io 2.4 compile + + org.springframework.integration + spring-integration-test + 4.3.0.RC1 + test + org.subethamail subethasmtp-wiser @@ -102,10 +102,10 @@ test - org.springframework.integration - spring-integration-file - 4.3.0.M1 - compile + org.springframework + spring-test + 4.3.0.RC2 + test log4j @@ -121,9 +121,9 @@ org.springframework.integration - spring-integration-test - 4.3.0.M1 - test + spring-integration-mail + 4.3.0.RC1 + compile diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index e5ee75c7..49d640e9 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -53,9 +53,9 @@ - org.springframework - spring-webmvc - 4.2.5.RELEASE + org.springframework.integration + spring-integration-twitter + 4.3.0.RC1 compile @@ -67,7 +67,7 @@ junit junit - 4.11 + 4.12 test @@ -78,28 +78,28 @@ org.springframework - spring-test - 4.2.5.RELEASE - test - - - org.springframework.integration - spring-integration-twitter - 4.3.0.M1 - compile - - - org.springframework.integration - spring-integration-groovy - 4.3.0.M1 + spring-webmvc + 4.3.0.RC2 compile org.springframework.integration spring-integration-jmx - 4.3.0.M1 + 4.3.0.RC1 compile + + org.springframework.integration + spring-integration-groovy + 4.3.0.RC1 + compile + + + org.springframework + spring-test + 4.3.0.RC2 + test + log4j log4j diff --git a/intermediate/monitoring/src/main/java/org/springframework/integration/samples/storedprocedure/model/TwitterMessage.java b/intermediate/monitoring/src/main/java/org/springframework/integration/model/TwitterMessage.java similarity index 97% rename from intermediate/monitoring/src/main/java/org/springframework/integration/samples/storedprocedure/model/TwitterMessage.java rename to intermediate/monitoring/src/main/java/org/springframework/integration/model/TwitterMessage.java index 3d803fcb..3c1b25fd 100644 --- a/intermediate/monitoring/src/main/java/org/springframework/integration/samples/storedprocedure/model/TwitterMessage.java +++ b/intermediate/monitoring/src/main/java/org/springframework/integration/model/TwitterMessage.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.integration.samples.storedprocedure.model; +package org.springframework.integration.model; import java.util.Date; diff --git a/intermediate/monitoring/src/main/java/org/springframework/integration/mvc/controller/HomeController.java b/intermediate/monitoring/src/main/java/org/springframework/integration/mvc/controller/HomeController.java index 47c7ea6c..5da25d22 100644 --- a/intermediate/monitoring/src/main/java/org/springframework/integration/mvc/controller/HomeController.java +++ b/intermediate/monitoring/src/main/java/org/springframework/integration/mvc/controller/HomeController.java @@ -21,7 +21,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.samples.storedprocedure.model.TwitterMessage; +import org.springframework.integration.model.TwitterMessage; import org.springframework.integration.service.TwitterService; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; diff --git a/intermediate/monitoring/src/main/java/org/springframework/integration/samples/storedprocedure/service/TwitterService.java b/intermediate/monitoring/src/main/java/org/springframework/integration/service/TwitterService.java similarity index 91% rename from intermediate/monitoring/src/main/java/org/springframework/integration/samples/storedprocedure/service/TwitterService.java rename to intermediate/monitoring/src/main/java/org/springframework/integration/service/TwitterService.java index dccc7dcd..f0da107e 100644 --- a/intermediate/monitoring/src/main/java/org/springframework/integration/samples/storedprocedure/service/TwitterService.java +++ b/intermediate/monitoring/src/main/java/org/springframework/integration/service/TwitterService.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2016 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,7 @@ package org.springframework.integration.service; import java.util.Collection; -import org.springframework.integration.samples.storedprocedure.model.TwitterMessage; +import org.springframework.integration.model.TwitterMessage; /** diff --git a/intermediate/monitoring/src/main/java/org/springframework/integration/samples/storedprocedure/service/impl/DummyTwitter.java b/intermediate/monitoring/src/main/java/org/springframework/integration/service/impl/DummyTwitter.java similarity index 92% rename from intermediate/monitoring/src/main/java/org/springframework/integration/samples/storedprocedure/service/impl/DummyTwitter.java rename to intermediate/monitoring/src/main/java/org/springframework/integration/service/impl/DummyTwitter.java index 34ac5eb4..259bcf9e 100644 --- a/intermediate/monitoring/src/main/java/org/springframework/integration/samples/storedprocedure/service/impl/DummyTwitter.java +++ b/intermediate/monitoring/src/main/java/org/springframework/integration/service/impl/DummyTwitter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2016 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,6 +28,8 @@ public class DummyTwitter { private long id; + + @SuppressWarnings("deprecation") public Tweet getTweet() { Tweet tweet = new Tweet(++this.id, "" + this.id, "Spring Integration is the coolest Enterprise Integration project", diff --git a/intermediate/monitoring/src/main/java/org/springintegration/service/impl/DefaultTwitterService.java b/intermediate/monitoring/src/main/java/org/springintegration/service/impl/DefaultTwitterService.java index d7004fa8..4011e612 100644 --- a/intermediate/monitoring/src/main/java/org/springintegration/service/impl/DefaultTwitterService.java +++ b/intermediate/monitoring/src/main/java/org/springintegration/service/impl/DefaultTwitterService.java @@ -22,7 +22,7 @@ import java.util.Map; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.integration.endpoint.SourcePollingChannelAdapter; -import org.springframework.integration.samples.storedprocedure.model.TwitterMessage; +import org.springframework.integration.model.TwitterMessage; import org.springframework.integration.monitor.IntegrationMBeanExporter; import org.springframework.integration.service.TwitterService; import org.springframework.integration.support.MessageBuilder; diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index e8429682..9dba0220 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -52,16 +52,10 @@ https://github.com/spring-projects/spring-integration-samples - - org.springframework - spring-webmvc - 4.2.5.RELEASE - compile - junit junit - 4.11 + 4.12 test @@ -72,14 +66,8 @@ org.springframework - spring-test - 4.2.5.RELEASE - test - - - org.springframework.integration - spring-integration-http - 4.3.0.M1 + spring-webmvc + 4.3.0.RC2 compile @@ -88,6 +76,12 @@ 2.4 compile + + org.springframework + spring-test + 4.3.0.RC2 + test + log4j log4j @@ -100,6 +94,12 @@ 1.2.2 compile + + org.springframework.integration + spring-integration-http + 4.3.0.RC1 + compile + com.fasterxml.jackson.core jackson-databind diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index 08c41c0f..9362ac9e 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -54,26 +54,26 @@ org.springframework - spring-oxm - 4.2.5.RELEASE + spring-aop + 4.3.0.RC2 + compile + + + org.springframework + spring-jdbc + 4.3.0.RC2 compile junit junit - 4.11 + 4.12 test org.springframework - spring-test - 4.2.5.RELEASE - test - - - org.springframework.integration - spring-integration-http - 4.3.0.M1 + spring-webmvc + 4.3.0.RC2 compile @@ -84,20 +84,26 @@ org.springframework - spring-aop - 4.2.5.RELEASE + spring-oxm + 4.3.0.RC2 compile org.springframework - spring-context - 4.2.5.RELEASE + spring-test + 4.3.0.RC2 + test + + + org.springframework.integration + spring-integration-http + 4.3.0.RC1 compile org.springframework - spring-webmvc - 4.2.5.RELEASE + spring-tx + 4.3.0.RC2 compile @@ -114,8 +120,8 @@ org.springframework - spring-tx - 4.2.5.RELEASE + spring-context + 4.3.0.RC2 compile @@ -142,12 +148,6 @@ 1.9.5 test - - org.springframework - spring-jdbc - 4.2.5.RELEASE - compile - diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index 9e34ea12..3a293b61 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -53,42 +53,48 @@ https://github.com/spring-projects/spring-integration-samples + + org.springframework.integration + spring-integration-stream + 4.3.0.RC1 + compile + junit junit - 4.11 + 4.12 test + + org.springframework.integration + spring-integration-file + 4.3.0.RC1 + compile + + + org.springframework.integration + spring-integration-ftp + 4.3.0.RC1 + compile + org.hamcrest hamcrest-all 1.3 compile + + org.springframework.integration + spring-integration-amqp + 4.3.0.RC1 + compile + org.springframework spring-test - 4.2.5.RELEASE + 4.3.0.RC2 test - - org.springframework.integration - spring-integration-ftp - 4.3.0.M1 - compile - - - org.springframework.integration - spring-integration-stream - 4.3.0.M1 - compile - - - org.springframework.integration - spring-integration-file - 4.3.0.M1 - compile - log4j log4j @@ -101,12 +107,6 @@ 1.9.5 compile - - org.springframework.integration - spring-integration-amqp - 4.3.0.M1 - compile - diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index df002b23..8f3c9edc 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -53,16 +53,10 @@ https://github.com/spring-projects/spring-integration-samples - - org.springframework.integration - spring-integration-core - 4.3.0.M1 - compile - junit junit - 4.11 + 4.12 test @@ -71,18 +65,24 @@ 1.3 test - - org.springframework - spring-test - 4.2.5.RELEASE - test - javax.inject javax.inject 1 compile + + org.springframework + spring-test + 4.3.0.RC2 + test + + + org.springframework.integration + spring-integration-core + 4.3.0.RC1 + compile + log4j log4j diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index d3b24e63..6e7a7044 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -56,7 +56,7 @@ junit junit - 4.11 + 4.12 test @@ -71,18 +71,18 @@ 1.3 test - - org.springframework - spring-test - 4.2.5.RELEASE - test - org.springframework.integration spring-integration-jdbc - 4.3.0.M1 + 4.3.0.RC1 compile + + org.springframework + spring-test + 4.3.0.RC2 + test + log4j log4j diff --git a/intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/samples/storedprocedure/model/CoffeeBeverage.java b/intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/model/CoffeeBeverage.java similarity index 97% rename from intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/samples/storedprocedure/model/CoffeeBeverage.java rename to intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/model/CoffeeBeverage.java index 7973d889..74440472 100644 --- a/intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/samples/storedprocedure/model/CoffeeBeverage.java +++ b/intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/model/CoffeeBeverage.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.integration.samples.storedprocedure.model; +package org.springframework.integration.model; /** * diff --git a/intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/samples/storedprocedure/Main.java b/intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/samples/storedprocedure/Main.java index f42c169f..fd515e64 100644 --- a/intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/samples/storedprocedure/Main.java +++ b/intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/samples/storedprocedure/Main.java @@ -22,8 +22,8 @@ import org.apache.log4j.Logger; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.samples.storedprocedure.model.CoffeeBeverage; -import org.springframework.integration.samples.storedprocedure.service.CoffeeService; +import org.springframework.integration.model.CoffeeBeverage; +import org.springframework.integration.service.CoffeeService; /** diff --git a/intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/samples/storedprocedure/support/CoffeBeverageMapper.java b/intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/samples/storedprocedure/support/CoffeBeverageMapper.java index 976b4151..a39878a4 100644 --- a/intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/samples/storedprocedure/support/CoffeBeverageMapper.java +++ b/intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/samples/storedprocedure/support/CoffeBeverageMapper.java @@ -15,7 +15,7 @@ package org.springframework.integration.samples.storedprocedure.support; import java.sql.ResultSet; import java.sql.SQLException; -import org.springframework.integration.samples.storedprocedure.model.CoffeeBeverage; +import org.springframework.integration.model.CoffeeBeverage; import org.springframework.jdbc.core.RowMapper; /** diff --git a/intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/samples/storedprocedure/service/CoffeeService.java b/intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/service/CoffeeService.java similarity index 89% rename from intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/samples/storedprocedure/service/CoffeeService.java rename to intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/service/CoffeeService.java index 8613a2c9..50cd7d80 100644 --- a/intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/samples/storedprocedure/service/CoffeeService.java +++ b/intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/service/CoffeeService.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.integration.samples.storedprocedure.service; +package org.springframework.integration.service; import java.util.List; -import org.springframework.integration.samples.storedprocedure.model.CoffeeBeverage; +import org.springframework.integration.model.CoffeeBeverage; import org.springframework.messaging.handler.annotation.Payload; diff --git a/intermediate/stored-procedures-derby/src/main/resources/META-INF/spring/integration/spring-integration-context.xml b/intermediate/stored-procedures-derby/src/main/resources/META-INF/spring/integration/spring-integration-context.xml index 9b37e386..a408cf3a 100644 --- a/intermediate/stored-procedures-derby/src/main/resources/META-INF/spring/integration/spring-integration-context.xml +++ b/intermediate/stored-procedures-derby/src/main/resources/META-INF/spring/integration/spring-integration-context.xml @@ -20,7 +20,7 @@ + service-interface="org.springframework.integration.service.CoffeeService"> diff --git a/intermediate/stored-procedures-derby/src/test/java/org/springframework/integration/CoffeeServiceFindAllTest.java b/intermediate/stored-procedures-derby/src/test/java/org/springframework/integration/CoffeeServiceFindAllTest.java index 4d67eb01..e35358b1 100644 --- a/intermediate/stored-procedures-derby/src/test/java/org/springframework/integration/CoffeeServiceFindAllTest.java +++ b/intermediate/stored-procedures-derby/src/test/java/org/springframework/integration/CoffeeServiceFindAllTest.java @@ -24,8 +24,8 @@ import org.junit.Test; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.samples.storedprocedure.model.CoffeeBeverage; -import org.springframework.integration.samples.storedprocedure.service.CoffeeService; +import org.springframework.integration.model.CoffeeBeverage; +import org.springframework.integration.service.CoffeeService; /** * @author Gunnar Hillert diff --git a/intermediate/stored-procedures-derby/src/test/java/org/springframework/integration/CoffeeServiceFindCoffeeTest.java b/intermediate/stored-procedures-derby/src/test/java/org/springframework/integration/CoffeeServiceFindCoffeeTest.java index a5816c0c..b8e200c1 100644 --- a/intermediate/stored-procedures-derby/src/test/java/org/springframework/integration/CoffeeServiceFindCoffeeTest.java +++ b/intermediate/stored-procedures-derby/src/test/java/org/springframework/integration/CoffeeServiceFindCoffeeTest.java @@ -22,7 +22,7 @@ import org.junit.Test; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.samples.storedprocedure.service.CoffeeService; +import org.springframework.integration.service.CoffeeService; /** * @author Gunnar Hillert diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index 6f9d4d96..619d880e 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -59,36 +59,36 @@ 0.9.1.2 compile + + junit + junit + 4.12 + test + net.sourceforge.jtds jtds 1.2.6 compile - - junit - junit - 4.11 - test - org.hamcrest hamcrest-all 1.3 test - - org.springframework - spring-test - 4.2.5.RELEASE - test - org.springframework.integration spring-integration-jdbc - 4.3.0.M1 + 4.3.0.RC1 compile + + org.springframework + spring-test + 4.3.0.RC2 + test + log4j log4j diff --git a/intermediate/stored-procedures-ms/src/main/java/org/springframework/integration/samples/storedprocedure/Main.java b/intermediate/stored-procedures-ms/src/main/java/org/springframework/integration/samples/storedprocedure/Main.java index ecb5468f..3a92c2b9 100644 --- a/intermediate/stored-procedures-ms/src/main/java/org/springframework/integration/samples/storedprocedure/Main.java +++ b/intermediate/stored-procedures-ms/src/main/java/org/springframework/integration/samples/storedprocedure/Main.java @@ -21,7 +21,7 @@ import org.apache.log4j.Logger; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.samples.storedprocedure.service.StringConversionService; +import org.springframework.integration.service.StringConversionService; /** diff --git a/intermediate/stored-procedures-ms/src/main/java/org/springframework/integration/samples/storedprocedure/service/StringConversionService.java b/intermediate/stored-procedures-ms/src/main/java/org/springframework/integration/service/StringConversionService.java similarity index 93% rename from intermediate/stored-procedures-ms/src/main/java/org/springframework/integration/samples/storedprocedure/service/StringConversionService.java rename to intermediate/stored-procedures-ms/src/main/java/org/springframework/integration/service/StringConversionService.java index 45296757..af54f8fa 100644 --- a/intermediate/stored-procedures-ms/src/main/java/org/springframework/integration/samples/storedprocedure/service/StringConversionService.java +++ b/intermediate/stored-procedures-ms/src/main/java/org/springframework/integration/service/StringConversionService.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.integration.samples.storedprocedure.service; +package org.springframework.integration.service; /** diff --git a/intermediate/stored-procedures-ms/src/main/resources/META-INF/spring/integration/spring-integration-context.xml b/intermediate/stored-procedures-ms/src/main/resources/META-INF/spring/integration/spring-integration-context.xml index fa298ff5..b79d8101 100644 --- a/intermediate/stored-procedures-ms/src/main/resources/META-INF/spring/integration/spring-integration-context.xml +++ b/intermediate/stored-procedures-ms/src/main/resources/META-INF/spring/integration/spring-integration-context.xml @@ -20,7 +20,7 @@ + service-interface="org.springframework.integration.service.StringConversionService"> diff --git a/intermediate/stored-procedures-ms/src/test/java/org/springframework/integration/samples/StringConversionServiceTest.java b/intermediate/stored-procedures-ms/src/test/java/org/springframework/integration/samples/StringConversionServiceTest.java index 9286a3ec..b7399739 100644 --- a/intermediate/stored-procedures-ms/src/test/java/org/springframework/integration/samples/StringConversionServiceTest.java +++ b/intermediate/stored-procedures-ms/src/test/java/org/springframework/integration/samples/StringConversionServiceTest.java @@ -21,7 +21,7 @@ import org.junit.Ignore; import org.junit.Test; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.samples.storedprocedure.service.StringConversionService; +import org.springframework.integration.service.StringConversionService; /** * Verify that the Spring Integration Application Context starts successfully. diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index 84cf214a..e3e5e8bf 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -56,7 +56,7 @@ junit junit - 4.11 + 4.12 test @@ -65,18 +65,18 @@ 1.3 test - - org.springframework - spring-test - 4.2.5.RELEASE - test - org.springframework.integration spring-integration-jdbc - 4.3.0.M1 + 4.3.0.RC1 compile + + org.springframework + spring-test + 4.3.0.RC2 + test + log4j log4j diff --git a/intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/samples/storedprocedure/model/CoffeeBeverage.java b/intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/model/CoffeeBeverage.java similarity index 97% rename from intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/samples/storedprocedure/model/CoffeeBeverage.java rename to intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/model/CoffeeBeverage.java index 21141b70..b752537f 100644 --- a/intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/samples/storedprocedure/model/CoffeeBeverage.java +++ b/intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/model/CoffeeBeverage.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.integration.samples.storedprocedure.model; +package org.springframework.integration.model; /** * diff --git a/intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/samples/storedprocedure/Main.java b/intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/samples/storedprocedure/Main.java index 13366645..b530125e 100644 --- a/intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/samples/storedprocedure/Main.java +++ b/intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/samples/storedprocedure/Main.java @@ -21,9 +21,9 @@ import java.util.Scanner; import org.apache.log4j.Logger; import org.springframework.context.support.GenericXmlApplicationContext; -import org.springframework.integration.samples.storedprocedure.model.CoffeeBeverage; -import org.springframework.integration.samples.storedprocedure.service.CoffeeService; -import org.springframework.integration.samples.storedprocedure.service.StringConversionService; +import org.springframework.integration.model.CoffeeBeverage; +import org.springframework.integration.service.CoffeeService; +import org.springframework.integration.service.StringConversionService; /** diff --git a/intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/samples/storedprocedure/support/CoffeBeverageMapper.java b/intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/samples/storedprocedure/support/CoffeBeverageMapper.java index bd50c249..91b1a5b7 100644 --- a/intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/samples/storedprocedure/support/CoffeBeverageMapper.java +++ b/intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/samples/storedprocedure/support/CoffeBeverageMapper.java @@ -15,7 +15,7 @@ package org.springframework.integration.samples.storedprocedure.support; import java.sql.ResultSet; import java.sql.SQLException; -import org.springframework.integration.samples.storedprocedure.model.CoffeeBeverage; +import org.springframework.integration.model.CoffeeBeverage; import org.springframework.jdbc.core.RowMapper; /** diff --git a/intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/samples/storedprocedure/service/CoffeeService.java b/intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/service/CoffeeService.java similarity index 89% rename from intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/samples/storedprocedure/service/CoffeeService.java rename to intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/service/CoffeeService.java index f5d6b802..c825837d 100644 --- a/intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/samples/storedprocedure/service/CoffeeService.java +++ b/intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/service/CoffeeService.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.integration.samples.storedprocedure.service; +package org.springframework.integration.service; import java.util.List; -import org.springframework.integration.samples.storedprocedure.model.CoffeeBeverage; +import org.springframework.integration.model.CoffeeBeverage; import org.springframework.messaging.handler.annotation.Payload; import org.springframework.transaction.annotation.Transactional; diff --git a/intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/samples/storedprocedure/service/StringConversionService.java b/intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/service/StringConversionService.java similarity index 93% rename from intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/samples/storedprocedure/service/StringConversionService.java rename to intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/service/StringConversionService.java index e18be720..129a0b55 100644 --- a/intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/samples/storedprocedure/service/StringConversionService.java +++ b/intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/service/StringConversionService.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.integration.samples.storedprocedure.service; +package org.springframework.integration.service; /** * Provides string manipulation services. diff --git a/intermediate/stored-procedures-oracle/src/main/resources/META-INF/spring/integration/spring-integration-sample1-context.xml b/intermediate/stored-procedures-oracle/src/main/resources/META-INF/spring/integration/spring-integration-sample1-context.xml index fa30f6a7..c7decc01 100644 --- a/intermediate/stored-procedures-oracle/src/main/resources/META-INF/spring/integration/spring-integration-sample1-context.xml +++ b/intermediate/stored-procedures-oracle/src/main/resources/META-INF/spring/integration/spring-integration-sample1-context.xml @@ -14,7 +14,7 @@ + service-interface="org.springframework.integration.service.StringConversionService"> diff --git a/intermediate/stored-procedures-oracle/src/main/resources/META-INF/spring/integration/spring-integration-sample2-context.xml b/intermediate/stored-procedures-oracle/src/main/resources/META-INF/spring/integration/spring-integration-sample2-context.xml index b996a0a5..314c20ff 100644 --- a/intermediate/stored-procedures-oracle/src/main/resources/META-INF/spring/integration/spring-integration-sample2-context.xml +++ b/intermediate/stored-procedures-oracle/src/main/resources/META-INF/spring/integration/spring-integration-sample2-context.xml @@ -20,7 +20,7 @@ + service-interface="org.springframework.integration.service.CoffeeService"> diff --git a/intermediate/stored-procedures-oracle/src/test/java/org/springframework/integration/sts/StringConversionServiceTest.java b/intermediate/stored-procedures-oracle/src/test/java/org/springframework/integration/sts/StringConversionServiceTest.java index 639cda36..ec4af2fc 100644 --- a/intermediate/stored-procedures-oracle/src/test/java/org/springframework/integration/sts/StringConversionServiceTest.java +++ b/intermediate/stored-procedures-oracle/src/test/java/org/springframework/integration/sts/StringConversionServiceTest.java @@ -21,7 +21,7 @@ import org.junit.Test; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.samples.storedprocedure.service.StringConversionService; +import org.springframework.integration.service.StringConversionService; /** * Verify that the Spring Integration Application Context starts successfully. diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index ed8671af..b2c4f5f7 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -56,7 +56,7 @@ junit junit - 4.11 + 4.12 test @@ -65,12 +65,6 @@ 1.3 test - - org.springframework - spring-test - 4.2.5.RELEASE - test - commons-pool commons-pool @@ -80,9 +74,15 @@ org.springframework.integration spring-integration-jdbc - 4.3.0.M1 + 4.3.0.RC1 compile + + org.springframework + spring-test + 4.3.0.RC2 + test + commons-dbcp commons-dbcp diff --git a/intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/samples/storedprocedure/model/CoffeeBeverage.java b/intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/model/CoffeeBeverage.java similarity index 97% rename from intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/samples/storedprocedure/model/CoffeeBeverage.java rename to intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/model/CoffeeBeverage.java index 21141b70..b752537f 100644 --- a/intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/samples/storedprocedure/model/CoffeeBeverage.java +++ b/intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/model/CoffeeBeverage.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.integration.samples.storedprocedure.model; +package org.springframework.integration.model; /** * diff --git a/intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/samples/storedprocedure/Main.java b/intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/samples/storedprocedure/Main.java index f2fd9954..28ceedc4 100644 --- a/intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/samples/storedprocedure/Main.java +++ b/intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/samples/storedprocedure/Main.java @@ -22,8 +22,8 @@ import org.apache.log4j.Logger; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.samples.storedprocedure.model.CoffeeBeverage; -import org.springframework.integration.samples.storedprocedure.service.CoffeeService; +import org.springframework.integration.model.CoffeeBeverage; +import org.springframework.integration.service.CoffeeService; /** diff --git a/intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/samples/storedprocedure/support/CoffeBeverageMapper.java b/intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/samples/storedprocedure/support/CoffeBeverageMapper.java index bd50c249..91b1a5b7 100644 --- a/intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/samples/storedprocedure/support/CoffeBeverageMapper.java +++ b/intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/samples/storedprocedure/support/CoffeBeverageMapper.java @@ -15,7 +15,7 @@ package org.springframework.integration.samples.storedprocedure.support; import java.sql.ResultSet; import java.sql.SQLException; -import org.springframework.integration.samples.storedprocedure.model.CoffeeBeverage; +import org.springframework.integration.model.CoffeeBeverage; import org.springframework.jdbc.core.RowMapper; /** diff --git a/intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/samples/storedprocedure/service/CoffeeService.java b/intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/service/CoffeeService.java similarity index 89% rename from intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/samples/storedprocedure/service/CoffeeService.java rename to intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/service/CoffeeService.java index f5d6b802..c825837d 100644 --- a/intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/samples/storedprocedure/service/CoffeeService.java +++ b/intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/service/CoffeeService.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.integration.samples.storedprocedure.service; +package org.springframework.integration.service; import java.util.List; -import org.springframework.integration.samples.storedprocedure.model.CoffeeBeverage; +import org.springframework.integration.model.CoffeeBeverage; import org.springframework.messaging.handler.annotation.Payload; import org.springframework.transaction.annotation.Transactional; diff --git a/intermediate/stored-procedures-postgresql/src/main/resources/META-INF/spring/integration/spring-integration-context.xml b/intermediate/stored-procedures-postgresql/src/main/resources/META-INF/spring/integration/spring-integration-context.xml index 90d33564..dcc8a43a 100644 --- a/intermediate/stored-procedures-postgresql/src/main/resources/META-INF/spring/integration/spring-integration-context.xml +++ b/intermediate/stored-procedures-postgresql/src/main/resources/META-INF/spring/integration/spring-integration-context.xml @@ -27,7 +27,7 @@ + service-interface="org.springframework.integration.service.CoffeeService"> diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index 2563eeff..1c95f6b6 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -56,7 +56,7 @@ junit junit - 4.11 + 4.12 test @@ -66,17 +66,23 @@ test - org.springframework - spring-test - 4.2.5.RELEASE + org.springframework.integration + spring-integration-test + 4.3.0.RC1 test org.springframework.integration spring-integration-ip - 4.3.0.M1 + 4.3.0.RC1 compile + + org.springframework + spring-test + 4.3.0.RC2 + test + log4j log4j @@ -89,12 +95,6 @@ 1.9.5 test - - org.springframework.integration - spring-integration-test - 4.3.0.M1 - test - diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index 25e9126f..c15b3b71 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -53,16 +53,10 @@ https://github.com/spring-projects/spring-integration-samples - - org.springframework.integration - spring-integration-ws - 4.3.0.M1 - compile - junit junit - 4.11 + 4.12 test @@ -71,22 +65,22 @@ 1.3 test - - org.springframework - spring-test - 4.2.5.RELEASE - test - org.springframework.integration - spring-integration-http - 4.3.0.M1 + spring-integration-ws + 4.3.0.RC1 compile + + org.springframework + spring-test + 4.3.0.RC2 + test + org.springframework spring-web - 4.2.5.RELEASE + 4.3.0.RC2 compile @@ -95,6 +89,12 @@ 1.2.17 compile + + org.springframework.integration + spring-integration-http + 4.3.0.RC1 + compile + org.mockito mockito-core diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index 9594a31c..d36c0f70 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -53,41 +53,41 @@ https://github.com/spring-projects/spring-integration-samples + + junit + junit + 4.12 + test + + + org.springframework.integration + spring-integration-file + 4.3.0.RC1 + compile + com.h2database h2 1.3.175 compile - - junit - junit - 4.11 - test - org.hamcrest hamcrest-all 1.3 test - - org.springframework - spring-test - 4.2.5.RELEASE - test - org.springframework.integration spring-integration-jdbc - 4.3.0.M1 + 4.3.0.RC1 compile - org.springframework.integration - spring-integration-file - 4.3.0.M1 - compile + org.springframework + spring-test + 4.3.0.RC2 + test log4j