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
intermediate/async-gateway/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
intermediate/dynamic-poller/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
intermediate/errorhandling/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
intermediate/file-processing/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
intermediate/mail-attachments/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
intermediate/monitoring/pom.xml
View File

@@ -193,14 +193,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
intermediate/monitoring/src/main/java/org/springintegration/NotificationListener.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2012 the original author or authors.
* Copyright 2002-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.
@@ -15,7 +15,7 @@
*/
package org.springintegration;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
/**
@@ -29,13 +29,15 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
public class NotificationListener {
public static void main(String[] args) throws Exception {
ApplicationContext ctx = new ClassPathXmlApplicationContext("classpath:/META-INF/spring/integration/remote-monitor-context.xml");
ConfigurableApplicationContext ctx =
new ClassPathXmlApplicationContext("classpath:/META-INF/spring/integration/remote-monitor-context.xml");
Gateway gw = ctx.getBean(Gateway.class);
int cmd = 0;
while (cmd != 'q') {
cmd = System.in.read();
gw.send((char) cmd);
}
ctx.close();
}
public static interface Gateway {

8
intermediate/monitoring/src/main/java/org/springintegration/PayloadAwareTimingInterceptor.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2012 the original author or authors.
* Copyright 2002-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.
@@ -23,7 +23,7 @@ import org.springframework.jmx.export.annotation.ManagedOperation;
import org.springframework.jmx.export.annotation.ManagedResource;
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.util.StopWatch;
/**
@@ -35,7 +35,7 @@ import org.springframework.util.StopWatch;
*
*/
@ManagedResource
public class PayloadAwareTimingInterceptor extends ChannelInterceptorAdapter {
public class PayloadAwareTimingInterceptor implements ChannelInterceptor {
private final ThreadLocal<StopWatchHolder> stopWatchHolder = new ThreadLocal<PayloadAwareTimingInterceptor.StopWatchHolder>();
@@ -60,7 +60,7 @@ public class PayloadAwareTimingInterceptor extends ChannelInterceptorAdapter {
StopWatch stopWatch = new StopWatch();
stopWatch.start();
this.stopWatchHolder.set(new StopWatchHolder(stopWatch, message.getPayload().getClass()));
return super.preSend(message, channel);
return message;
}
@Override

4
intermediate/multipart-http/pom.xml
View File

@@ -195,14 +195,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
intermediate/rest-http/pom.xml
View File

@@ -144,7 +144,7 @@
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-web</artifactId>
<version>5.0.4.RELEASE</version>
<version>5.0.6.RELEASE</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -156,7 +156,7 @@
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-config</artifactId>
<version>5.0.4.RELEASE</version>
<version>5.0.6.RELEASE</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -262,14 +262,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
intermediate/retry-and-more/pom.xml
View File

@@ -181,14 +181,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
intermediate/splitter-aggregator-reaper/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
intermediate/stored-procedures-derby/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
intermediate/stored-procedures-ms/pom.xml
View File

@@ -172,14 +172,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
intermediate/stored-procedures-oracle/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
intermediate/stored-procedures-postgresql/pom.xml
View File

@@ -184,14 +184,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
intermediate/tcp-client-server-multiplex/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
intermediate/travel/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
intermediate/tx-synch/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>