From 5956cf8cfb33b3439af1d1a5f5d20ea8348b5cfb Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Mon, 10 Apr 2017 13:53:06 -0400 Subject: [PATCH] Fix FTP sample tests to use bigger idle https://build.spring.io/browse/INTSAMPLES-NIGHTLY-2059/ Fix `JmsMockTests` stubbing via making endpoint stopped before mocking Force SI and SF versions via their BOMs imports Regenerate POMs including `dependencyManagement` for BOMs customization --- advanced/advanced-testing-examples/pom.xml | 29 +- .../testing/jms/JmsMockTests-context.xml | 6 +- .../advance/testing/jms/JmsMockTests.java | 18 +- advanced/dynamic-ftp/pom.xml | 28 +- advanced/dynamic-tcp-client/pom.xml | 32 ++- applications/cafe-scripted/pom.xml | 31 +- applications/cafe/cafe-amqp/pom.xml | 28 +- applications/cafe/cafe-jms/pom.xml | 28 +- applications/cafe/cafe-si/pom.xml | 28 +- applications/file-split-ftp/pom.xml | 41 ++- applications/loan-broker/pom.xml | 28 +- applications/loanshark/pom.xml | 36 ++- applications/stomp-chat/pom.xml | 31 +- basic/amqp-affinity/pom.xml | 27 +- basic/amqp/pom.xml | 29 +- basic/barrier/pom.xml | 39 ++- basic/control-bus/pom.xml | 28 +- basic/enricher/pom.xml | 28 +- basic/feed/pom.xml | 28 +- basic/file/pom.xml | 28 +- basic/ftp/pom.xml | 29 +- .../ftp/FtpInboundChannelAdapterSample.java | 7 +- .../ftp/FtpOutboundChannelAdapterSample.java | 5 +- .../integration/samples/ftp/TestSuite.java | 2 +- .../FtpOutboundGatewaySample-context.xml | 2 +- basic/helloworld/pom.xml | 28 +- basic/http-boot/pom.xml | 27 +- basic/http/pom.xml | 27 +- basic/jdbc/pom.xml | 28 +- basic/jms/pom.xml | 30 +- basic/jmx/pom.xml | 29 +- basic/jpa/pom.xml | 59 ++-- basic/kafka/pom.xml | 32 ++- basic/mail/pom.xml | 29 +- basic/mongodb/pom.xml | 28 +- basic/mqtt/pom.xml | 33 ++- basic/oddeven/pom.xml | 28 +- basic/quote/pom.xml | 28 +- basic/sftp/pom.xml | 28 +- basic/splunk/pom.xml | 32 ++- basic/tcp-amqp/pom.xml | 29 +- basic/tcp-client-server/pom.xml | 29 +- basic/testing-examples/pom.xml | 32 ++- basic/twitter/pom.xml | 28 +- basic/web-sockets/pom.xml | 31 +- basic/ws-inbound-gateway/pom.xml | 27 +- basic/ws-outbound-gateway/pom.xml | 29 +- basic/xml/pom.xml | 28 +- basic/xmpp/pom.xml | 28 +- build.gradle | 266 ++++++++++-------- dsl/cafe-dsl/pom.xml | 32 ++- dsl/kafka-dsl/pom.xml | 32 ++- dsl/pom.xml | 27 +- dsl/si4demo/pom.xml | 31 +- gradle.properties | 1 - intermediate/async-gateway/pom.xml | 28 +- intermediate/dynamic-poller/pom.xml | 28 +- intermediate/errorhandling/pom.xml | 28 +- intermediate/file-processing/pom.xml | 28 +- intermediate/mail-attachments/pom.xml | 30 +- intermediate/monitoring/pom.xml | 28 +- intermediate/multipart-http/pom.xml | 26 +- intermediate/rest-http/pom.xml | 31 +- intermediate/retry-and-more/pom.xml | 31 +- .../splitter-aggregator-reaper/pom.xml | 28 +- intermediate/stored-procedures-derby/pom.xml | 28 +- intermediate/stored-procedures-ms/pom.xml | 28 +- intermediate/stored-procedures-oracle/pom.xml | 28 +- .../stored-procedures-postgresql/pom.xml | 28 +- .../tcp-client-server-multiplex/pom.xml | 29 +- intermediate/travel/pom.xml | 30 +- intermediate/tx-synch/pom.xml | 29 +- 72 files changed, 1771 insertions(+), 447 deletions(-) diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index 5a9d5a95..566c9e6c 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.integration.samples advanced-testing-examples @@ -62,13 +61,11 @@ org.springframework.integration spring-integration-jms - 5.0.0.M3 compile org.springframework.integration spring-integration-groovy - 5.0.0.M3 compile @@ -110,7 +107,6 @@ org.springframework spring-test - 5.0.0.BUILD-SNAPSHOT test @@ -120,5 +116,28 @@ Spring Framework Maven Milestone Repository https://repo.spring.io/libs-milestone + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/libs-snapshot + + + + + org.springframework.integration + spring-integration-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework + spring-framework-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + diff --git a/advanced/advanced-testing-examples/src/test/java/org/springframework/integration/samples/advance/testing/jms/JmsMockTests-context.xml b/advanced/advanced-testing-examples/src/test/java/org/springframework/integration/samples/advance/testing/jms/JmsMockTests-context.xml index b1ba42b5..4672c6d7 100644 --- a/advanced/advanced-testing-examples/src/test/java/org/springframework/integration/samples/advance/testing/jms/JmsMockTests-context.xml +++ b/advanced/advanced-testing-examples/src/test/java/org/springframework/integration/samples/advance/testing/jms/JmsMockTests-context.xml @@ -9,13 +9,13 @@ - + diff --git a/advanced/advanced-testing-examples/src/test/java/org/springframework/integration/samples/advance/testing/jms/JmsMockTests.java b/advanced/advanced-testing-examples/src/test/java/org/springframework/integration/samples/advance/testing/jms/JmsMockTests.java index 3a0208a5..309a0c9f 100644 --- a/advanced/advanced-testing-examples/src/test/java/org/springframework/integration/samples/advance/testing/jms/JmsMockTests.java +++ b/advanced/advanced-testing-examples/src/test/java/org/springframework/integration/samples/advance/testing/jms/JmsMockTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2017 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. @@ -36,6 +36,7 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.integration.endpoint.SourcePollingChannelAdapter; import org.springframework.jms.core.JmsTemplate; import org.springframework.jms.support.converter.SimpleMessageConverter; import org.springframework.messaging.Message; @@ -62,19 +63,22 @@ public class JmsMockTests { private static final Logger LOGGER = Logger.getLogger(JmsMockTests.class); @Autowired - JmsTemplate mockJmsTemplate; + private JmsTemplate mockJmsTemplate; + + @Autowired + private SourcePollingChannelAdapter jmsInboundChannelAdapter; @Autowired @Qualifier("inputChannel") - MessageChannel inputChannel; + private MessageChannel inputChannel; @Autowired @Qualifier("outputChannel") - SubscribableChannel outputChannel; + private SubscribableChannel outputChannel; @Autowired @Qualifier("invalidMessageChannel") - SubscribableChannel invalidMessageChannel; + private SubscribableChannel invalidMessageChannel; /** * This test verifies that a message received on a polling JMS inbound channel adapter is @@ -110,7 +114,7 @@ public class JmsMockTests { @Test public void testReceiveInvalidMessage() throws JMSException, IOException, InterruptedException { String msg = "whoops"; - boolean sent = verifyJmsMessageReceivedOnOutputChannel(msg, invalidMessageChannel,new CountDownHandler() { + boolean sent = verifyJmsMessageReceivedOnOutputChannel(msg, invalidMessageChannel, new CountDownHandler() { @Override protected void verifyMessage(Message message) { @@ -177,6 +181,8 @@ public class JmsMockTests { expectedOutputChannel.subscribe(handler); + this.jmsInboundChannelAdapter.start(); + boolean latchCountedToZero = latch.await(timeoutMillisec, TimeUnit.MILLISECONDS); if (!latchCountedToZero) { diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index 78778e9e..a2ced39e 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.integration.samples dynamic-ftp @@ -56,7 +55,6 @@ org.springframework.integration spring-integration-ftp - 5.0.0.M3 compile @@ -98,7 +96,6 @@ org.springframework spring-test - 5.0.0.BUILD-SNAPSHOT test @@ -108,5 +105,28 @@ Spring Framework Maven Milestone Repository https://repo.spring.io/libs-milestone + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/libs-snapshot + + + + + org.springframework.integration + spring-integration-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework + spring-framework-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index 3613af9d..f8198e14 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -65,7 +65,6 @@ org.springframework.integration spring-integration-ip - 5.0.0.M3 compile @@ -101,7 +100,6 @@ org.springframework spring-test - 5.0.0.BUILD-SNAPSHOT test @@ -116,6 +114,11 @@ Spring Framework Maven Milestone Repository https://repo.spring.io/libs-milestone + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/libs-snapshot + @@ -125,4 +128,29 @@ + + + + org.springframework.integration + spring-integration-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework + spring-framework-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework.boot + spring-boot-dependencies + 2.0.0.BUILD-SNAPSHOT + import + pom + + + diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index 0a49f806..ec1fb0b0 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.integration.samples cafe-scripted @@ -56,25 +55,21 @@ org.springframework.integration spring-integration-stream - 5.0.0.M3 compile org.springframework.integration spring-integration-groovy - 5.0.0.M3 compile org.springframework.integration spring-integration-rmi - 5.0.0.M3 compile org.springframework.integration spring-integration-jmx - 5.0.0.M3 compile @@ -134,7 +129,6 @@ org.springframework spring-test - 5.0.0.BUILD-SNAPSHOT test @@ -144,5 +138,28 @@ Spring Framework Maven Milestone Repository https://repo.spring.io/libs-milestone + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/libs-snapshot + + + + + org.springframework.integration + spring-integration-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework + spring-framework-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index 9d186f10..ac471e1b 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.integration.samples cafe-amqp @@ -62,7 +61,6 @@ org.springframework.integration spring-integration-amqp - 5.0.0.M3 compile @@ -104,7 +102,6 @@ org.springframework spring-test - 5.0.0.BUILD-SNAPSHOT test @@ -114,5 +111,28 @@ Spring Framework Maven Milestone Repository https://repo.spring.io/libs-milestone + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/libs-snapshot + + + + + org.springframework.integration + spring-integration-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework + spring-framework-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index 55bebf9c..a463afa4 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.integration.samples cafe-jms @@ -80,7 +79,6 @@ org.springframework.integration spring-integration-jms - 5.0.0.M3 compile @@ -128,7 +126,6 @@ org.springframework spring-test - 5.0.0.BUILD-SNAPSHOT test @@ -138,5 +135,28 @@ Spring Framework Maven Milestone Repository https://repo.spring.io/libs-milestone + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/libs-snapshot + + + + + org.springframework.integration + spring-integration-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework + spring-framework-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index 54c3fb26..6a8d0355 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.integration.samples cafe-si @@ -56,7 +55,6 @@ org.springframework.integration spring-integration-stream - 5.0.0.M3 compile @@ -104,7 +102,6 @@ org.springframework spring-test - 5.0.0.BUILD-SNAPSHOT test @@ -114,5 +111,28 @@ Spring Framework Maven Milestone Repository https://repo.spring.io/libs-milestone + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/libs-snapshot + + + + + org.springframework.integration + spring-integration-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework + spring-framework-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index 0c814252..63fb89ca 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -67,28 +67,19 @@ spring-boot-starter-integration compile - - org.springframework.integration - spring-integration-core - 5.0.0.M3 - compile - org.springframework.integration spring-integration-ftp - 5.0.0.M3 compile org.springframework.integration spring-integration-http - 5.0.0.M3 compile org.springframework.integration spring-integration-mail - 5.0.0.M3 compile @@ -136,7 +127,6 @@ org.springframework spring-test - 5.0.0.BUILD-SNAPSHOT test @@ -147,7 +137,6 @@ org.springframework.integration spring-integration-test - 5.0.0.M3 test @@ -157,6 +146,11 @@ Spring Framework Maven Milestone Repository https://repo.spring.io/libs-milestone + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/libs-snapshot + @@ -166,4 +160,29 @@ + + + + org.springframework.integration + spring-integration-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework + spring-framework-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework.boot + spring-boot-dependencies + 2.0.0.BUILD-SNAPSHOT + import + pom + + + diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index 0423ff83..f30e4472 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.integration.samples loan-broker @@ -56,7 +55,6 @@ org.springframework.integration spring-integration-ip - 5.0.0.M3 compile @@ -98,7 +96,6 @@ org.springframework spring-test - 5.0.0.BUILD-SNAPSHOT test @@ -108,5 +105,28 @@ Spring Framework Maven Milestone Repository https://repo.spring.io/libs-milestone + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/libs-snapshot + + + + + org.springframework.integration + spring-integration-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework + spring-framework-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index 0e3bdc6e..10084296 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -55,31 +55,26 @@ org.springframework.integration spring-integration-ip - 5.0.0.M3 compile org.springframework spring-webmvc - 5.0.0.BUILD-SNAPSHOT compile org.springframework spring-orm - 5.0.0.BUILD-SNAPSHOT compile org.springframework spring-aop - 5.0.0.BUILD-SNAPSHOT compile org.springframework spring-aspects - 5.0.0.BUILD-SNAPSHOT compile @@ -91,19 +86,16 @@ org.springframework spring-jdbc - 5.0.0.BUILD-SNAPSHOT compile org.springframework spring-tx - 5.0.0.BUILD-SNAPSHOT compile org.springframework spring-context - 5.0.0.BUILD-SNAPSHOT compile @@ -169,7 +161,7 @@ org.hibernate hibernate-validator - 4.2.0.Final + 5.2.4.Final compile @@ -181,7 +173,7 @@ org.hibernate hibernate-entitymanager - 5.0.9.Final + 5.2.4.Final compile @@ -247,7 +239,6 @@ org.springframework spring-test - 5.0.0.BUILD-SNAPSHOT test @@ -257,6 +248,11 @@ Spring Framework Maven Milestone Repository https://repo.spring.io/libs-milestone + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/libs-snapshot + war @@ -273,4 +269,22 @@ + + + + org.springframework.integration + spring-integration-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework + spring-framework-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index 8ae32244..b9223798 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -110,7 +110,6 @@ org.springframework spring-test - 5.0.0.BUILD-SNAPSHOT test @@ -125,6 +124,11 @@ Spring Framework Maven Milestone Repository https://repo.spring.io/libs-milestone + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/libs-snapshot + @@ -134,4 +138,29 @@ + + + + org.springframework.integration + spring-integration-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework + spring-framework-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework.boot + spring-boot-dependencies + 2.0.0.BUILD-SNAPSHOT + import + pom + + + diff --git a/basic/amqp-affinity/pom.xml b/basic/amqp-affinity/pom.xml index dc0c2b4c..45c9ba0e 100644 --- a/basic/amqp-affinity/pom.xml +++ b/basic/amqp-affinity/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.integration.samples amqp-affinity @@ -84,7 +83,6 @@ org.springframework spring-test - 5.0.0.BUILD-SNAPSHOT test @@ -94,5 +92,28 @@ Spring Framework Maven Milestone Repository https://repo.spring.io/libs-milestone + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/libs-snapshot + + + + + org.springframework.integration + spring-integration-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework + spring-framework-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index c93e00a1..8b96dccc 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.integration.samples amqp @@ -56,13 +55,11 @@ org.springframework.integration spring-integration-stream - 5.0.0.M3 compile org.springframework.integration spring-integration-amqp - 5.0.0.M3 compile @@ -104,7 +101,6 @@ org.springframework spring-test - 5.0.0.BUILD-SNAPSHOT test @@ -114,5 +110,28 @@ Spring Framework Maven Milestone Repository https://repo.spring.io/libs-milestone + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/libs-snapshot + + + + + org.springframework.integration + spring-integration-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework + spring-framework-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index 8787840a..d8350e7f 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -72,22 +72,14 @@ spring-boot-starter-amqp compile - - org.springframework.integration - spring-integration-core - 5.0.0.M3 - compile - org.springframework.integration spring-integration-amqp - 5.0.0.M3 compile org.springframework.integration spring-integration-http - 5.0.0.M3 compile @@ -123,7 +115,6 @@ org.springframework spring-test - 5.0.0.BUILD-SNAPSHOT test @@ -138,6 +129,11 @@ Spring Framework Maven Milestone Repository https://repo.spring.io/libs-milestone + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/libs-snapshot + @@ -147,4 +143,29 @@ + + + + org.springframework.integration + spring-integration-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework + spring-framework-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework.boot + spring-boot-dependencies + 2.0.0.BUILD-SNAPSHOT + import + pom + + + diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index 8908bb2a..bc7e7858 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.integration.samples control-bus @@ -56,7 +55,6 @@ org.springframework.integration spring-integration-core - 5.0.0.M3 compile @@ -98,7 +96,6 @@ org.springframework spring-test - 5.0.0.BUILD-SNAPSHOT test @@ -108,5 +105,28 @@ Spring Framework Maven Milestone Repository https://repo.spring.io/libs-milestone + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/libs-snapshot + + + + + org.springframework.integration + spring-integration-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework + spring-framework-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index a0f1132c..770f88d7 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.integration.samples enricher @@ -56,7 +55,6 @@ org.springframework.integration spring-integration-core - 5.0.0.M3 compile @@ -104,7 +102,6 @@ org.springframework spring-test - 5.0.0.BUILD-SNAPSHOT test @@ -114,5 +111,28 @@ Spring Framework Maven Milestone Repository https://repo.spring.io/libs-milestone + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/libs-snapshot + + + + + org.springframework.integration + spring-integration-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework + spring-framework-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index 972b7842..4b8150b9 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.integration.samples feed @@ -56,7 +55,6 @@ org.springframework.integration spring-integration-feed - 5.0.0.M3 compile @@ -98,7 +96,6 @@ org.springframework spring-test - 5.0.0.BUILD-SNAPSHOT test @@ -108,5 +105,28 @@ Spring Framework Maven Milestone Repository https://repo.spring.io/libs-milestone + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/libs-snapshot + + + + + org.springframework.integration + spring-integration-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework + spring-framework-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + diff --git a/basic/file/pom.xml b/basic/file/pom.xml index f855b2c0..73ca49aa 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.integration.samples file @@ -56,7 +55,6 @@ org.springframework.integration spring-integration-file - 5.0.0.M3 compile @@ -98,7 +96,6 @@ org.springframework spring-test - 5.0.0.BUILD-SNAPSHOT test @@ -108,5 +105,28 @@ Spring Framework Maven Milestone Repository https://repo.spring.io/libs-milestone + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/libs-snapshot + + + + + org.springframework.integration + spring-integration-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework + spring-framework-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index 36097699..351195bd 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.integration.samples ftp @@ -56,7 +55,6 @@ org.springframework.integration spring-integration-ftp - 5.0.0.M3 compile @@ -116,7 +114,6 @@ org.springframework spring-test - 5.0.0.BUILD-SNAPSHOT test @@ -128,7 +125,6 @@ org.springframework.integration spring-integration-test - 5.0.0.M3 test @@ -138,5 +134,28 @@ Spring Framework Maven Milestone Repository https://repo.spring.io/libs-milestone + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/libs-snapshot + + + + + org.springframework.integration + spring-integration-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework + spring-framework-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + diff --git a/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/FtpInboundChannelAdapterSample.java b/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/FtpInboundChannelAdapterSample.java index caeed7eb..b014bda6 100644 --- a/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/FtpInboundChannelAdapterSample.java +++ b/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/FtpInboundChannelAdapterSample.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2017 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,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.integration.samples.ftp; import static org.junit.Assert.assertNotNull; @@ -44,8 +45,8 @@ public class FtpInboundChannelAdapterSample { PollableChannel ftpChannel = ctx.getBean("ftpChannel", PollableChannel.class); - Message message1 = ftpChannel.receive(2000); - Message message2 = ftpChannel.receive(2000); + Message message1 = ftpChannel.receive(10000); + Message message2 = ftpChannel.receive(10000); Message message3 = ftpChannel.receive(1000); LOGGER.info(String.format("Received first file message: %s.", message1)); diff --git a/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/FtpOutboundChannelAdapterSample.java b/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/FtpOutboundChannelAdapterSample.java index 8ef70e7b..70ae206c 100644 --- a/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/FtpOutboundChannelAdapterSample.java +++ b/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/FtpOutboundChannelAdapterSample.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2017 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,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.integration.samples.ftp; import static org.junit.Assert.assertTrue; @@ -76,7 +77,7 @@ public class FtpOutboundChannelAdapterSample { assertTrue(new File(TestSuite.FTP_ROOT_DIR + File.separator + "a.txt").exists()); assertTrue(new File(TestSuite.FTP_ROOT_DIR + File.separator + "b.txt").exists()); - LOGGER.info("Successfully transfered file 'a.txt' and 'b.txt' to a remote FTP location."); + LOGGER.info("Successfully transferred file 'a.txt' and 'b.txt' to a remote FTP location."); ctx.close(); } diff --git a/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/TestSuite.java b/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/TestSuite.java index d48d813d..e080b626 100644 --- a/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/TestSuite.java +++ b/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/TestSuite.java @@ -87,7 +87,7 @@ public class TestSuite { ListenerFactory factory = new ListenerFactory(); factory.setPort(availableServerSocket); - + factory.setIdleTimeout(600); serverFactory.addListener("default", factory.createListener()); server = serverFactory.createServer(); diff --git a/basic/ftp/src/test/resources/META-INF/spring/integration/FtpOutboundGatewaySample-context.xml b/basic/ftp/src/test/resources/META-INF/spring/integration/FtpOutboundGatewaySample-context.xml index 5e9fd5d7..1aaad567 100644 --- a/basic/ftp/src/test/resources/META-INF/spring/integration/FtpOutboundGatewaySample-context.xml +++ b/basic/ftp/src/test/resources/META-INF/spring/integration/FtpOutboundGatewaySample-context.xml @@ -30,7 +30,7 @@ expression="payload" reply-channel="toSplitter"> - + diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index ea48f85b..720d9525 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.integration.samples helloworld @@ -56,7 +55,6 @@ org.springframework.integration spring-integration-core - 5.0.0.M3 compile @@ -98,7 +96,6 @@ org.springframework spring-test - 5.0.0.BUILD-SNAPSHOT test @@ -108,5 +105,28 @@ Spring Framework Maven Milestone Repository https://repo.spring.io/libs-milestone + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/libs-snapshot + + + + + org.springframework.integration + spring-integration-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework + spring-framework-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + diff --git a/basic/http-boot/pom.xml b/basic/http-boot/pom.xml index de729882..0a32f119 100644 --- a/basic/http-boot/pom.xml +++ b/basic/http-boot/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.integration.samples http-boot @@ -84,7 +83,6 @@ org.springframework spring-test - 5.0.0.BUILD-SNAPSHOT test @@ -94,5 +92,28 @@ Spring Framework Maven Milestone Repository https://repo.spring.io/libs-milestone + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/libs-snapshot + + + + + org.springframework.integration + spring-integration-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework + spring-framework-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + diff --git a/basic/http/pom.xml b/basic/http/pom.xml index 35c98d2a..afdb64fe 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -55,19 +55,16 @@ org.springframework.integration spring-integration-http - 5.0.0.M3 compile org.springframework.integration spring-integration-mail - 5.0.0.M3 compile org.springframework spring-webmvc - 5.0.0.BUILD-SNAPSHOT compile @@ -133,7 +130,6 @@ org.springframework spring-test - 5.0.0.BUILD-SNAPSHOT test @@ -143,6 +139,11 @@ Spring Framework Maven Milestone Repository https://repo.spring.io/libs-milestone + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/libs-snapshot + war @@ -159,4 +160,22 @@ + + + + org.springframework.integration + spring-integration-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework + spring-framework-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index ba86d482..d965813f 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.integration.samples jdbc @@ -56,7 +55,6 @@ org.springframework.integration spring-integration-jdbc - 5.0.0.M3 compile @@ -104,7 +102,6 @@ org.springframework spring-test - 5.0.0.BUILD-SNAPSHOT test @@ -114,5 +111,28 @@ Spring Framework Maven Milestone Repository https://repo.spring.io/libs-milestone + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/libs-snapshot + + + + + org.springframework.integration + spring-integration-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework + spring-framework-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index 1a082677..38d5d4a6 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.integration.samples jms @@ -62,13 +61,11 @@ org.springframework.integration spring-integration-jms - 5.0.0.M3 compile org.springframework.integration spring-integration-stream - 5.0.0.M3 compile @@ -128,13 +125,11 @@ org.springframework spring-test - 5.0.0.BUILD-SNAPSHOT test org.springframework.integration spring-integration-test - 5.0.0.M3 test @@ -144,5 +139,28 @@ Spring Framework Maven Milestone Repository https://repo.spring.io/libs-milestone + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/libs-snapshot + + + + + org.springframework.integration + spring-integration-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework + spring-framework-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index 8242f9a7..af84a768 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.integration.samples jmx @@ -56,13 +55,11 @@ org.springframework.integration spring-integration-jmx - 5.0.0.M3 compile org.springframework.integration spring-integration-stream - 5.0.0.M3 compile @@ -104,7 +101,6 @@ org.springframework spring-test - 5.0.0.BUILD-SNAPSHOT test @@ -114,5 +110,28 @@ Spring Framework Maven Milestone Repository https://repo.spring.io/libs-milestone + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/libs-snapshot + + + + + org.springframework.integration + spring-integration-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework + spring-framework-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index 4e889dc5..8b3b599a 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -62,10 +62,6 @@ spring-boot-starter-data-jpa compile - - commons-logging - commons-logging - jboss-transaction-api_1.2_spec org.jboss.spec.javax.transaction @@ -75,13 +71,8 @@ org.springframework.integration spring-integration-jpa - 5.0.0.M3 compile - - commons-logging - commons-logging - jboss-transaction-api_1.2_spec org.jboss.spec.javax.transaction @@ -94,10 +85,6 @@ 1.3.175 compile - - commons-logging - commons-logging - jboss-transaction-api_1.2_spec org.jboss.spec.javax.transaction @@ -107,13 +94,8 @@ org.springframework spring-instrument - 5.0.0.BUILD-SNAPSHOT runtime - - commons-logging - commons-logging - jboss-transaction-api_1.2_spec org.jboss.spec.javax.transaction @@ -126,10 +108,6 @@ 1.0.0.Final runtime - - commons-logging - commons-logging - jboss-transaction-api_1.2_spec org.jboss.spec.javax.transaction @@ -139,13 +117,9 @@ org.eclipse.persistence org.eclipse.persistence.jpa - 2.4.2 + 2.6.2 runtime - - commons-logging - commons-logging - jboss-transaction-api_1.2_spec org.jboss.spec.javax.transaction @@ -185,7 +159,6 @@ org.springframework spring-test - 5.0.0.BUILD-SNAPSHOT test @@ -200,6 +173,11 @@ Spring Framework Maven Milestone Repository https://repo.spring.io/libs-milestone + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/libs-snapshot + @@ -209,4 +187,29 @@ + + + + org.springframework.integration + spring-integration-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework + spring-framework-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework.boot + spring-boot-dependencies + 2.0.0.BUILD-SNAPSHOT + import + pom + + + diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index f9e3b586..3a90f6ed 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -77,7 +77,6 @@ org.springframework.integration spring-integration-core - 5.0.0.M3 compile @@ -125,7 +124,6 @@ org.springframework spring-test - 5.0.0.BUILD-SNAPSHOT test @@ -140,6 +138,11 @@ Spring Framework Maven Milestone Repository https://repo.spring.io/libs-milestone + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/libs-snapshot + @@ -149,4 +152,29 @@ + + + + org.springframework.integration + spring-integration-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework + spring-framework-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework.boot + spring-boot-dependencies + 2.0.0.BUILD-SNAPSHOT + import + pom + + + diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index 6c01b001..fa5bd845 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.integration.samples mail @@ -56,13 +55,11 @@ org.springframework.integration spring-integration-mail - 5.0.0.M3 compile org.springframework spring-context - 5.0.0.BUILD-SNAPSHOT compile @@ -116,7 +113,6 @@ org.springframework spring-test - 5.0.0.BUILD-SNAPSHOT test @@ -126,5 +122,28 @@ Spring Framework Maven Milestone Repository https://repo.spring.io/libs-milestone + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/libs-snapshot + + + + + org.springframework.integration + spring-integration-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework + spring-framework-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index 92969c88..b5cf1d8d 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.integration.samples mongodb @@ -56,7 +55,6 @@ org.springframework.integration spring-integration-mongodb - 5.0.0.M3 compile @@ -98,7 +96,6 @@ org.springframework spring-test - 5.0.0.BUILD-SNAPSHOT test @@ -108,5 +105,28 @@ Spring Framework Maven Milestone Repository https://repo.spring.io/libs-milestone + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/libs-snapshot + + + + + org.springframework.integration + spring-integration-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework + spring-framework-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index 7131d48f..6a322258 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -65,13 +65,11 @@ org.springframework.integration spring-integration-stream - 5.0.0.M3 compile org.springframework.integration spring-integration-mqtt - 5.0.0.M3 compile @@ -107,7 +105,6 @@ org.springframework spring-test - 5.0.0.BUILD-SNAPSHOT test @@ -117,6 +114,11 @@ Spring Framework Maven Milestone Repository https://repo.spring.io/libs-milestone + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/libs-snapshot + @@ -126,4 +128,29 @@ + + + + org.springframework.integration + spring-integration-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework + spring-framework-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework.boot + spring-boot-dependencies + 2.0.0.BUILD-SNAPSHOT + import + pom + + + diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index f3e8797f..32282942 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.integration.samples oddeven @@ -56,7 +55,6 @@ org.springframework.integration spring-integration-core - 5.0.0.M3 compile @@ -98,7 +96,6 @@ org.springframework spring-test - 5.0.0.BUILD-SNAPSHOT test @@ -108,5 +105,28 @@ Spring Framework Maven Milestone Repository https://repo.spring.io/libs-milestone + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/libs-snapshot + + + + + org.springframework.integration + spring-integration-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework + spring-framework-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index 909b6b3f..9d638c21 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.integration.samples quote @@ -56,7 +55,6 @@ org.springframework.integration spring-integration-stream - 5.0.0.M3 compile @@ -98,7 +96,6 @@ org.springframework spring-test - 5.0.0.BUILD-SNAPSHOT test @@ -108,5 +105,28 @@ Spring Framework Maven Milestone Repository https://repo.spring.io/libs-milestone + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/libs-snapshot + + + + + org.springframework.integration + spring-integration-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework + spring-framework-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index 4722feef..b512ea0d 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.integration.samples sftp @@ -56,7 +55,6 @@ org.springframework.integration spring-integration-sftp - 5.0.0.M3 compile @@ -104,7 +102,6 @@ org.springframework spring-test - 5.0.0.BUILD-SNAPSHOT test @@ -114,5 +111,28 @@ Spring Framework Maven Milestone Repository https://repo.spring.io/libs-milestone + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/libs-snapshot + + + + + org.springframework.integration + spring-integration-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework + spring-framework-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + diff --git a/basic/splunk/pom.xml b/basic/splunk/pom.xml index f36af3ed..1901a2f7 100644 --- a/basic/splunk/pom.xml +++ b/basic/splunk/pom.xml @@ -65,7 +65,6 @@ org.springframework.integration spring-integration-core - 5.0.0.M3 compile @@ -107,7 +106,6 @@ org.springframework spring-test - 5.0.0.BUILD-SNAPSHOT test @@ -122,6 +120,11 @@ Spring Framework Maven Milestone Repository https://repo.spring.io/libs-milestone + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/libs-snapshot + @@ -131,4 +134,29 @@ + + + + org.springframework.integration + spring-integration-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework + spring-framework-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework.boot + spring-boot-dependencies + 2.0.0.BUILD-SNAPSHOT + import + pom + + + diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index 5ef2e5e7..63d60ac2 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.integration.samples tcp-amqp @@ -56,13 +55,11 @@ org.springframework.integration spring-integration-amqp - 5.0.0.M3 compile org.springframework.integration spring-integration-ip - 5.0.0.M3 compile @@ -116,7 +113,6 @@ org.springframework spring-test - 5.0.0.BUILD-SNAPSHOT test @@ -126,5 +122,28 @@ Spring Framework Maven Milestone Repository https://repo.spring.io/libs-milestone + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/libs-snapshot + + + + + org.springframework.integration + spring-integration-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework + spring-framework-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index 5933c131..d2ba8bd7 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.integration.samples tcp-client-server @@ -56,7 +55,6 @@ org.springframework.integration spring-integration-ip - 5.0.0.M3 compile @@ -68,7 +66,6 @@ org.springframework.integration spring-integration-test - 5.0.0.M3 compile @@ -110,7 +107,6 @@ org.springframework spring-test - 5.0.0.BUILD-SNAPSHOT test @@ -120,5 +116,28 @@ Spring Framework Maven Milestone Repository https://repo.spring.io/libs-milestone + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/libs-snapshot + + + + + org.springframework.integration + spring-integration-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework + spring-framework-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index d1ba175d..d11a3edb 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.integration.samples testing-examples @@ -56,25 +55,21 @@ org.springframework.integration spring-integration-file - 5.0.0.M3 compile org.springframework.integration spring-integration-http - 5.0.0.M3 compile org.springframework.integration spring-integration-ws - 5.0.0.M3 compile org.springframework spring-webmvc - 5.0.0.BUILD-SNAPSHOT compile @@ -116,13 +111,11 @@ org.springframework spring-test - 5.0.0.BUILD-SNAPSHOT test org.springframework.integration spring-integration-test - 5.0.0.M3 test @@ -132,5 +125,28 @@ Spring Framework Maven Milestone Repository https://repo.spring.io/libs-milestone + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/libs-snapshot + + + + + org.springframework.integration + spring-integration-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework + spring-framework-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index 174896e8..db5dc40f 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.integration.samples twitter @@ -56,7 +55,6 @@ org.springframework.integration spring-integration-twitter - 5.0.0.M3 compile @@ -98,7 +96,6 @@ org.springframework spring-test - 5.0.0.BUILD-SNAPSHOT test @@ -108,5 +105,28 @@ Spring Framework Maven Milestone Repository https://repo.spring.io/libs-milestone + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/libs-snapshot + + + + + org.springframework.integration + spring-integration-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework + spring-framework-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index 6015f3a8..0155582b 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -100,7 +100,6 @@ org.springframework spring-test - 5.0.0.BUILD-SNAPSHOT test @@ -115,6 +114,11 @@ Spring Framework Maven Milestone Repository https://repo.spring.io/libs-milestone + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/libs-snapshot + @@ -124,4 +128,29 @@ + + + + org.springframework.integration + spring-integration-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework + spring-framework-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework.boot + spring-boot-dependencies + 2.0.0.BUILD-SNAPSHOT + import + pom + + + diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index 1a85cb0b..50a7050d 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -55,19 +55,16 @@ org.springframework.integration spring-integration-xml - 5.0.0.M3 compile org.springframework.integration spring-integration-ws - 5.0.0.M3 compile org.springframework spring-webmvc - 5.0.0.BUILD-SNAPSHOT compile @@ -109,7 +106,6 @@ org.springframework spring-test - 5.0.0.BUILD-SNAPSHOT test @@ -119,6 +115,11 @@ Spring Framework Maven Milestone Repository https://repo.spring.io/libs-milestone + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/libs-snapshot + war @@ -135,4 +136,22 @@ + + + + org.springframework.integration + spring-integration-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework + spring-framework-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index 8fc0f960..ba6bc3ae 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.integration.samples ws-outbound-gateway @@ -56,13 +55,11 @@ org.springframework.integration spring-integration-stream - 5.0.0.M3 compile org.springframework.integration spring-integration-ws - 5.0.0.M3 compile @@ -104,7 +101,6 @@ org.springframework spring-test - 5.0.0.BUILD-SNAPSHOT test @@ -114,5 +110,28 @@ Spring Framework Maven Milestone Repository https://repo.spring.io/libs-milestone + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/libs-snapshot + + + + + org.springframework.integration + spring-integration-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework + spring-framework-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index ef384440..a2b9d8f1 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.integration.samples xml @@ -56,7 +55,6 @@ org.springframework.integration spring-integration-xml - 5.0.0.M3 compile @@ -98,7 +96,6 @@ org.springframework spring-test - 5.0.0.BUILD-SNAPSHOT test @@ -108,5 +105,28 @@ Spring Framework Maven Milestone Repository https://repo.spring.io/libs-milestone + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/libs-snapshot + + + + + org.springframework.integration + spring-integration-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework + spring-framework-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index c27a73b2..28fa879e 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.integration.samples xmpp @@ -56,7 +55,6 @@ org.springframework.integration spring-integration-xmpp - 5.0.0.M3 compile @@ -98,7 +96,6 @@ org.springframework spring-test - 5.0.0.BUILD-SNAPSHOT test @@ -108,5 +105,28 @@ Spring Framework Maven Milestone Repository https://repo.spring.io/libs-milestone + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/libs-snapshot + + + + + org.springframework.integration + spring-integration-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework + spring-framework-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + diff --git a/build.gradle b/build.gradle index c07b8c1d..298dd937 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,12 @@ buildscript { maven { url "http://repo.spring.io/libs-milestone" } } dependencies { - classpath("org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion") + classpath "org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion" + configurations.classpath.resolutionStrategy.eachDependency { + if (it.requested.name == 'dependency-management-plugin') { + it.useVersion '1.0.2.RELEASE' + } + } } } plugins { @@ -101,6 +106,11 @@ subprojects { subproject -> name = 'Spring Framework Maven Milestone Repository' url = 'https://repo.spring.io/libs-milestone' } + repository { + id = 'repo.spring.io.snapshot' + name = 'Spring Framework Maven Snapshot Repository' + url = 'https://repo.spring.io/libs-snapshot' + } } } @@ -132,8 +142,12 @@ subprojects { subproject -> appendNode('artifactId', 'spring-boot-maven-plugin') } } + if (subproject.plugins.hasPlugin('io.spring.dependency-management')) { + dependencyManagement.pomConfigurer.configurePom(asNode()) + } }.writeTo('pom.xml') } + } } @@ -170,10 +184,10 @@ subprojects { subproject -> commonsPoolVersion = '1.5.4' c3p0Version = '0.9.1.2' derbyVersion = '10.10.1.1' - eclipseLinkVersion = '2.4.2' + eclipseLinkVersion = '2.6.2' hamcrestVersion = '1.3' - hibernateVersion = '5.0.9.Final' - hibernateValidatorVersion = '4.2.0.Final' + hibernateVersion = '5.2.4.Final' + hibernateValidatorVersion = '5.2.4.Final' ftpServerVersion = '1.1.0' flexjsonVersion = '2.0' guavaVersion = '16.0.1' @@ -201,7 +215,7 @@ subprojects { subproject -> postgresVersion = '9.1-901-1.jdbc4' subethasmtpVersion = '1.2' slf4jVersion = '1.7.11' - springIntegrationVersion = '5.0.0.M3' + springIntegrationVersion = '5.0.0.BUILD-SNAPSHOT' springIntegrationKafkaVersion = '3.0.0.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.1.0.RELEASE' springKafkaVersion = '2.0.0.BUILD-SNAPSHOT' @@ -216,6 +230,13 @@ subprojects { subproject -> it.resources.srcDirs = ["src/${it.name}/resources", "src/${it.name}/java"] } + dependencyManagement { + imports { + mavenBom "org.springframework.integration:spring-integration-bom:$springIntegrationVersion" + mavenBom "org.springframework:spring-framework-bom:$springVersion" + } + } + // dependencies that are common across all java projects dependencies { testCompile("junit:junit:$junitVersion") { @@ -225,7 +246,7 @@ subprojects { subproject -> testCompile("org.mockito:mockito-core:$mockitoVersion") { exclude group: 'org.hamcrest' } - testCompile "org.springframework:spring-test:$springVersion" + testCompile "org.springframework:spring-test" } // enable all compiler warnings; individual projects may customize further @@ -286,8 +307,8 @@ project('advanced-testing-examples') { dependencies { compile "javax.jms:javax.jms-api:$jmsApiVersion" - compile "org.springframework.integration:spring-integration-jms:$springIntegrationVersion" - compile "org.springframework.integration:spring-integration-groovy:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-jms" + compile "org.springframework.integration:spring-integration-groovy" compile "log4j:log4j:$log4jVersion" } } @@ -296,7 +317,7 @@ project('dynamic-ftp') { description = 'Dynamic FTP Demo' dependencies { - compile "org.springframework.integration:spring-integration-ftp:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-ftp" compile "log4j:log4j:$log4jVersion" } } @@ -309,7 +330,7 @@ project('cafe-si') { mainClassName = 'org.springframework.integration.samples.cafe.xml.CafeDemoApp' dependencies { - compile "org.springframework.integration:spring-integration-stream:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-stream" compile "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion" compile "log4j:log4j:$log4jVersion" } @@ -320,7 +341,7 @@ project('cafe-amqp') { dependencies { compile project(":cafe-si") - compile "org.springframework.integration:spring-integration-amqp:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-amqp" compile "log4j:log4j:$log4jVersion" } } @@ -334,7 +355,7 @@ project('cafe-jms') { compile("org.apache.activemq:activemq-kahadb-store:$activeMqVersion") { exclude group: "org.springframework" } - compile "org.springframework.integration:spring-integration-jms:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-jms" compile "javax.jms:javax.jms-api:$jmsApiVersion" compile "log4j:log4j:$log4jVersion" } @@ -344,10 +365,10 @@ project('cafe-scripted') { description = 'Cafe Sample (Scripted Implementation)' dependencies { - compile "org.springframework.integration:spring-integration-stream:$springIntegrationVersion" - compile "org.springframework.integration:spring-integration-groovy:$springIntegrationVersion" - compile "org.springframework.integration:spring-integration-rmi:$springIntegrationVersion" - compile "org.springframework.integration:spring-integration-jmx:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-stream" + compile "org.springframework.integration:spring-integration-groovy" + compile "org.springframework.integration:spring-integration-rmi" + compile "org.springframework.integration:spring-integration-jmx" compile "org.jruby:jruby:$jrubyVersion" compile "org.python:jython-standalone:$jythonVersion" compile "org.codehaus.groovy:groovy-all:$groovyVersion" @@ -374,7 +395,7 @@ project('loan-broker') { mainClassName = 'org.springframework.integration.samples.loanbroker.demo.LoanBrokerDemo' dependencies { - compile "org.springframework.integration:spring-integration-ip:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-ip" compile "log4j:log4j:$log4jVersion" } @@ -392,15 +413,15 @@ project('loanshark') { apply plugin: 'eclipse-wtp' dependencies { - compile "org.springframework.integration:spring-integration-ip:$springIntegrationVersion" - compile "org.springframework:spring-webmvc:$springVersion" - compile "org.springframework:spring-orm:$springVersion" - compile "org.springframework:spring-aop:$springVersion" - compile "org.springframework:spring-aspects:$springVersion" + compile "org.springframework.integration:spring-integration-ip" + compile "org.springframework:spring-webmvc" + compile "org.springframework:spring-orm" + compile "org.springframework:spring-aop" + compile "org.springframework:spring-aspects" compile "org.aspectj:aspectjtools:$aspectjVersion" - compile "org.springframework:spring-jdbc:$springVersion" - compile "org.springframework:spring-tx:$springVersion" - compile "org.springframework:spring-context:$springVersion" + compile "org.springframework:spring-jdbc" + compile "org.springframework:spring-tx" + compile "org.springframework:spring-context" compile "commons-fileupload:commons-fileupload:$commonsFileUploadVersion" compile "commons-dbcp:commons-dbcp:$commonsDbcpVersion" compile "commons-digester:commons-digester:$commonsDigesterVersion" @@ -428,8 +449,8 @@ project('amqp') { description = 'AMQP Basic Sample' dependencies { - compile "org.springframework.integration:spring-integration-stream:$springIntegrationVersion" - compile "org.springframework.integration:spring-integration-amqp:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-stream" + compile "org.springframework.integration:spring-integration-amqp" compile "log4j:log4j:$log4jVersion" } @@ -462,9 +483,8 @@ project('barrier') { compile 'org.springframework.boot:spring-boot-starter-web' compile 'org.springframework.boot:spring-boot-starter-integration' compile 'org.springframework.boot:spring-boot-starter-amqp' - compile "org.springframework.integration:spring-integration-core:$springIntegrationVersion" - compile "org.springframework.integration:spring-integration-amqp:$springIntegrationVersion" - compile "org.springframework.integration:spring-integration-http:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-amqp" + compile "org.springframework.integration:spring-integration-http" testCompile 'org.springframework.boot:spring-boot-starter-test' } @@ -483,7 +503,7 @@ project('control-bus') { description = 'Control Bus Basic Sample' dependencies { - compile "org.springframework.integration:spring-integration-core:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-core" compile "log4j:log4j:$log4jVersion" } } @@ -496,7 +516,7 @@ project('enricher') { mainClassName = 'org.springframework.integration.samples.enricher.Main' dependencies { - compile "org.springframework.integration:spring-integration-core:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-core" compile "com.h2database:h2:$h2Version" compile "log4j:log4j:$log4jVersion" } @@ -506,7 +526,7 @@ project('feed') { description = 'Feed (RSS/ATOM) Basic Sample' dependencies { - compile "org.springframework.integration:spring-integration-feed:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-feed" compile "log4j:log4j:$log4jVersion" } } @@ -515,7 +535,7 @@ project('file') { description = 'File Copy Basic Sample' dependencies { - compile "org.springframework.integration:spring-integration-file:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-file" compile "log4j:log4j:$log4jVersion" } } @@ -524,7 +544,7 @@ project('ftp') { description = 'FTP Basic Sample' dependencies { - compile "org.springframework.integration:spring-integration-ftp:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-ftp" compile "commons-io:commons-io:$commonsIoVersion" compile "org.apache.ftpserver:ftpserver-core:$ftpServerVersion" compile "org.slf4j:slf4j-api:$slf4jVersion" @@ -532,7 +552,7 @@ project('ftp') { runtime "org.slf4j:slf4j-log4j12:$slf4jVersion" testCompile "log4j:log4j:$log4jVersion" - testCompile "org.springframework.integration:spring-integration-test:$springIntegrationVersion" + testCompile "org.springframework.integration:spring-integration-test" } test { @@ -544,7 +564,7 @@ project('helloworld') { description = 'Hello World Sample' dependencies { - compile "org.springframework.integration:spring-integration-core:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-core" compile "log4j:log4j:$log4jVersion" } @@ -570,9 +590,9 @@ project('http') { mainClassName = 'org.springframework.integration.samples.http.HttpClientDemo' dependencies { - compile "org.springframework.integration:spring-integration-http:$springIntegrationVersion" - compile "org.springframework.integration:spring-integration-mail:$springIntegrationVersion" - compile "org.springframework:spring-webmvc:$springVersion" + compile "org.springframework.integration:spring-integration-http" + compile "org.springframework.integration:spring-integration-mail" + compile "org.springframework:spring-webmvc" compile "commons-fileupload:commons-fileupload:$commonsFileUploadVersion" compile "commons-io:commons-io:$commonsIoVersion" compile "javax.mail:javax.mail-api:$javaxMailVersion" @@ -589,7 +609,7 @@ project('splunk') { dependencies { compile 'org.springframework.boot:spring-boot-starter-integration' - compile "org.springframework.integration:spring-integration-core:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-core" compile "org.springframework.integration:spring-integration-splunk:$springIntegrationSplunkVersion" testCompile 'org.springframework.boot:spring-boot-starter-test' } @@ -614,7 +634,7 @@ project('kafka') { compile ("org.springframework.integration:spring-integration-kafka:$springIntegrationKafkaVersion") { exclude group: 'org.slf4j' } - compile "org.springframework.integration:spring-integration-core:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-core" compile "org.springframework.kafka:spring-kafka:$springKafkaVersion" compile "log4j:log4j:$log4jVersion" @@ -639,8 +659,8 @@ project('mqtt') { 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-stream" + compile "org.springframework.integration:spring-integration-mqtt" } bootRun { @@ -694,7 +714,7 @@ project('cafe-dsl') { dependencies { compile project(":cafe-si") compile 'org.springframework.boot:spring-boot-starter-integration' - compile "org.springframework.integration:spring-integration-core:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-core" compile "com.google.guava:guava:$guavaVersion" testCompile 'org.springframework.boot:spring-boot-starter-test' @@ -722,7 +742,7 @@ project('jdbc') { mainClassName = 'org.springframework.integration.samples.jdbc.Main' dependencies { - compile "org.springframework.integration:spring-integration-jdbc:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-jdbc" compile "com.h2database:h2:$h2Version" compile "log4j:log4j:$log4jVersion" } @@ -737,15 +757,15 @@ project('jms') { 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.springframework.integration:spring-integration-jms" + compile "org.springframework.integration:spring-integration-stream" compile "org.apache.activemq:activemq-broker:$activeMqVersion" compile("org.apache.activemq:activemq-kahadb-store:$activeMqVersion") { exclude group: "org.springframework" } compile "log4j:log4j:$log4jVersion" - testCompile "org.springframework.integration:spring-integration-test:$springIntegrationVersion" + testCompile "org.springframework.integration:spring-integration-test" } } @@ -753,8 +773,8 @@ project('jmx') { description = 'JMX Basic Sample' dependencies { - compile "org.springframework.integration:spring-integration-jmx:$springIntegrationVersion" - compile "org.springframework.integration:spring-integration-stream:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-jmx" + compile "org.springframework.integration:spring-integration-stream" compile "log4j:log4j:$log4jVersion" } } @@ -762,17 +782,17 @@ project('jmx') { project('jpa') { description = 'JPA Basic Sample' - apply plugin: 'application' +// apply plugin: 'application' apply plugin: 'org.springframework.boot' - mainClassName = 'org.springframework.integration.samples.jpa.Main' +// mainClassName = 'org.springframework.integration.samples.jpa.Main' dependencies { compile 'org.springframework.boot:spring-boot-starter-data-jpa' - compile "org.springframework.integration:spring-integration-jpa:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-jpa" compile "com.h2database:h2:$h2Version" - runtime "org.springframework:spring-instrument:$springVersion" + runtime "org.springframework:spring-instrument" runtime "org.hibernate.javax.persistence:hibernate-jpa-2.1-api:$jpa21ApiVersion" runtime "org.eclipse.persistence:org.eclipse.persistence.jpa:$eclipseLinkVersion" @@ -782,10 +802,9 @@ project('jpa') { //Suppress openjpa annotation processor warnings compileTestJava.options.compilerArgs = ["${xLintArg},-processing"] - bootRun { +/* bootRun { main = 'org.springframework.integration.samples.jpa.Main' - } - + }*/ tasks.withType(JavaExec) { standardInput = System.in jvmArgs classpath.files.findAll { @@ -799,8 +818,8 @@ project('mail') { description = 'Mail (IMAP + POP3) Sample' dependencies { - compile "org.springframework.integration:spring-integration-mail:$springIntegrationVersion" - compile "org.springframework:spring-context:$springVersion" + compile "org.springframework.integration:spring-integration-mail" + compile "org.springframework:spring-context" compile "javax.mail:javax.mail-api:$javaxMailVersion" compile "com.sun.mail:javax.mail:$javaxMailVersion" compile "log4j:log4j:$log4jVersion" @@ -821,7 +840,7 @@ project('mongodb') { description = 'MongoDb Basic Sample' dependencies { - compile "org.springframework.integration:spring-integration-mongodb:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-mongodb" compile "log4j:log4j:$log4jVersion" } @@ -840,7 +859,7 @@ project('oddeven') { description = 'Odd-Even Sample' dependencies { - compile "org.springframework.integration:spring-integration-core:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-core" compile "log4j:log4j:$log4jVersion" } @@ -859,7 +878,7 @@ project('quote') { description = 'Quote Sample' dependencies { - compile "org.springframework.integration:spring-integration-stream:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-stream" compile "log4j:log4j:$log4jVersion" } } @@ -868,7 +887,7 @@ project('sftp') { description = 'SFTP Basic Sample' dependencies { - compile "org.springframework.integration:spring-integration-sftp:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-sftp" compile "org.apache.sshd:sshd-core:$apacheSshdVersion" compile "log4j:log4j:$log4jVersion" } @@ -882,8 +901,8 @@ project('tcp-amqp') { mainClassName = 'org.springframework.integration.samples.tcpamqp.Main' dependencies { - compile "org.springframework.integration:spring-integration-amqp:$springIntegrationVersion" - compile "org.springframework.integration:spring-integration-ip:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-amqp" + compile "org.springframework.integration:spring-integration-ip" compile "org.slf4j:slf4j-api:$slf4jVersion" runtime "log4j:log4j:$log4jVersion" @@ -899,9 +918,9 @@ project('tcp-client-server') { mainClassName = 'org.springframework.integration.samples.tcpclientserver.Main' dependencies { - compile "org.springframework.integration:spring-integration-ip:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-ip" compile "commons-lang:commons-lang:$commonsLangVersion" - compile "org.springframework.integration:spring-integration-test:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-test" compile "log4j:log4j:$log4jVersion" } } @@ -914,13 +933,13 @@ project('testing-examples') { mainClassName = 'org.springframework.integration.samples.testing.externalgateway.Main' dependencies { - compile "org.springframework.integration:spring-integration-file:$springIntegrationVersion" - compile "org.springframework.integration:spring-integration-http:$springIntegrationVersion" - compile "org.springframework.integration:spring-integration-ws:$springIntegrationVersion" - compile "org.springframework:spring-webmvc:$springVersion" + compile "org.springframework.integration:spring-integration-file" + compile "org.springframework.integration:spring-integration-http" + compile "org.springframework.integration:spring-integration-ws" + compile "org.springframework:spring-webmvc" compile "log4j:log4j:$log4jVersion" - testCompile "org.springframework.integration:spring-integration-test:$springIntegrationVersion" + testCompile "org.springframework.integration:spring-integration-test" } } @@ -928,7 +947,7 @@ project('twitter') { description = 'Twitter Basic Sample' dependencies { - compile "org.springframework.integration:spring-integration-twitter:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-twitter" compile "log4j:log4j:$log4jVersion" } @@ -944,9 +963,9 @@ project('ws-inbound-gateway') { apply plugin: 'eclipse-wtp' dependencies { - compile "org.springframework.integration:spring-integration-xml:$springIntegrationVersion" - compile "org.springframework.integration:spring-integration-ws:$springIntegrationVersion" - compile "org.springframework:spring-webmvc:$springVersion" + compile "org.springframework.integration:spring-integration-xml" + compile "org.springframework.integration:spring-integration-ws" + compile "org.springframework:spring-webmvc" compile "log4j:log4j:$log4jVersion" } @@ -963,8 +982,8 @@ project('ws-outbound-gateway') { mainClassName = 'org.springframework.integration.samples.ws.WebServiceDemoTestApp' dependencies { - compile "org.springframework.integration:spring-integration-stream:$springIntegrationVersion" - compile "org.springframework.integration:spring-integration-ws:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-stream" + compile "org.springframework.integration:spring-integration-ws" // compile 'com.sun.xml.messaging.saaj:saaj-impl:1.3.19' compile "log4j:log4j:$log4jVersion" } @@ -978,7 +997,7 @@ project('xml') { mainClassName = 'org.springframework.integration.samples.xml.BookOrderProcessingTestApp' dependencies { - compile "org.springframework.integration:spring-integration-xml:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-xml" compile "log4j:log4j:$log4jVersion" } } @@ -987,7 +1006,7 @@ project('xmpp') { description = 'XMPP Basic Sample' dependencies { - compile "org.springframework.integration:spring-integration-xmpp:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-xmpp" compile "log4j:log4j:$log4jVersion" } @@ -1000,7 +1019,7 @@ project('async-gateway') { description = 'Async Gateway Sample' dependencies { - compile "org.springframework.integration:spring-integration-core:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-core" compile "log4j:log4j:$log4jVersion" } } @@ -1013,7 +1032,7 @@ project('dynamic-poller') { mainClassName = 'org.springframework.integration.samples.poller.Main' dependencies { - compile "org.springframework.integration:spring-integration-core:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-core" compile "log4j:log4j:$log4jVersion" } } @@ -1022,7 +1041,7 @@ project('errorhandling') { description = 'Error Handling Sample' dependencies { - compile "org.springframework.integration:spring-integration-stream:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-stream" compile "log4j:log4j:$log4jVersion" } } @@ -1031,7 +1050,7 @@ project('file-processing') { description = 'File Processing Sample' dependencies { - compile "org.springframework.integration:spring-integration-file:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-file" compile "log4j:log4j:$log4jVersion" } } @@ -1044,14 +1063,14 @@ project('mail-attachments') { mainClassName = 'org.springframework.integration.samples.mailattachments.Main' dependencies { - compile "org.springframework.integration:spring-integration-mail:$springIntegrationVersion" - compile "org.springframework.integration:spring-integration-file:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-mail" + compile "org.springframework.integration:spring-integration-file" compile "javax.mail:javax.mail-api:$javaxMailVersion" compile "com.sun.mail:javax.mail:$javaxMailVersion" compile "commons-io:commons-io:$commonsIoVersion" compile "log4j:log4j:$log4jVersion" - testCompile "org.springframework.integration:spring-integration-test:$springIntegrationVersion" + testCompile "org.springframework.integration:spring-integration-test" testCompile "org.subethamail:subethasmtp-wiser:$subethasmtpVersion" } @@ -1067,10 +1086,10 @@ project('monitoring') { mainClassName = 'org.springintegration.SpringIntegrationTest' dependencies { - compile "org.springframework.integration:spring-integration-jmx:$springIntegrationVersion" - compile "org.springframework.integration:spring-integration-twitter:$springIntegrationVersion" - compile "org.springframework.integration:spring-integration-groovy:$springIntegrationVersion" - compile "org.springframework:spring-webmvc:$springVersion" + compile "org.springframework.integration:spring-integration-jmx" + compile "org.springframework.integration:spring-integration-twitter" + compile "org.springframework.integration:spring-integration-groovy" + compile "org.springframework:spring-webmvc" compile "javax.servlet:jstl:$jstlVersion" compile "log4j:log4j:$log4jVersion" } @@ -1083,8 +1102,8 @@ project('multipart-http') { apply plugin: 'eclipse-wtp' dependencies { - compile "org.springframework.integration:spring-integration-http:$springIntegrationVersion" - compile "org.springframework:spring-webmvc:$springVersion" + compile "org.springframework.integration:spring-integration-http" + compile "org.springframework:spring-webmvc" compile "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion" compile "commons-fileupload:commons-fileupload:$commonsFileUploadVersion" compile "commons-io:commons-io:$commonsIoVersion" @@ -1099,13 +1118,13 @@ project('rest-http') { apply plugin: 'eclipse-wtp' dependencies { - compile "org.springframework.integration:spring-integration-http:$springIntegrationVersion" - compile "org.springframework:spring-webmvc:$springVersion" - compile "org.springframework:spring-oxm:$springVersion" - compile "org.springframework:spring-tx:$springVersion" - compile "org.springframework:spring-jdbc:$springVersion" - compile "org.springframework:spring-context:$springVersion" - compile "org.springframework:spring-aop:$springVersion" + compile "org.springframework.integration:spring-integration-http" + compile "org.springframework:spring-webmvc" + compile "org.springframework:spring-oxm" + compile "org.springframework:spring-tx" + compile "org.springframework:spring-jdbc" + compile "org.springframework:spring-context" + compile "org.springframework:spring-aop" compile "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion" compile "org.springframework.security:spring-security-web:$springSecurityVersion" compile "org.springframework.security:spring-security-config:$springSecurityVersion" @@ -1123,10 +1142,10 @@ project('retry-and-more') { description = 'Retry and More Sample' dependencies { - compile "org.springframework.integration:spring-integration-stream:$springIntegrationVersion" - compile "org.springframework.integration:spring-integration-amqp:$springIntegrationVersion" - compile "org.springframework.integration:spring-integration-ftp:$springIntegrationVersion" - compile "org.springframework.integration:spring-integration-file:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-stream" + compile "org.springframework.integration:spring-integration-amqp" + compile "org.springframework.integration:spring-integration-ftp" + compile "org.springframework.integration:spring-integration-file" compile("org.mockito:mockito-core:$mockitoVersion") { exclude group: 'org.hamcrest' } @@ -1168,7 +1187,7 @@ project('splitter-aggregator-reaper') { mainClassName = 'org.springframework.integration.samples.splitteraggregator.Main' dependencies { - compile "org.springframework.integration:spring-integration-core:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-core" compile "javax.inject:javax.inject:$javaxInjectVersion" compile "log4j:log4j:$log4jVersion" } @@ -1183,7 +1202,7 @@ project('stored-procedures-derby') { mainClassName = 'org.springframework.integration.samples.storedprocedure.Main' dependencies { - compile "org.springframework.integration:spring-integration-jdbc:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-jdbc" compile "org.apache.derby:derby:$derbyVersion" compile "log4j:log4j:$log4jVersion" } @@ -1201,7 +1220,7 @@ project('stored-procedures-oracle') { } dependencies { - compile "org.springframework.integration:spring-integration-jdbc:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-jdbc" //TODO Uncomment it when the ojdbc6 artifact is available in the mavenLocal() // compile "com.oracle:ojdbc6:$oracleDriverVersion" compile "log4j:log4j:$log4jVersion" @@ -1220,7 +1239,7 @@ project('stored-procedures-ms') { mainClassName = 'org.springframework.integration.samples.storedprocedure.Main' dependencies { - compile "org.springframework.integration:spring-integration-jdbc:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-jdbc" compile "net.sourceforge.jtds:jtds:$jtdsVersion" compile "c3p0:c3p0:$c3p0Version" compile "log4j:log4j:$log4jVersion" @@ -1239,7 +1258,7 @@ project('stored-procedures-postgresql') { mainClassName = 'org.springframework.integration.samples.storedprocedure.Main' dependencies { - compile "org.springframework.integration:spring-integration-jdbc:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-jdbc" compile "postgresql:postgresql:$postgresVersion" compile "commons-dbcp:commons-dbcp:$commonsDbcpVersion" compile "commons-pool:commons-pool:$commonsPoolVersion" @@ -1251,10 +1270,10 @@ project('tcp-client-server-multiplex') { description = 'TCP Client Server Multiplexing Sample' dependencies { - compile "org.springframework.integration:spring-integration-ip:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-ip" compile "log4j:log4j:$log4jVersion" - testCompile "org.springframework.integration:spring-integration-test:$springIntegrationVersion" + testCompile "org.springframework.integration:spring-integration-test" } } @@ -1266,9 +1285,9 @@ project('travel') { mainClassName = 'org.springframework.integration.samples.travel.Main' dependencies { - compile "org.springframework.integration:spring-integration-ws:$springIntegrationVersion" - compile "org.springframework.integration:spring-integration-http:$springIntegrationVersion" - compile "org.springframework:spring-web:$springVersion" + compile "org.springframework.integration:spring-integration-ws" + compile "org.springframework.integration:spring-integration-http" + compile "org.springframework:spring-web" compile "log4j:log4j:$log4jVersion" } } @@ -1281,8 +1300,8 @@ project('tx-synch') { mainClassName = 'org.springframework.integration.samples.advice.TransactionSynchronizationDemo' dependencies { - compile "org.springframework.integration:spring-integration-jdbc:$springIntegrationVersion" - compile "org.springframework.integration:spring-integration-file:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-jdbc" + compile "org.springframework.integration:spring-integration-file" compile "com.h2database:h2:$h2Version" compile "log4j:log4j:$log4jVersion" } @@ -1339,7 +1358,7 @@ project('kafka-dsl') { dependencies { compile 'org.springframework.boot:spring-boot-starter-integration' - compile "org.springframework.integration:spring-integration-core:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-core" compile ("org.springframework.integration:spring-integration-kafka:$springIntegrationKafkaVersion") compile "log4j:log4j:$log4jVersion" testCompile 'org.springframework.boot:spring-boot-starter-test' @@ -1366,15 +1385,14 @@ project('file-split-ftp') { dependencies { compile 'org.springframework.boot:spring-boot-starter-web' compile 'org.springframework.boot:spring-boot-starter-integration' - compile "org.springframework.integration:spring-integration-core:$springIntegrationVersion" - 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-ftp" + compile "org.springframework.integration:spring-integration-http" + compile "org.springframework.integration:spring-integration-mail" compile "javax.mail:javax.mail-api:$javaxMailVersion" compile "com.sun.mail:javax.mail:$javaxMailVersion" testCompile 'org.springframework.boot:spring-boot-starter-test' - testCompile "org.springframework.integration:spring-integration-test:$springIntegrationVersion" + testCompile "org.springframework.integration:spring-integration-test" } bootRun { @@ -1394,7 +1412,7 @@ 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-ip" testCompile 'org.springframework.boot:spring-boot-starter-test' } diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index 5e36a846..85ebd14d 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -71,7 +71,6 @@ org.springframework.integration spring-integration-core - 5.0.0.M3 compile @@ -113,7 +112,6 @@ org.springframework spring-test - 5.0.0.BUILD-SNAPSHOT test @@ -128,6 +126,11 @@ Spring Framework Maven Milestone Repository https://repo.spring.io/libs-milestone + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/libs-snapshot + @@ -137,4 +140,29 @@ + + + + org.springframework.integration + spring-integration-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework + spring-framework-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework.boot + spring-boot-dependencies + 2.0.0.BUILD-SNAPSHOT + import + pom + + + diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index 3aac56a6..ab48638c 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -65,7 +65,6 @@ org.springframework.integration spring-integration-core - 5.0.0.M3 compile @@ -113,7 +112,6 @@ org.springframework spring-test - 5.0.0.BUILD-SNAPSHOT test @@ -128,6 +126,11 @@ Spring Framework Maven Milestone Repository https://repo.spring.io/libs-milestone + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/libs-snapshot + @@ -137,4 +140,29 @@ + + + + org.springframework.integration + spring-integration-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework + spring-framework-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework.boot + spring-boot-dependencies + 2.0.0.BUILD-SNAPSHOT + import + pom + + + diff --git a/dsl/pom.xml b/dsl/pom.xml index 78ad3341..daa8391e 100644 --- a/dsl/pom.xml +++ b/dsl/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.integration.samples dsl @@ -84,7 +83,6 @@ org.springframework spring-test - 5.0.0.BUILD-SNAPSHOT test @@ -94,5 +92,28 @@ Spring Framework Maven Milestone Repository https://repo.spring.io/libs-milestone + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/libs-snapshot + + + + + org.springframework.integration + spring-integration-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework + spring-framework-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index 74bec3ce..2a5cb689 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -138,7 +138,6 @@ org.springframework spring-test - 5.0.0.BUILD-SNAPSHOT test @@ -153,6 +152,11 @@ Spring Framework Maven Milestone Repository https://repo.spring.io/libs-milestone + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/libs-snapshot + @@ -162,4 +166,29 @@ + + + + org.springframework.integration + spring-integration-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework + spring-framework-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework.boot + spring-boot-dependencies + 2.0.0.BUILD-SNAPSHOT + import + pom + + + diff --git a/gradle.properties b/gradle.properties index de481bd8..e2f96323 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,2 @@ 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 4bb890d7..66b2c6df 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.integration.samples async-gateway @@ -56,7 +55,6 @@ org.springframework.integration spring-integration-core - 5.0.0.M3 compile @@ -98,7 +96,6 @@ org.springframework spring-test - 5.0.0.BUILD-SNAPSHOT test @@ -108,5 +105,28 @@ Spring Framework Maven Milestone Repository https://repo.spring.io/libs-milestone + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/libs-snapshot + + + + + org.springframework.integration + spring-integration-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework + spring-framework-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index 9daeaac4..c0f2e863 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.integration.samples dynamic-poller @@ -56,7 +55,6 @@ org.springframework.integration spring-integration-core - 5.0.0.M3 compile @@ -98,7 +96,6 @@ org.springframework spring-test - 5.0.0.BUILD-SNAPSHOT test @@ -108,5 +105,28 @@ Spring Framework Maven Milestone Repository https://repo.spring.io/libs-milestone + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/libs-snapshot + + + + + org.springframework.integration + spring-integration-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework + spring-framework-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index c5a75aab..89601e05 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.integration.samples errorhandling @@ -56,7 +55,6 @@ org.springframework.integration spring-integration-stream - 5.0.0.M3 compile @@ -98,7 +96,6 @@ org.springframework spring-test - 5.0.0.BUILD-SNAPSHOT test @@ -108,5 +105,28 @@ Spring Framework Maven Milestone Repository https://repo.spring.io/libs-milestone + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/libs-snapshot + + + + + org.springframework.integration + spring-integration-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework + spring-framework-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index 8906ef21..691bdfce 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.integration.samples file-processing @@ -56,7 +55,6 @@ org.springframework.integration spring-integration-file - 5.0.0.M3 compile @@ -98,7 +96,6 @@ org.springframework spring-test - 5.0.0.BUILD-SNAPSHOT test @@ -108,5 +105,28 @@ Spring Framework Maven Milestone Repository https://repo.spring.io/libs-milestone + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/libs-snapshot + + + + + org.springframework.integration + spring-integration-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework + spring-framework-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index f49b8aea..7663a2ea 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.integration.samples mail-attachments @@ -56,13 +55,11 @@ org.springframework.integration spring-integration-mail - 5.0.0.M3 compile org.springframework.integration spring-integration-file - 5.0.0.M3 compile @@ -122,13 +119,11 @@ org.springframework spring-test - 5.0.0.BUILD-SNAPSHOT test org.springframework.integration spring-integration-test - 5.0.0.M3 test @@ -144,5 +139,28 @@ Spring Framework Maven Milestone Repository https://repo.spring.io/libs-milestone + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/libs-snapshot + + + + + org.springframework.integration + spring-integration-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework + spring-framework-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index 348edb4b..9ef4c0c2 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -55,25 +55,21 @@ org.springframework.integration spring-integration-jmx - 5.0.0.M3 compile org.springframework.integration spring-integration-twitter - 5.0.0.M3 compile org.springframework.integration spring-integration-groovy - 5.0.0.M3 compile org.springframework spring-webmvc - 5.0.0.BUILD-SNAPSHOT compile @@ -121,7 +117,6 @@ org.springframework spring-test - 5.0.0.BUILD-SNAPSHOT test @@ -131,6 +126,11 @@ Spring Framework Maven Milestone Repository https://repo.spring.io/libs-milestone + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/libs-snapshot + war @@ -147,4 +147,22 @@ + + + + org.springframework.integration + spring-integration-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework + spring-framework-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index 596f9e18..7d9eed68 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -55,13 +55,11 @@ org.springframework.integration spring-integration-http - 5.0.0.M3 compile org.springframework spring-webmvc - 5.0.0.BUILD-SNAPSHOT compile @@ -121,7 +119,6 @@ org.springframework spring-test - 5.0.0.BUILD-SNAPSHOT test @@ -131,6 +128,11 @@ Spring Framework Maven Milestone Repository https://repo.spring.io/libs-milestone + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/libs-snapshot + war @@ -147,4 +149,22 @@ + + + + org.springframework.integration + spring-integration-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework + spring-framework-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index 07329bb1..7ac05eb9 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -55,43 +55,36 @@ org.springframework.integration spring-integration-http - 5.0.0.M3 compile org.springframework spring-webmvc - 5.0.0.BUILD-SNAPSHOT compile org.springframework spring-oxm - 5.0.0.BUILD-SNAPSHOT compile org.springframework spring-tx - 5.0.0.BUILD-SNAPSHOT compile org.springframework spring-jdbc - 5.0.0.BUILD-SNAPSHOT compile org.springframework spring-context - 5.0.0.BUILD-SNAPSHOT compile org.springframework spring-aop - 5.0.0.BUILD-SNAPSHOT compile @@ -157,7 +150,6 @@ org.springframework spring-test - 5.0.0.BUILD-SNAPSHOT test @@ -167,6 +159,11 @@ Spring Framework Maven Milestone Repository https://repo.spring.io/libs-milestone + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/libs-snapshot + war @@ -183,4 +180,22 @@ + + + + org.springframework.integration + spring-integration-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework + spring-framework-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index f760990e..5511bd29 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.integration.samples retry-and-more @@ -56,25 +55,21 @@ org.springframework.integration spring-integration-stream - 5.0.0.M3 compile org.springframework.integration spring-integration-amqp - 5.0.0.M3 compile org.springframework.integration spring-integration-ftp - 5.0.0.M3 compile org.springframework.integration spring-integration-file - 5.0.0.M3 compile @@ -116,7 +111,6 @@ org.springframework spring-test - 5.0.0.BUILD-SNAPSHOT test @@ -126,5 +120,28 @@ Spring Framework Maven Milestone Repository https://repo.spring.io/libs-milestone + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/libs-snapshot + + + + + org.springframework.integration + spring-integration-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework + spring-framework-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index 488c512f..b1ee8bd7 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.integration.samples splitter-aggregator-reaper @@ -56,7 +55,6 @@ org.springframework.integration spring-integration-core - 5.0.0.M3 compile @@ -104,7 +102,6 @@ org.springframework spring-test - 5.0.0.BUILD-SNAPSHOT test @@ -114,5 +111,28 @@ Spring Framework Maven Milestone Repository https://repo.spring.io/libs-milestone + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/libs-snapshot + + + + + org.springframework.integration + spring-integration-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework + spring-framework-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index 59d942af..2ad69f77 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.integration.samples stored-procedures-derby @@ -56,7 +55,6 @@ org.springframework.integration spring-integration-jdbc - 5.0.0.M3 compile @@ -104,7 +102,6 @@ org.springframework spring-test - 5.0.0.BUILD-SNAPSHOT test @@ -114,5 +111,28 @@ Spring Framework Maven Milestone Repository https://repo.spring.io/libs-milestone + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/libs-snapshot + + + + + org.springframework.integration + spring-integration-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework + spring-framework-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index e94ea139..5e63265b 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.integration.samples stored-procedures-ms @@ -56,7 +55,6 @@ org.springframework.integration spring-integration-jdbc - 5.0.0.M3 compile @@ -110,7 +108,6 @@ org.springframework spring-test - 5.0.0.BUILD-SNAPSHOT test @@ -120,5 +117,28 @@ Spring Framework Maven Milestone Repository https://repo.spring.io/libs-milestone + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/libs-snapshot + + + + + org.springframework.integration + spring-integration-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework + spring-framework-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index 7443e1e2..8e4dc5b8 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.integration.samples stored-procedures-oracle @@ -56,7 +55,6 @@ org.springframework.integration spring-integration-jdbc - 5.0.0.M3 compile @@ -98,7 +96,6 @@ org.springframework spring-test - 5.0.0.BUILD-SNAPSHOT test @@ -108,5 +105,28 @@ Spring Framework Maven Milestone Repository https://repo.spring.io/libs-milestone + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/libs-snapshot + + + + + org.springframework.integration + spring-integration-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework + spring-framework-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index 4d76a3e4..ca35a4ac 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.integration.samples stored-procedures-postgresql @@ -56,7 +55,6 @@ org.springframework.integration spring-integration-jdbc - 5.0.0.M3 compile @@ -116,7 +114,6 @@ org.springframework spring-test - 5.0.0.BUILD-SNAPSHOT test @@ -126,5 +123,28 @@ Spring Framework Maven Milestone Repository https://repo.spring.io/libs-milestone + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/libs-snapshot + + + + + org.springframework.integration + spring-integration-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework + spring-framework-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index 624be77d..8b240ba4 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.integration.samples tcp-client-server-multiplex @@ -56,7 +55,6 @@ org.springframework.integration spring-integration-ip - 5.0.0.M3 compile @@ -98,13 +96,11 @@ org.springframework spring-test - 5.0.0.BUILD-SNAPSHOT test org.springframework.integration spring-integration-test - 5.0.0.M3 test @@ -114,5 +110,28 @@ Spring Framework Maven Milestone Repository https://repo.spring.io/libs-milestone + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/libs-snapshot + + + + + org.springframework.integration + spring-integration-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework + spring-framework-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index a51af75d..4d05280e 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.integration.samples travel @@ -56,19 +55,16 @@ org.springframework.integration spring-integration-ws - 5.0.0.M3 compile org.springframework.integration spring-integration-http - 5.0.0.M3 compile org.springframework spring-web - 5.0.0.BUILD-SNAPSHOT compile @@ -110,7 +106,6 @@ org.springframework spring-test - 5.0.0.BUILD-SNAPSHOT test @@ -120,5 +115,28 @@ Spring Framework Maven Milestone Repository https://repo.spring.io/libs-milestone + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/libs-snapshot + + + + + org.springframework.integration + spring-integration-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework + spring-framework-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index f577d94c..828ef521 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.integration.samples tx-synch @@ -56,13 +55,11 @@ org.springframework.integration spring-integration-jdbc - 5.0.0.M3 compile org.springframework.integration spring-integration-file - 5.0.0.M3 compile @@ -110,7 +107,6 @@ org.springframework spring-test - 5.0.0.BUILD-SNAPSHOT test @@ -120,5 +116,28 @@ Spring Framework Maven Milestone Repository https://repo.spring.io/libs-milestone + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/libs-snapshot + + + + + org.springframework.integration + spring-integration-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + + org.springframework + spring-framework-bom + 5.0.0.BUILD-SNAPSHOT + import + pom + + +