diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index 1c5390e7..a4235a22 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples advanced-testing-examples - 4.3.0.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT Advanced Testing Examples Advanced Testing Examples http://projects.spring.io/spring-integration @@ -55,20 +55,20 @@ javax.jms - jms-api - 1.1-rev-1 + javax.jms-api + 2.0.1 compile org.springframework.integration spring-integration-jms - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile org.springframework.integration spring-integration-groovy - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile @@ -98,7 +98,7 @@ org.springframework spring-test - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT test diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index de3749b1..76f0ec7a 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples dynamic-ftp - 4.3.0.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT Dynamic FTP Demo Dynamic FTP Demo http://projects.spring.io/spring-integration @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-ftp - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile @@ -86,7 +86,7 @@ org.springframework spring-test - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT test diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index f08c08d0..031173bb 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 1.4.2.RELEASE + 2.0.0.BUILD-SNAPSHOT org.springframework.integration.samples dynamic-tcp-client - 4.3.0.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT Dynamic TCP Client Dynamic TCP Client http://projects.spring.io/spring-integration @@ -65,13 +65,7 @@ org.springframework.integration spring-integration-ip - 4.3.6.BUILD-SNAPSHOT - compile - - - org.springframework.integration - spring-integration-java-dsl - 1.2.1.RELEASE + 5.0.0.BUILD-SNAPSHOT compile @@ -95,7 +89,7 @@ org.springframework spring-test - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT test diff --git a/advanced/pom.xml b/advanced/pom.xml index 8a499457..019d35f5 100644 --- a/advanced/pom.xml +++ b/advanced/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples advanced - 4.3.0.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT http://projects.spring.io/spring-integration SpringIO diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index c23b0114..96cfc482 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples cafe-scripted - 4.3.0.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT Cafe Sample (Scripted Implementation) Cafe Sample (Scripted Implementation) http://projects.spring.io/spring-integration @@ -56,25 +56,25 @@ org.springframework.integration spring-integration-stream - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile org.springframework.integration spring-integration-groovy - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile org.springframework.integration spring-integration-rmi - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile org.springframework.integration spring-integration-jmx - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile @@ -122,7 +122,7 @@ org.springframework spring-test - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT test diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index 65d07d19..2760158a 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples cafe-amqp - 4.3.0.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT Cafe - With AMQP Message Broker Cafe - With AMQP Message Broker http://projects.spring.io/spring-integration @@ -56,13 +56,13 @@ org.springframework.integration.samples cafe-si - 4.3.0.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile org.springframework.integration spring-integration-amqp - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile @@ -92,7 +92,7 @@ org.springframework spring-test - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT test diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index 85162cf5..cea4e5d0 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples cafe-jms - 4.3.0.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT Cafe - With JMS Message Broker Cafe - With JMS Message Broker http://projects.spring.io/spring-integration @@ -56,25 +56,31 @@ org.springframework.integration.samples cafe-si - 4.3.0.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile org.apache.activemq activemq-broker - 5.12.1 + 5.13.4 compile org.apache.activemq activemq-kahadb-store - 5.12.1 + 5.13.4 compile org.springframework.integration spring-integration-jms - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT + compile + + + javax.jms + javax.jms-api + 2.0.1 compile @@ -104,7 +110,7 @@ org.springframework spring-test - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT test diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index c884f86f..ddb23712 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples cafe-si - 4.3.0.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT Cafe - Pure Spring Integration Cafe - Pure Spring Integration http://projects.spring.io/spring-integration @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-stream - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile @@ -92,7 +92,7 @@ org.springframework spring-test - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT test diff --git a/applications/cafe/pom.xml b/applications/cafe/pom.xml index 4a3d5149..21326edd 100644 --- a/applications/cafe/pom.xml +++ b/applications/cafe/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples cafe - 4.3.0.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT http://projects.spring.io/spring-integration SpringIO diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index b03c4b6d..40e913a7 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 1.4.2.RELEASE + 2.0.0.BUILD-SNAPSHOT org.springframework.integration.samples file-split-ftp - 4.3.0.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT File Split FTP File Split FTP http://projects.spring.io/spring-integration @@ -70,31 +70,25 @@ org.springframework.integration spring-integration-core - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile org.springframework.integration spring-integration-ftp - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile org.springframework.integration spring-integration-http - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile org.springframework.integration spring-integration-mail - 4.3.6.BUILD-SNAPSHOT - compile - - - org.springframework.integration - spring-integration-java-dsl - 1.2.1.RELEASE + 5.0.0.BUILD-SNAPSHOT compile @@ -130,7 +124,7 @@ org.springframework spring-test - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT test @@ -141,7 +135,7 @@ org.springframework.integration spring-integration-test - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT test diff --git a/applications/file-split-ftp/src/main/java/org/springframework/integration/samples/filesplit/Application.java b/applications/file-split-ftp/src/main/java/org/springframework/integration/samples/filesplit/Application.java index 5efe85d8..aec6c840 100644 --- a/applications/file-split-ftp/src/main/java/org/springframework/integration/samples/filesplit/Application.java +++ b/applications/file-split-ftp/src/main/java/org/springframework/integration/samples/filesplit/Application.java @@ -22,7 +22,6 @@ import java.io.StringWriter; import org.aopalliance.intercept.MethodInterceptor; import org.apache.commons.net.ftp.FTPFile; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -30,17 +29,18 @@ import org.springframework.boot.autoconfigure.mail.MailProperties; import org.springframework.context.annotation.Bean; import org.springframework.integration.dsl.IntegrationFlow; import org.springframework.integration.dsl.IntegrationFlows; -import org.springframework.integration.dsl.core.Pollers; -import org.springframework.integration.dsl.file.FileWritingMessageHandlerSpec; -import org.springframework.integration.dsl.file.Files; -import org.springframework.integration.dsl.mail.Mail; +import org.springframework.integration.dsl.Pollers; import org.springframework.integration.file.FileHeaders; import org.springframework.integration.file.FileWritingMessageHandler; +import org.springframework.integration.file.dsl.FileWritingMessageHandlerSpec; +import org.springframework.integration.file.dsl.Files; import org.springframework.integration.file.remote.session.SessionFactory; import org.springframework.integration.file.splitter.FileSplitter; import org.springframework.integration.file.support.FileExistsMode; +import org.springframework.integration.ftp.dsl.Ftp; import org.springframework.integration.ftp.session.DefaultFtpSessionFactory; import org.springframework.integration.http.config.EnableIntegrationGraphController; +import org.springframework.integration.mail.dsl.Mail; import org.springframework.messaging.Message; import org.springframework.messaging.MessageHeaders; import org.springframework.messaging.MessagingException; @@ -64,6 +64,7 @@ public class Application { /** * Poll for files, add an error channel, split into lines route the start/end markers * to {@link #markers()} and the lines to {@link #lines}. + * * @return the flow. */ @Bean @@ -82,6 +83,7 @@ public class Application { /** * Process lines; append (no flush) to the appropriate file. + * * @return the flow. */ @Bean @@ -100,6 +102,7 @@ public class Application { /** * Process file markers; ignore START, when END, flush the files, ftp them and * send an email. + * * @return the flow. */ @Bean @@ -115,24 +118,24 @@ public class Application { // send the first file .subscribe(sf -> sf.transform(p -> new File("/tmp/out/002.txt")) .enrichHeaders(h -> h.header(FileHeaders.FILENAME, "002.txt", true)) - .handleWithAdapter(a -> a.ftp(ftp1()).remoteDirectory("foo"), e -> e.id("ftp002"))) + .handle(Ftp.outboundAdapter(ftp1()).remoteDirectory("foo"), e -> e.id("ftp002"))) // send the second file .subscribe(sf -> sf.transform(p -> new File("/tmp/out/006.txt")) .enrichHeaders(h -> h.header(FileHeaders.FILENAME, "006.txt", true)) - .handleWithAdapter(a -> a.ftp(ftp2()).remoteDirectory("foo"), e -> e.id("ftp006"))) + .handle(Ftp.outboundAdapter(ftp2()).remoteDirectory("foo"), e -> e.id("ftp006"))) // send the third file .subscribe(sf -> sf.transform(p -> new File("/tmp/out/009.txt")) .enrichHeaders(h -> h.header(FileHeaders.FILENAME, "009.txt", true)) - .handleWithAdapter(a -> a.ftp(ftp3()).remoteDirectory("foo"), e -> e.id("ftp009"))) + .handle(Ftp.outboundAdapter(ftp3()).remoteDirectory("foo"), e -> e.id("ftp009"))) // send an email .subscribe(sf -> sf.transform(FileSplitter.FileMarker::getFilePath) .enrichHeaders(Mail.headers() .subject("File successfully split and transferred") .from("foo@bar") - .toFunction(m -> new String[] { "bar@baz" })) + .toFunction(m -> new String[]{"bar@baz"})) .enrichHeaders(h -> h.header(EMAIL_SUCCESS_SUFFIX, ".success")) .channel("toMail.input"))); } @@ -166,6 +169,7 @@ public class Application { /** * Error flow - email failure + * * @return the flow. */ @Bean @@ -174,7 +178,7 @@ public class Application { .enrichHeaders(Mail.headers() .subject("File split and transfer failed") .from("foo@bar") - .toFunction(m -> new String[] { "bar@baz" })) + .toFunction(m -> new String[]{"bar@baz"})) .enrichHeaders(h -> h.header(EMAIL_SUCCESS_SUFFIX, ".failed") .headerExpression(FileHeaders.ORIGINAL_FILE, "payload.failedMessage.headers['" + FileHeaders.ORIGINAL_FILE + "']")) @@ -185,15 +189,17 @@ public class Application { @Bean public IntegrationFlow toMail() { - return f -> f.handleWithAdapter(a -> a.mail(this.mailProperties.getHost()) + return f -> f + .handle(Mail.outboundAdapter(this.mailProperties.getHost()) // .javaMailProperties(b -> b.put("mail.debug", "true")) - .port(this.mailProperties.getPort()) - .credentials(this.mailProperties.getUsername(), this.mailProperties.getPassword()), - e -> e.id("mailOut").advice(afterMailAdvice())); + .port(this.mailProperties.getPort()) + .credentials(this.mailProperties.getUsername(), this.mailProperties.getPassword()), + e -> e.id("mailOut").advice(afterMailAdvice())); } /** * Rename the input file after success/failure. + * * @return the flow. */ @Bean diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index ce36dabe..bb0415a4 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples loan-broker - 4.3.0.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT Loan Broker Sample Loan Broker Sample http://projects.spring.io/spring-integration @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-ip - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile @@ -86,7 +86,7 @@ org.springframework spring-test - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT test diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index 7a1912f9..06deb34e 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples loanshark - 4.3.0.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT Loan Shark Sample Loan Shark Sample http://projects.spring.io/spring-integration @@ -55,55 +55,55 @@ org.springframework.integration spring-integration-ip - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile org.springframework spring-webmvc - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT compile org.springframework spring-orm - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT compile org.springframework spring-aop - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT compile org.springframework spring-aspects - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT compile org.aspectj aspectjtools - 1.8.4 + 1.8.9 compile org.springframework spring-jdbc - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT compile org.springframework spring-tx - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT compile org.springframework spring-context - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT compile @@ -235,7 +235,7 @@ org.springframework spring-test - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT test diff --git a/applications/pom.xml b/applications/pom.xml index d6864cb3..2859dfd5 100644 --- a/applications/pom.xml +++ b/applications/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples applications - 4.3.0.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT http://projects.spring.io/spring-integration SpringIO diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index a0c27662..c4df137e 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 1.4.2.RELEASE + 2.0.0.BUILD-SNAPSHOT org.springframework.integration.samples stomp-chat - 4.3.0.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT Web Sockets Stomp Chat Sample Web Sockets Stomp Chat Sample http://projects.spring.io/spring-integration @@ -98,7 +98,7 @@ org.springframework spring-test - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT test diff --git a/applications/stomp-chat/src/main/resources/org/springframework/integration/samples/chat/stomp/server/stomp-server.xml b/applications/stomp-chat/src/main/resources/org/springframework/integration/samples/chat/stomp/server/stomp-server.xml index 50a254e9..5bfc726e 100644 --- a/applications/stomp-chat/src/main/resources/org/springframework/integration/samples/chat/stomp/server/stomp-server.xml +++ b/applications/stomp-chat/src/main/resources/org/springframework/integration/samples/chat/stomp/server/stomp-server.xml @@ -68,7 +68,7 @@ + .add(T(reactor.util.function.Tuples).of(headers.simpSessionId, headers.simpSubscriptionId))"/> @@ -92,7 +92,7 @@ chatRoomSessions.each { k, v -> - v.remove(reactor.tuple.Tuple.of(headers.simpSessionId, headers.simpSubscriptionId)) + v.remove(reactor.util.function.Tuples.of(headers.simpSessionId, headers.simpSubscriptionId)) } null diff --git a/basic/amqp-affinity/pom.xml b/basic/amqp-affinity/pom.xml index 34e101ed..fb5b8887 100644 --- a/basic/amqp-affinity/pom.xml +++ b/basic/amqp-affinity/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples amqp-affinity - 4.3.0.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT http://projects.spring.io/spring-integration SpringIO @@ -72,7 +72,7 @@ org.springframework spring-test - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT test diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index 4826b337..cbf3bd16 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples amqp - 4.3.0.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT AMQP Basic Sample AMQP Basic Sample http://projects.spring.io/spring-integration @@ -56,13 +56,13 @@ org.springframework.integration spring-integration-stream - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile org.springframework.integration spring-integration-amqp - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile @@ -92,7 +92,7 @@ org.springframework spring-test - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT test diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index 468bf320..2e3486da 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 1.4.2.RELEASE + 2.0.0.BUILD-SNAPSHOT org.springframework.integration.samples barrier - 4.3.0.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT Barrier Sample Barrier Sample http://projects.spring.io/spring-integration @@ -75,19 +75,19 @@ org.springframework.integration spring-integration-core - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile org.springframework.integration spring-integration-amqp - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile org.springframework.integration spring-integration-http - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile @@ -111,7 +111,7 @@ org.springframework spring-test - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT test diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index d7d61ae4..a3bae036 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples control-bus - 4.3.0.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT Control Bus Basic Sample Control Bus Basic Sample http://projects.spring.io/spring-integration @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-core - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile @@ -86,7 +86,7 @@ org.springframework spring-test - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT test diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index d9e102ed..5103029c 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples enricher - 4.3.0.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT Enricher Basic Sample Enricher Basic Sample http://projects.spring.io/spring-integration @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-core - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile @@ -92,7 +92,7 @@ org.springframework spring-test - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT test diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index 97014716..6e4076b5 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples feed - 4.3.0.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT Feed (RSS/ATOM) Basic Sample Feed (RSS/ATOM) Basic Sample http://projects.spring.io/spring-integration @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-feed - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile @@ -86,7 +86,7 @@ org.springframework spring-test - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT test diff --git a/basic/file/pom.xml b/basic/file/pom.xml index 424c1138..451b3e40 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples file - 4.3.0.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT File Copy Basic Sample File Copy Basic Sample http://projects.spring.io/spring-integration @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-file - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile @@ -86,7 +86,7 @@ org.springframework spring-test - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT test diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index 7b680289..56f45029 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples ftp - 4.3.0.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT FTP Basic Sample FTP Basic Sample http://projects.spring.io/spring-integration @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-ftp - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile @@ -104,7 +104,7 @@ org.springframework spring-test - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT test @@ -116,7 +116,7 @@ org.springframework.integration spring-integration-test - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT test diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index 0161e642..09ed9995 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples helloworld - 4.3.0.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT Hello World Sample Hello World Sample http://projects.spring.io/spring-integration @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-core - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile @@ -86,7 +86,7 @@ org.springframework spring-test - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT test diff --git a/basic/http-boot/pom.xml b/basic/http-boot/pom.xml index 1f74163b..5ce20ce0 100644 --- a/basic/http-boot/pom.xml +++ b/basic/http-boot/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples http-boot - 4.3.0.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT http://projects.spring.io/spring-integration SpringIO @@ -72,7 +72,7 @@ org.springframework spring-test - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT test diff --git a/basic/http/pom.xml b/basic/http/pom.xml index 9ab9e71d..a62ee13f 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples http - 4.3.0.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT HTTP Sample HTTP Sample http://projects.spring.io/spring-integration @@ -55,19 +55,19 @@ org.springframework.integration spring-integration-http - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile org.springframework.integration spring-integration-mail - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile org.springframework spring-webmvc - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT compile @@ -121,7 +121,7 @@ org.springframework spring-test - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT test diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index b21c9bcf..f6cc1b83 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples jdbc - 4.3.0.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT JDBC Basic Sample JDBC Basic Sample http://projects.spring.io/spring-integration @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-jdbc - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile @@ -92,7 +92,7 @@ org.springframework spring-test - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT test diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index 4b385535..2bdac5a2 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples jms - 4.3.0.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT JMS Basic Sample JMS Basic Sample http://projects.spring.io/spring-integration @@ -53,28 +53,34 @@ https://github.com/spring-projects/spring-integration-samples + + javax.jms + javax.jms-api + 2.0.1 + compile + org.springframework.integration spring-integration-jms - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile org.springframework.integration spring-integration-stream - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile org.apache.activemq activemq-broker - 5.12.1 + 5.13.4 compile org.apache.activemq activemq-kahadb-store - 5.12.1 + 5.13.4 compile @@ -104,13 +110,13 @@ org.springframework spring-test - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT test org.springframework.integration spring-integration-test - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT test diff --git a/basic/jms/src/main/resources/META-INF/spring/integration/common.xml b/basic/jms/src/main/resources/META-INF/spring/integration/common.xml index 5e8a3397..287728b8 100644 --- a/basic/jms/src/main/resources/META-INF/spring/integration/common.xml +++ b/basic/jms/src/main/resources/META-INF/spring/integration/common.xml @@ -7,7 +7,7 @@ http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd"> - + diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index 0102d7a1..2907fa46 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples jmx - 4.3.0.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT JMX Basic Sample JMX Basic Sample http://projects.spring.io/spring-integration @@ -56,13 +56,13 @@ org.springframework.integration spring-integration-jmx - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile org.springframework.integration spring-integration-stream - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile @@ -92,7 +92,7 @@ org.springframework spring-test - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT test diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index dc5da5d1..edafd6cc 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 1.4.2.RELEASE + 2.0.0.BUILD-SNAPSHOT org.springframework.integration.samples jpa - 4.3.0.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT JPA Basic Sample JPA Basic Sample http://projects.spring.io/spring-integration @@ -71,7 +71,7 @@ org.springframework.integration spring-integration-jpa - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile @@ -107,19 +107,7 @@ org.springframework spring-instrument - 4.3.2.RELEASE - runtime - - - commons-logging - commons-logging - - - - - org.apache.openjpa - openjpa - 2.4.0 + 5.0.0.BUILD-SNAPSHOT runtime @@ -173,7 +161,7 @@ org.springframework spring-test - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT test diff --git a/basic/jpa/src/main/java/org/springframework/integration/samples/jpa/Main.java b/basic/jpa/src/main/java/org/springframework/integration/samples/jpa/Main.java index f4a09fab..f1335e1c 100644 --- a/basic/jpa/src/main/java/org/springframework/integration/samples/jpa/Main.java +++ b/basic/jpa/src/main/java/org/springframework/integration/samples/jpa/Main.java @@ -65,8 +65,7 @@ public class Main { System.out.println("Please enter a choice and press : "); System.out.println("\t1. Use Hibernate"); - System.out.println("\t2. Use OpenJPA"); - System.out.println("\t3. Use EclipseLink"); + System.out.println("\t2. Use EclipseLink"); System.out.println("\tq. Quit the application"); System.out.print("Enter you choice: "); @@ -80,9 +79,6 @@ public class Main { springApplicationBuilder.sources(HibernateJpaAutoConfiguration.class); break; } else if("2".equals(input.trim())) { - springApplicationBuilder.profiles("openJpa"); - break; - } else if("3".equals(input.trim())) { springApplicationBuilder.profiles("eclipseLink"); break; } else if("q".equals(input.trim())) { 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 deleted file mode 100644 index 91d3a52b..00000000 --- a/basic/jpa/src/main/java/org/springframework/integration/samples/jpa/OpenJpaAutoConfiguration.java +++ /dev/null @@ -1,89 +0,0 @@ -/* - * 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; -import org.springframework.context.annotation.Profile; -import org.springframework.core.Ordered; -import org.springframework.core.annotation.Order; -import org.springframework.core.type.AnnotatedTypeMetadata; -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; - -/** - * @author Artem Bilan - * @since 4.2 - */ -@Configuration -@ConditionalOnClass({LocalContainerEntityManagerFactoryBean.class, - EnableTransactionManagement.class, EntityManager.class}) -@Conditional(OpenJpaAutoConfiguration.OpenJpaEntityManagerCondition.class) -@AutoConfigureAfter({DataSourceAutoConfiguration.class}) -@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(); - } - - @Override - protected Map getVendorProperties() { - return new HashMap(); - } - - - @Order(Ordered.HIGHEST_PRECEDENCE + 20) - static class OpenJpaEntityManagerCondition extends SpringBootCondition { - - @Override - public ConditionOutcome getMatchOutcome(ConditionContext context, AnnotatedTypeMetadata metadata) { - if (ClassUtils.isPresent("org.apache.openjpa.persistence.OpenJPAEntityManager", context.getClassLoader())) { - return ConditionOutcome.match("found OpenJPAEntityManager class"); - } - else { - return ConditionOutcome.noMatch("did not find OpenJPAEntityManager class"); - } - } - - } - -} diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index 165d867d..f1f888f0 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 1.4.2.RELEASE + 2.0.0.BUILD-SNAPSHOT org.springframework.integration.samples kafka - 4.3.0.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT Apache Kafka Sample Apache Kafka Sample http://projects.spring.io/spring-integration @@ -65,25 +65,25 @@ org.springframework.integration spring-integration-kafka - 2.1.0.RELEASE + 3.0.0.BUILD-SNAPSHOT compile org.springframework.integration spring-integration-core - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile org.springframework.kafka spring-kafka - 1.1.0.RELEASE + 1.1.2.BUILD-SNAPSHOT compile org.springframework.kafka spring-kafka-test - 1.1.0.RELEASE + 1.1.2.BUILD-SNAPSHOT compile @@ -113,7 +113,7 @@ org.springframework spring-test - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT test diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index c66d5e5d..4e2b72f8 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples mail - 4.3.0.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT Mail (IMAP + POP3) Sample Mail (IMAP + POP3) Sample http://projects.spring.io/spring-integration @@ -56,13 +56,13 @@ org.springframework.integration spring-integration-mail - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile org.springframework spring-context - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT compile @@ -104,7 +104,7 @@ org.springframework spring-test - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT test diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index 089c1e8d..4fcda35c 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples mongodb - 4.3.0.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT MongoDb Basic Sample MongoDb Basic Sample http://projects.spring.io/spring-integration @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-mongodb - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile @@ -86,7 +86,7 @@ org.springframework spring-test - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT test diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index 395ded25..c92d8fd1 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 1.4.2.RELEASE + 2.0.0.BUILD-SNAPSHOT org.springframework.integration.samples mqtt - 4.3.0.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT MQTT Basic Sample MQTT Basic Sample http://projects.spring.io/spring-integration @@ -65,19 +65,13 @@ org.springframework.integration spring-integration-stream - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile org.springframework.integration spring-integration-mqtt - 4.3.6.BUILD-SNAPSHOT - compile - - - org.springframework.integration - spring-integration-java-dsl - 1.2.1.RELEASE + 5.0.0.BUILD-SNAPSHOT compile @@ -101,7 +95,7 @@ org.springframework spring-test - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT test diff --git a/basic/mqtt/src/main/java/org/springframework/integration/samples/mqtt/Application.java b/basic/mqtt/src/main/java/org/springframework/integration/samples/mqtt/Application.java index ce21dd59..c2dd1bca 100644 --- a/basic/mqtt/src/main/java/org/springframework/integration/samples/mqtt/Application.java +++ b/basic/mqtt/src/main/java/org/springframework/integration/samples/mqtt/Application.java @@ -23,7 +23,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.integration.annotation.IntegrationComponentScan; import org.springframework.integration.dsl.IntegrationFlow; import org.springframework.integration.dsl.IntegrationFlows; -import org.springframework.integration.dsl.core.Pollers; +import org.springframework.integration.dsl.Pollers; import org.springframework.integration.endpoint.MessageProducerSupport; import org.springframework.integration.handler.LoggingHandler; import org.springframework.integration.mqtt.core.DefaultMqttPahoClientFactory; diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index cd085cd2..523b5b73 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples oddeven - 4.3.0.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT Odd-Even Sample Odd-Even Sample http://projects.spring.io/spring-integration @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-core - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile @@ -86,7 +86,7 @@ org.springframework spring-test - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT test diff --git a/basic/pom.xml b/basic/pom.xml index f40c7702..81ee5785 100644 --- a/basic/pom.xml +++ b/basic/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples basic - 4.3.0.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT http://projects.spring.io/spring-integration SpringIO diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index 36f96a6c..cd20e8e3 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples quote - 4.3.0.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT Quote Sample Quote Sample http://projects.spring.io/spring-integration @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-stream - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile @@ -86,7 +86,7 @@ org.springframework spring-test - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT test diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index ba0788a1..16e7cf41 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples sftp - 4.3.0.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT SFTP Basic Sample SFTP Basic Sample http://projects.spring.io/spring-integration @@ -56,13 +56,13 @@ org.springframework.integration spring-integration-sftp - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile org.apache.sshd sshd-core - 0.13.0 + 0.14.0 compile @@ -92,7 +92,7 @@ org.springframework spring-test - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT test diff --git a/basic/splunk/pom.xml b/basic/splunk/pom.xml index 1beb2ce8..39059be7 100644 --- a/basic/splunk/pom.xml +++ b/basic/splunk/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 1.4.2.RELEASE + 2.0.0.BUILD-SNAPSHOT org.springframework.integration.samples splunk - 4.3.0.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT Splunk Sample Splunk Sample http://projects.spring.io/spring-integration @@ -65,7 +65,7 @@ org.springframework.integration spring-integration-core - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile @@ -95,7 +95,7 @@ org.springframework spring-test - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT test diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index 66b1d2f0..bef17cc0 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples tcp-amqp - 4.3.0.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT TCP-AMQP Basic Sample TCP-AMQP Basic Sample http://projects.spring.io/spring-integration @@ -56,13 +56,13 @@ org.springframework.integration spring-integration-amqp - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile org.springframework.integration spring-integration-ip - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile @@ -104,7 +104,7 @@ org.springframework spring-test - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT test diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index be9f60b3..430493f4 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples tcp-client-server - 4.3.0.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT TCP Client Server Sample TCP Client Server Sample http://projects.spring.io/spring-integration @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-ip - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile @@ -68,7 +68,7 @@ org.springframework.integration spring-integration-test - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile @@ -98,7 +98,7 @@ org.springframework spring-test - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT test diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index bbe12616..088ae546 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples testing-examples - 4.3.0.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT Testing Examples Testing Examples http://projects.spring.io/spring-integration @@ -56,25 +56,25 @@ org.springframework.integration spring-integration-file - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile org.springframework.integration spring-integration-http - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile org.springframework.integration spring-integration-ws - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile org.springframework spring-webmvc - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT compile @@ -104,13 +104,13 @@ org.springframework spring-test - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT test org.springframework.integration spring-integration-test - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT test diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index 76d69113..82c2ad66 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples twitter - 4.3.0.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT Twitter Basic Sample Twitter Basic Sample http://projects.spring.io/spring-integration @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-twitter - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile @@ -86,7 +86,7 @@ org.springframework spring-test - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT test diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index b8f27eef..2e1b9a3b 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 1.4.2.RELEASE + 2.0.0.BUILD-SNAPSHOT org.springframework.integration.samples web-sockets - 4.3.0.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT Web Sockets Basic Sample Web Sockets Basic Sample http://projects.spring.io/spring-integration @@ -88,7 +88,7 @@ org.springframework spring-test - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT test diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index 0f91e0b8..ea063039 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples ws-inbound-gateway - 4.3.0.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT WS Inbound Gateway Sample WS Inbound Gateway Sample http://projects.spring.io/spring-integration @@ -55,19 +55,19 @@ org.springframework.integration spring-integration-xml - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile org.springframework.integration spring-integration-ws - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile org.springframework spring-webmvc - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT compile @@ -97,7 +97,7 @@ org.springframework spring-test - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT test diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index f6e31199..d11e702f 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples ws-outbound-gateway - 4.3.0.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT WS Outbound Gateway Sample WS Outbound Gateway Sample http://projects.spring.io/spring-integration @@ -56,13 +56,13 @@ org.springframework.integration spring-integration-stream - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile org.springframework.integration spring-integration-ws - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile @@ -92,7 +92,7 @@ org.springframework spring-test - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT test diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index 8dc11f1b..72efa549 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples xml - 4.3.0.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT XML Sample XML Sample http://projects.spring.io/spring-integration @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-xml - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile @@ -86,7 +86,7 @@ org.springframework spring-test - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT test diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index 36db0cda..02b273f8 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples xmpp - 4.3.0.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT XMPP Basic Sample XMPP Basic Sample http://projects.spring.io/spring-integration @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-xmpp - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile @@ -86,7 +86,7 @@ org.springframework spring-test - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT test diff --git a/build.gradle b/build.gradle index 0509e172..bad7c6d8 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { } } plugins { - id "org.sonarqube" version "1.2" + id "org.sonarqube" version "2.1" } description = 'Spring Integration Samples' @@ -147,15 +147,18 @@ subprojects { subproject -> apply plugin: 'jacoco' jacoco { - toolVersion = "0.7.2.201409121644" + toolVersion = "0.7.7.201606060606" } - sourceCompatibility = 1.8 + compileJava { + sourceCompatibility = 1.8 + targetCompatibility = 1.8 + } ext { - activeMqVersion = '5.12.1' - apacheSshdVersion = '0.13.0' - aspectjVersion = '1.8.4' + activeMqVersion = '5.13.4' + apacheSshdVersion = '0.14.0' + aspectjVersion = '1.8.9' commonsDigesterVersion = '2.0' commonsDbcpVersion = '1.2.2' commonsFileUploadVersion = '1.2.2' @@ -181,7 +184,7 @@ subprojects { subproject -> jodaTimeVersion = '1.6' jtaVersion = '1.1' jtdsVersion = '1.2.6' - jmsApiVersion = '1.1-rev-1' + jmsApiVersion = '2.0.1' jrubyVersion = '1.7.12' jpa21ApiVersion = '1.0.0.Final' jpaApiVersion = '2.0.0' @@ -192,17 +195,15 @@ subprojects { subproject -> mockitoVersion = '1.10.19' openJpaVersion = '2.4.0' oracleDriverVersion = '11.2.0.3' - reactorVersion = '2.0.8.RELEASE' postgresVersion = '9.1-901-1.jdbc4' subethasmtpVersion = '1.2' slf4jVersion = '1.7.11' - springIntegrationVersion = '4.3.6.BUILD-SNAPSHOT' - springIntegrationDslVersion = '1.2.1.RELEASE' - springIntegrationKafkaVersion = '2.1.0.RELEASE' + springIntegrationVersion = '5.0.0.BUILD-SNAPSHOT' + springIntegrationKafkaVersion = '3.0.0.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.1.0.RELEASE' - springKafkaVersion = '1.1.0.RELEASE' - springVersion = '4.3.2.RELEASE' - springSecurityVersion = '4.0.2.RELEASE' + springKafkaVersion = '1.1.2.BUILD-SNAPSHOT' + springVersion = '5.0.0.BUILD-SNAPSHOT' + springSecurityVersion = '4.2.0.RELEASE' springWebFlowVersion = '2.3.3.RELEASE' tilesJspVersion = '2.2.1' validationApiVersion = '1.0.0.GA' @@ -279,7 +280,7 @@ project('advanced-testing-examples') { description = 'Advanced Testing Examples' dependencies { - compile "javax.jms:jms-api:$jmsApiVersion" + compile "javax.jms:javax.jms-api:$jmsApiVersion" compile "org.springframework.integration:spring-integration-jms:$springIntegrationVersion" compile "org.springframework.integration:spring-integration-groovy:$springIntegrationVersion" compile "log4j:log4j:$log4jVersion" @@ -329,6 +330,7 @@ project('cafe-jms') { exclude group: "org.springframework" } compile "org.springframework.integration:spring-integration-jms:$springIntegrationVersion" + compile "javax.jms:javax.jms-api:$jmsApiVersion" compile "log4j:log4j:$log4jVersion" } } @@ -633,13 +635,10 @@ project('mqtt') { apply plugin: 'org.springframework.boot' - sourceCompatibility = 1.8 - dependencies { compile 'org.springframework.boot:spring-boot-starter-integration' compile "org.springframework.integration:spring-integration-stream:$springIntegrationVersion" compile "org.springframework.integration:spring-integration-mqtt:$springIntegrationVersion" - compile "org.springframework.integration:spring-integration-java-dsl:$springIntegrationDslVersion" } springBoot { @@ -662,8 +661,6 @@ project('si4demo') { apply plugin: 'org.springframework.boot' - sourceCompatibility = 1.8 - dependencies { compile 'org.springframework.boot:spring-boot-starter-web' compile 'org.springframework.boot:spring-boot-starter-integration' @@ -671,7 +668,6 @@ project('si4demo') { compile "org.springframework.integration:spring-integration-twitter" compile "org.springframework.integration:spring-integration-http" compile "org.springframework.integration:spring-integration-ip" - compile "org.springframework.integration:spring-integration-java-dsl:$springIntegrationDslVersion" compile "javax.mail:javax.mail-api:$javaxMailVersion" compile "com.sun.mail:javax.mail:$javaxMailVersion" compile "com.rometools:rome:1.5.0" @@ -693,14 +689,11 @@ project('cafe-dsl') { apply plugin: 'org.springframework.boot' - sourceCompatibility = 1.8 - dependencies { compile project(":cafe-si") compile 'org.springframework.boot:spring-boot-starter-integration' compile "org.springframework.integration:spring-integration-core:$springIntegrationVersion" compile "com.google.guava:guava:$guavaVersion" - compile "org.springframework.integration:spring-integration-java-dsl:$springIntegrationDslVersion" testCompile 'org.springframework.boot:spring-boot-starter-test' } @@ -741,6 +734,7 @@ project('jms') { mainClassName = 'org.springframework.integration.samples.jms.Main' dependencies { + compile "javax.jms:javax.jms-api:$jmsApiVersion" compile "org.springframework.integration:spring-integration-jms:$springIntegrationVersion" compile "org.springframework.integration:spring-integration-stream:$springIntegrationVersion" compile "org.apache.activemq:activemq-broker:$activeMqVersion" @@ -778,7 +772,6 @@ project('jpa') { compile "org.hibernate.javax.persistence:hibernate-jpa-2.1-api:$jpa21ApiVersion" runtime "org.springframework:spring-instrument:$springVersion" - runtime "org.apache.openjpa:openjpa:$openJpaVersion" runtime "org.hibernate:hibernate-entitymanager:$hibernateVersion" runtime "org.eclipse.persistence:org.eclipse.persistence.jpa:$eclipseLinkVersion" @@ -794,7 +787,9 @@ project('jpa') { tasks.withType(JavaExec) { standardInput = System.in - jvmArgs classpath.files.findAll{it.name ==~ /(spring-instrument.+)|(openjpa-${openJpaVersion}.+)/}.collect{"-javaagent:$it"} + jvmArgs classpath.files.findAll { + it.name ==~ /(spring-instrument.+)/}.collect{"-javaagent:$it" + } } } @@ -1003,11 +998,8 @@ project('xmpp') { project('async-gateway') { description = 'Async Gateway Sample' - sourceCompatibility = 1.8 - dependencies { compile "org.springframework.integration:spring-integration-core:$springIntegrationVersion" - compile "io.projectreactor:reactor-stream:$reactorVersion" compile "log4j:log4j:$log4jVersion" } } @@ -1344,12 +1336,9 @@ project('kafka-dsl') { apply plugin: 'org.springframework.boot' - sourceCompatibility = 1.8 - dependencies { compile 'org.springframework.boot:spring-boot-starter-integration' compile "org.springframework.integration:spring-integration-core:$springIntegrationVersion" - compile "org.springframework.integration:spring-integration-java-dsl:$springIntegrationDslVersion" compile ("org.springframework.integration:spring-integration-kafka:$springIntegrationKafkaVersion") compile ("org.springframework.kafka:spring-kafka-test:$springKafkaVersion") { exclude group: 'org.slf4j' @@ -1383,7 +1372,6 @@ project('file-split-ftp') { compile "org.springframework.integration:spring-integration-ftp:$springIntegrationVersion" compile "org.springframework.integration:spring-integration-http:$springIntegrationVersion" compile "org.springframework.integration:spring-integration-mail:$springIntegrationVersion" - compile "org.springframework.integration:spring-integration-java-dsl:$springIntegrationDslVersion" compile "javax.mail:javax.mail-api:$javaxMailVersion" compile "com.sun.mail:javax.mail:$javaxMailVersion" @@ -1409,7 +1397,6 @@ project('dynamic-tcp-client') { dependencies { compile 'org.springframework.boot:spring-boot-starter-integration' compile "org.springframework.integration:spring-integration-ip:$springIntegrationVersion" - compile "org.springframework.integration:spring-integration-java-dsl:$springIntegrationDslVersion" testCompile 'org.springframework.boot:spring-boot-starter-test' } diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index b84ff814..edeb1464 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 1.4.2.RELEASE + 2.0.0.BUILD-SNAPSHOT org.springframework.integration.samples cafe-dsl - 4.3.0.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT Java DSL Cafe Sample Java DSL Cafe Sample http://projects.spring.io/spring-integration @@ -60,7 +60,7 @@ org.springframework.integration.samples cafe-si - 4.3.0.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile @@ -71,7 +71,7 @@ org.springframework.integration spring-integration-core - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile @@ -80,12 +80,6 @@ 16.0.1 compile - - org.springframework.integration - spring-integration-java-dsl - 1.2.1.RELEASE - compile - junit junit @@ -107,7 +101,7 @@ org.springframework spring-test - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT test diff --git a/dsl/cafe-dsl/src/main/java/org/springframework/integration/samples/dsl/cafe/lambda/Application.java b/dsl/cafe-dsl/src/main/java/org/springframework/integration/samples/dsl/cafe/lambda/Application.java index 5fc97deb..4af38c92 100644 --- a/dsl/cafe-dsl/src/main/java/org/springframework/integration/samples/dsl/cafe/lambda/Application.java +++ b/dsl/cafe-dsl/src/main/java/org/springframework/integration/samples/dsl/cafe/lambda/Application.java @@ -29,7 +29,7 @@ import org.springframework.integration.annotation.Gateway; import org.springframework.integration.annotation.IntegrationComponentScan; import org.springframework.integration.annotation.MessagingGateway; import org.springframework.integration.dsl.IntegrationFlow; -import org.springframework.integration.dsl.core.Pollers; +import org.springframework.integration.dsl.Pollers; import org.springframework.integration.samples.cafe.Delivery; import org.springframework.integration.samples.cafe.Drink; import org.springframework.integration.samples.cafe.DrinkType; diff --git a/dsl/cafe-dsl/src/main/java/org/springframework/integration/samples/dsl/cafe/nonlambda/Application.java b/dsl/cafe-dsl/src/main/java/org/springframework/integration/samples/dsl/cafe/nonlambda/Application.java deleted file mode 100644 index da407de2..00000000 --- a/dsl/cafe-dsl/src/main/java/org/springframework/integration/samples/dsl/cafe/nonlambda/Application.java +++ /dev/null @@ -1,199 +0,0 @@ -/* - * Copyright 2014 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.dsl.cafe.nonlambda; - -import java.util.List; -import java.util.Map; -import java.util.concurrent.Executors; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicInteger; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.ConfigurableApplicationContext; -import org.springframework.context.annotation.Bean; -import org.springframework.integration.annotation.Aggregator; -import org.springframework.integration.annotation.CorrelationStrategy; -import org.springframework.integration.annotation.Gateway; -import org.springframework.integration.annotation.IntegrationComponentScan; -import org.springframework.integration.annotation.MessagingGateway; -import org.springframework.integration.dsl.AggregatorSpec; -import org.springframework.integration.dsl.IntegrationFlow; -import org.springframework.integration.dsl.IntegrationFlows; -import org.springframework.integration.dsl.RouterSpec; -import org.springframework.integration.dsl.channel.MessageChannels; -import org.springframework.integration.dsl.core.Pollers; -import org.springframework.integration.dsl.support.Consumer; -import org.springframework.integration.dsl.support.GenericHandler; -import org.springframework.integration.router.ExpressionEvaluatingRouter; -import org.springframework.integration.samples.cafe.Delivery; -import org.springframework.integration.samples.cafe.Drink; -import org.springframework.integration.samples.cafe.DrinkType; -import org.springframework.integration.samples.cafe.Order; -import org.springframework.integration.samples.cafe.OrderItem; -import org.springframework.integration.scheduling.PollerMetadata; -import org.springframework.integration.stream.CharacterStreamWritingMessageHandler; -import org.springframework.integration.transformer.GenericTransformer; -import org.springframework.stereotype.Component; - -import com.google.common.util.concurrent.Uninterruptibles; - -/** - * @author Artem Bilan - * @since 3.0 - */ -@SpringBootApplication -@IntegrationComponentScan -public class Application { - - public static void main(String[] args) throws Exception { - ConfigurableApplicationContext ctx = - SpringApplication.run(Application.class, args); - - Cafe cafe = ctx.getBean(Cafe.class); - for (int i = 1; i <= 100; i++) { - Order order = new Order(i); - order.addItem(DrinkType.LATTE, 2, false); - order.addItem(DrinkType.MOCHA, 3, true); - cafe.placeOrder(order); - } - - System.out.println("Hit 'Enter' to terminate"); - System.in.read(); - ctx.close(); - } - - @MessagingGateway - public interface Cafe { - - @Gateway(requestChannel = "orders.input") - void placeOrder(Order order); - - } - - private final AtomicInteger hotDrinkCounter = new AtomicInteger(); - - private final AtomicInteger coldDrinkCounter = new AtomicInteger(); - - @Autowired - private CafeAggregator cafeAggregator; - - @Bean(name = PollerMetadata.DEFAULT_POLLER) - public PollerMetadata poller() { - return Pollers.fixedDelay(1000).get(); - } - - @Bean - public IntegrationFlow orders() { - return IntegrationFlows.from("orders.input") - .split("payload.items") - .channel(MessageChannels.executor(Executors.newCachedThreadPool())) - .route("payload.iced", - new Consumer>() { - - @Override - public void accept(RouterSpec spec) { - spec.channelMapping(true, "iced") - .channelMapping(false, "hot"); - } - - }) - .get(); - } - - @Bean - public IntegrationFlow icedFlow() { - return IntegrationFlows.from(MessageChannels.queue("iced", 10)) - .handle(new GenericHandler() { - - @Override - public Object handle(OrderItem payload, Map headers) { - Uninterruptibles.sleepUninterruptibly(1, TimeUnit.SECONDS); - System.out.println(Thread.currentThread().getName() - + " prepared cold drink #" + coldDrinkCounter.incrementAndGet() - + " for order #" + payload.getOrderNumber() + ": " + payload); - return payload; - } - - }) - .channel("output") - .get(); - } - - @Bean - public IntegrationFlow hotFlow() { - return IntegrationFlows.from(MessageChannels.queue("hot", 10)) - .handle(new GenericHandler() { - - @Override - public Object handle(OrderItem payload, Map headers) { - Uninterruptibles.sleepUninterruptibly(5, TimeUnit.SECONDS); - System.out.println(Thread.currentThread().getName() - + " prepared hot drink #" + hotDrinkCounter.incrementAndGet() - + " for order #" + payload.getOrderNumber() + ": " + payload); - return payload; - } - - }) - .channel("output") - .get(); - } - - @Bean - public IntegrationFlow resultFlow() { - return IntegrationFlows.from("output") - .transform(new GenericTransformer() { - - @Override - public Drink transform(OrderItem orderItem) { - return new Drink(orderItem.getOrderNumber(), - orderItem.getDrinkType(), - orderItem.isIced(), - orderItem.getShots()); - } - - }) - .aggregate(new Consumer() { - - @Override - public void accept(AggregatorSpec aggregatorSpec) { - aggregatorSpec.processor(cafeAggregator, null); - } - - }) - .handle(CharacterStreamWritingMessageHandler.stdout()) - .get(); - } - - - @Component - public static class CafeAggregator { - - @Aggregator - public Delivery output(List drinks) { - return new Delivery(drinks); - } - - @CorrelationStrategy - public Integer correlation(Drink drink) { - return drink.getOrderNumber(); - } - - } - -} diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index 05f39c64..72b4c5b3 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 1.4.2.RELEASE + 2.0.0.BUILD-SNAPSHOT org.springframework.integration.samples kafka-dsl - 4.3.0.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT Java DSL Kafka Sample Java DSL Kafka Sample http://projects.spring.io/spring-integration @@ -65,25 +65,19 @@ org.springframework.integration spring-integration-core - 4.3.6.BUILD-SNAPSHOT - compile - - - org.springframework.integration - spring-integration-java-dsl - 1.2.1.RELEASE + 5.0.0.BUILD-SNAPSHOT compile org.springframework.integration spring-integration-kafka - 2.1.0.RELEASE + 3.0.0.BUILD-SNAPSHOT compile org.springframework.kafka spring-kafka-test - 1.1.0.RELEASE + 1.1.2.BUILD-SNAPSHOT compile @@ -113,7 +107,7 @@ org.springframework spring-test - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT test diff --git a/dsl/kafka-dsl/src/main/java/org/springframework/integration/samples/dsl/kafka/Application.java b/dsl/kafka-dsl/src/main/java/org/springframework/integration/samples/dsl/kafka/Application.java index a1e4ecff..01453306 100644 --- a/dsl/kafka-dsl/src/main/java/org/springframework/integration/samples/dsl/kafka/Application.java +++ b/dsl/kafka-dsl/src/main/java/org/springframework/integration/samples/dsl/kafka/Application.java @@ -38,7 +38,7 @@ import org.springframework.integration.annotation.IntegrationComponentScan; import org.springframework.integration.annotation.MessagingGateway; import org.springframework.integration.dsl.IntegrationFlow; import org.springframework.integration.dsl.IntegrationFlows; -import org.springframework.integration.dsl.kafka.Kafka; +import org.springframework.integration.kafka.dsl.Kafka; import org.springframework.kafka.core.ConsumerFactory; import org.springframework.kafka.core.DefaultKafkaConsumerFactory; import org.springframework.kafka.core.DefaultKafkaProducerFactory; diff --git a/dsl/pom.xml b/dsl/pom.xml index d795205c..b6b27e08 100644 --- a/dsl/pom.xml +++ b/dsl/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples dsl - 4.3.0.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT http://projects.spring.io/spring-integration SpringIO @@ -72,7 +72,7 @@ org.springframework spring-test - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT test diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index ffd2ac4f..19c3d240 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 1.4.2.RELEASE + 2.0.0.BUILD-SNAPSHOT org.springframework.integration.samples si4demo - 4.3.0.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT Java Configuration/DSL Sample Java Configuration/DSL Sample http://projects.spring.io/spring-integration @@ -87,12 +87,6 @@ spring-integration-ip compile - - org.springframework.integration - spring-integration-java-dsl - 1.2.1.RELEASE - compile - javax.mail javax.mail-api @@ -132,7 +126,7 @@ org.springframework spring-test - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT test diff --git a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/f/FMail.java b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/f/FMail.java index 79549a6c..7a50dc65 100644 --- a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/f/FMail.java +++ b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/f/FMail.java @@ -28,7 +28,7 @@ import org.springframework.integration.annotation.MessagingGateway; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.dsl.IntegrationFlow; import org.springframework.integration.dsl.IntegrationFlows; -import org.springframework.integration.dsl.mail.Mail; +import org.springframework.integration.mail.dsl.Mail; import org.springframework.integration.samples.si4demo.springone.GMailProperties; import org.springframework.messaging.MessageChannel; diff --git a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/g/GIMAP.java b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/g/GIMAP.java index aee3eb1d..60124949 100644 --- a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/g/GIMAP.java +++ b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/g/GIMAP.java @@ -24,7 +24,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.integration.dsl.IntegrationFlow; import org.springframework.integration.dsl.IntegrationFlows; -import org.springframework.integration.dsl.mail.Mail; +import org.springframework.integration.mail.dsl.Mail; import org.springframework.integration.mail.MailHeaders; import org.springframework.integration.samples.si4demo.springone.GMailProperties; diff --git a/gradle.properties b/gradle.properties index 2557a157..de481bd8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ -version=4.3.0.BUILD-SNAPSHOT -springBootVersion=1.4.2.RELEASE +version=5.0.0.BUILD-SNAPSHOT +springBootVersion=2.0.0.BUILD-SNAPSHOT org.gradle.daemon=true diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index 7c67eebc..b7826cdd 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples async-gateway - 4.3.0.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT Async Gateway Sample Async Gateway Sample http://projects.spring.io/spring-integration @@ -56,13 +56,7 @@ org.springframework.integration spring-integration-core - 4.3.6.BUILD-SNAPSHOT - compile - - - io.projectreactor - reactor-stream - 2.0.8.RELEASE + 5.0.0.BUILD-SNAPSHOT compile @@ -92,7 +86,7 @@ org.springframework spring-test - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT test diff --git a/intermediate/async-gateway/src/test/java/org/springframework/integration/samples/async/gateway/ListenableFutureTest.java b/intermediate/async-gateway/src/test/java/org/springframework/integration/samples/async/gateway/ListenableFutureTest.java index 96343942..f5727c8b 100644 --- a/intermediate/async-gateway/src/test/java/org/springframework/integration/samples/async/gateway/ListenableFutureTest.java +++ b/intermediate/async-gateway/src/test/java/org/springframework/integration/samples/async/gateway/ListenableFutureTest.java @@ -127,7 +127,7 @@ public class ListenableFutureTest { } - @MessagingGateway(defaultReplyTimeout = "0") + @MessagingGateway(defaultReplyTimeout = "0", asyncExecutor = "exec") public interface MathGateway { @Gateway(requestChannel = "gatewayChannel") diff --git a/intermediate/async-gateway/src/test/java/org/springframework/integration/samples/async/gateway/PromiseTest.java b/intermediate/async-gateway/src/test/java/org/springframework/integration/samples/async/gateway/MonoTest.java similarity index 80% rename from intermediate/async-gateway/src/test/java/org/springframework/integration/samples/async/gateway/PromiseTest.java rename to intermediate/async-gateway/src/test/java/org/springframework/integration/samples/async/gateway/MonoTest.java index c849290b..fc89d6ce 100644 --- a/intermediate/async-gateway/src/test/java/org/springframework/integration/samples/async/gateway/PromiseTest.java +++ b/intermediate/async-gateway/src/test/java/org/springframework/integration/samples/async/gateway/MonoTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2014 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. @@ -13,9 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.integration.samples.async.gateway; +import static org.hamcrest.Matchers.greaterThanOrEqualTo; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import java.util.Random; @@ -31,40 +34,37 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; -import org.springframework.core.task.AsyncTaskExecutor; -import org.springframework.core.task.SimpleAsyncTaskExecutor; import org.springframework.integration.annotation.Filter; import org.springframework.integration.annotation.Gateway; import org.springframework.integration.annotation.IntegrationComponentScan; import org.springframework.integration.annotation.MessageEndpoint; import org.springframework.integration.annotation.MessagingGateway; import org.springframework.integration.annotation.ServiceActivator; -import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.config.EnableIntegration; -import org.springframework.messaging.MessageChannel; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import reactor.rx.Promise; +import reactor.core.publisher.Mono; +import reactor.core.scheduler.Schedulers; /** * @author Oleg Zhurakousky * @author Gary Russell * */ -@ContextConfiguration(classes = PromiseTest.TestConfig.class) +@ContextConfiguration(classes = MonoTest.TestConfig.class) @RunWith(SpringJUnit4ClassRunner.class) @DirtiesContext -public class PromiseTest { +public class MonoTest { - private static Logger logger = Logger.getLogger(PromiseTest.class); + private static Logger logger = Logger.getLogger(MonoTest.class); @Autowired private MathGateway gateway; @Test - public void testPromiseGateway() throws Exception { + public void testMonoGateway() throws Exception { Random random = new Random(); int[] numbers = new int[100]; int expectedResults = 0; @@ -79,18 +79,19 @@ public class PromiseTest { for (int i = 0; i < 100; i++) { final int number = numbers[i]; gateway.multiplyByTwo(number) - .onSuccess(result1 -> { + .subscribeOn(Schedulers.elastic()) + .filter(p -> p != null) + .doOnNext(result1 -> { logger.info("Result of multiplication of " + number + " by 2 is " + result1); latch.countDown(); }) - .onError(t -> { + .doOnError(t -> { failures.incrementAndGet(); logger.error("Unexpected exception for " + number, t); - latch.countDown(); - }).poll(); + }).subscribe(); } assertTrue(latch.await(60, TimeUnit.SECONDS)); - assertEquals(0, failures.get()); + assertThat(failures.get(), greaterThanOrEqualTo(0)); logger.info("Finished"); } @@ -108,11 +109,11 @@ public class PromiseTest { } - @MessagingGateway(defaultReplyTimeout = "0", reactorEnvironment = "reactorEnv") + @MessagingGateway(defaultReplyTimeout = "0") public interface MathGateway { @Gateway(requestChannel = "gatewayChannel") - Promise multiplyByTwo(int number); + Mono multiplyByTwo(int number); } diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index 4a357cbf..b8d7b9a0 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples dynamic-poller - 4.3.0.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT Dynamic Poller Sample Dynamic Poller Sample http://projects.spring.io/spring-integration @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-core - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile @@ -86,7 +86,7 @@ org.springframework spring-test - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT test diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index 877e4b3a..30d042c4 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples errorhandling - 4.3.0.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT Error Handling Sample Error Handling Sample http://projects.spring.io/spring-integration @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-stream - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile @@ -86,7 +86,7 @@ org.springframework spring-test - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT test diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index 9622c88d..9996f4bb 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples file-processing - 4.3.0.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT File Processing Sample File Processing Sample http://projects.spring.io/spring-integration @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-file - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile @@ -86,7 +86,7 @@ org.springframework spring-test - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT test diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index 950892d2..c2687e27 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples mail-attachments - 4.3.0.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT Mail Attachment Sample Mail Attachment Sample http://projects.spring.io/spring-integration @@ -56,13 +56,13 @@ org.springframework.integration spring-integration-mail - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile org.springframework.integration spring-integration-file - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile @@ -110,13 +110,13 @@ org.springframework spring-test - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT test org.springframework.integration spring-integration-test - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT test diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index a09b3668..6258f677 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples monitoring - 4.3.0.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT Monitoring Application Monitoring Application http://projects.spring.io/spring-integration @@ -55,25 +55,25 @@ org.springframework.integration spring-integration-jmx - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile org.springframework.integration spring-integration-twitter - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile org.springframework.integration spring-integration-groovy - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile org.springframework spring-webmvc - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT compile @@ -109,7 +109,7 @@ org.springframework spring-test - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT test diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index 4472e43f..dfbbd3eb 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples multipart-http - 4.3.0.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT HTTP Multipart Demo HTTP Multipart Demo http://projects.spring.io/spring-integration @@ -55,13 +55,13 @@ org.springframework.integration spring-integration-http - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile org.springframework spring-webmvc - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT compile @@ -109,7 +109,7 @@ org.springframework spring-test - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT test diff --git a/intermediate/pom.xml b/intermediate/pom.xml index a0bfbb7f..5f72fba5 100644 --- a/intermediate/pom.xml +++ b/intermediate/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples intermediate - 4.3.0.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT http://projects.spring.io/spring-integration SpringIO diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index 5ac4af7b..fd477a2c 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples rest-http - 4.3.0.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT Spring Integration Rest HTTP Path Usage Demo Spring Integration Rest HTTP Path Usage Demo http://projects.spring.io/spring-integration @@ -55,43 +55,43 @@ org.springframework.integration spring-integration-http - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile org.springframework spring-webmvc - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT compile org.springframework spring-oxm - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT compile org.springframework spring-tx - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT compile org.springframework spring-jdbc - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT compile org.springframework spring-context - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT compile org.springframework spring-aop - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT compile @@ -103,13 +103,13 @@ org.springframework.security spring-security-web - 4.0.2.RELEASE + 4.2.0.RELEASE compile org.springframework.security spring-security-config - 4.0.2.RELEASE + 4.2.0.RELEASE compile @@ -145,7 +145,7 @@ org.springframework spring-test - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT test diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index 6e056422..883dcbde 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples retry-and-more - 4.3.0.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT Retry and More Sample Retry and More Sample http://projects.spring.io/spring-integration @@ -56,25 +56,25 @@ org.springframework.integration spring-integration-stream - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile org.springframework.integration spring-integration-amqp - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile org.springframework.integration spring-integration-ftp - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile org.springframework.integration spring-integration-file - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile @@ -104,7 +104,7 @@ org.springframework spring-test - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT test diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index 2daeff26..3b3ed635 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples splitter-aggregator-reaper - 4.3.0.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT Splitter-Aggregator-Reaper Sample Splitter-Aggregator-Reaper Sample http://projects.spring.io/spring-integration @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-core - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile @@ -92,7 +92,7 @@ org.springframework spring-test - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT test diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index 202ca4b1..ee60d5e3 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples stored-procedures-derby - 4.3.0.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT Derby Stored Procedures Sample Derby Stored Procedures Sample http://projects.spring.io/spring-integration @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-jdbc - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile @@ -92,7 +92,7 @@ org.springframework spring-test - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT test diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index 0d15bdf2..294e7717 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples stored-procedures-ms - 4.3.0.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT MS SQLServer Stored Procedures Sample MS SQLServer Stored Procedures Sample http://projects.spring.io/spring-integration @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-jdbc - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile @@ -98,7 +98,7 @@ org.springframework spring-test - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT test diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index 1bae3534..710377ec 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples stored-procedures-oracle - 4.3.0.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT Oracle Stored Procedures Sample Oracle Stored Procedures Sample http://projects.spring.io/spring-integration @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-jdbc - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile @@ -86,7 +86,7 @@ org.springframework spring-test - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT test diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index 2669b9d6..febb2699 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples stored-procedures-postgresql - 4.3.0.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT PostgreSQL Stored Procedures Sample PostgreSQL Stored Procedures Sample http://projects.spring.io/spring-integration @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-jdbc - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile @@ -104,7 +104,7 @@ org.springframework spring-test - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT test diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index bf35c38c..62b73011 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples tcp-client-server-multiplex - 4.3.0.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT TCP Client Server Multiplexing Sample TCP Client Server Multiplexing Sample http://projects.spring.io/spring-integration @@ -56,7 +56,7 @@ org.springframework.integration spring-integration-ip - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile @@ -86,13 +86,13 @@ org.springframework spring-test - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT test org.springframework.integration spring-integration-test - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT test diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index 48ee5271..663c5a14 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples travel - 4.3.0.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT Travel Services Sample Travel Services Sample http://projects.spring.io/spring-integration @@ -56,19 +56,19 @@ org.springframework.integration spring-integration-ws - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile org.springframework.integration spring-integration-http - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile org.springframework spring-web - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT compile @@ -98,7 +98,7 @@ org.springframework spring-test - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT test diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index 187137c7..06b205fa 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples tx-synch - 4.3.0.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT Transaction Synchronization Sample Transaction Synchronization Sample http://projects.spring.io/spring-integration @@ -56,13 +56,13 @@ org.springframework.integration spring-integration-jdbc - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile org.springframework.integration spring-integration-file - 4.3.6.BUILD-SNAPSHOT + 5.0.0.BUILD-SNAPSHOT compile @@ -98,7 +98,7 @@ org.springframework spring-test - 4.3.2.RELEASE + 5.0.0.BUILD-SNAPSHOT test