Spring/spring-integration-samples
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade Spring Dependencies

Browse Source
This commit is contained in:
Gary Russell
2018-07-12 14:11:38 -04:00
parent 4dd28d0009
commit 41664f0501
69 changed files with 175 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
basic/amqp/pom.xml
View File

@@ -171,14 +171,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>

8
basic/barrier/pom.xml
View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.0.2.RELEASE</version>
<version>2.0.3.RELEASE</version>
</parent>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>barrier</artifactId>
@@ -204,21 +204,21 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>2.0.2.RELEASE</version>
<version>2.0.3.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
basic/control-bus/pom.xml
View File

@@ -148,14 +148,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
basic/enricher/pom.xml
View File

@@ -160,14 +160,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
basic/feed/pom.xml
View File

@@ -148,14 +148,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
basic/file/pom.xml
View File

@@ -148,14 +148,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
basic/ftp/pom.xml
View File

@@ -207,14 +207,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
basic/helloworld/pom.xml
View File

@@ -148,14 +148,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
basic/http/pom.xml
View File

@@ -218,14 +218,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
basic/jdbc/pom.xml
View File

@@ -160,14 +160,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
basic/jms/pom.xml
View File

@@ -210,14 +210,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
basic/jmx/pom.xml
View File

@@ -159,14 +159,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>

8
basic/jpa/pom.xml
View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.0.2.RELEASE</version>
<version>2.0.3.RELEASE</version>
</parent>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>jpa</artifactId>
@@ -206,21 +206,21 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>2.0.2.RELEASE</version>
<version>2.0.3.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>

10
basic/kafka/pom.xml
View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.0.2.RELEASE</version>
<version>2.0.3.RELEASE</version>
</parent>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>kafka</artifactId>
@@ -98,7 +98,7 @@
<dependency>
<groupId>org.springframework.kafka</groupId>
<artifactId>spring-kafka</artifactId>
<version>2.1.5.RELEASE</version>
<version>2.1.7.RELEASE</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -211,21 +211,21 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>2.0.2.RELEASE</version>
<version>2.0.3.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
basic/mail/pom.xml
View File

@@ -183,14 +183,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
basic/mongodb/pom.xml
View File

@@ -148,14 +148,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>

8
basic/mqtt/pom.xml
View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.0.2.RELEASE</version>
<version>2.0.3.RELEASE</version>
</parent>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>mqtt</artifactId>
@@ -171,21 +171,21 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>2.0.2.RELEASE</version>
<version>2.0.3.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
basic/oddeven/pom.xml
View File

@@ -148,14 +148,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
basic/quote/pom.xml
View File

@@ -148,14 +148,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
basic/sftp/pom.xml
View File

@@ -160,14 +160,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>

8
basic/splunk/pom.xml
View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.0.2.RELEASE</version>
<version>2.0.3.RELEASE</version>
</parent>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>splunk</artifactId>
@@ -183,21 +183,21 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>2.0.2.RELEASE</version>
<version>2.0.3.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
basic/tcp-amqp/pom.xml
View File

@@ -183,14 +183,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
basic/tcp-client-server/pom.xml
View File

@@ -171,14 +171,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
basic/testing-examples/pom.xml
View File

@@ -192,14 +192,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
basic/twitter/pom.xml
View File

@@ -148,14 +148,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>

8
basic/web-sockets/pom.xml
View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.0.2.RELEASE</version>
<version>2.0.3.RELEASE</version>
</parent>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>web-sockets</artifactId>
@@ -171,21 +171,21 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>2.0.2.RELEASE</version>
<version>2.0.3.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>

8
basic/web-sockets/src/test/java/org/springframework/integration/samples/websocket/standard/ApplicationTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2014-2017 the original author or authors.
* Copyright 2014-2018 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.
@@ -39,11 +39,12 @@ import org.springframework.integration.channel.DirectChannel;
import org.springframework.integration.samples.websocket.standard.server.Application;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.support.ChannelInterceptorAdapter;
import org.springframework.messaging.support.ChannelInterceptor;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
/**
* @author Artem Bilan
* @author Gary Russell
* @since 3.0
*/
@RunWith(SpringJUnit4ClassRunner.class)
@@ -62,7 +63,8 @@ public class ApplicationTests {
final CountDownLatch stopLatch = new CountDownLatch(2);
webSocketInputChannel.addInterceptor(new ChannelInterceptorAdapter() {
webSocketInputChannel.addInterceptor(new ChannelInterceptor() {
@Override
public void postSend(Message<?> message, MessageChannel channel, boolean sent) {
Object payload = message.getPayload();

4
basic/ws-inbound-gateway/pom.xml
View File

@@ -170,14 +170,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
basic/ws-outbound-gateway/pom.xml
View File

@@ -159,14 +159,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
basic/xml/pom.xml
View File

@@ -148,14 +148,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
basic/xmpp/pom.xml
View File

@@ -148,14 +148,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.7.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.5.RELEASE</version>
<version>5.0.6.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>