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

Upgrade to SI-5.0 M3

Browse Source 
* Fix Spring Boot 2.0 B-S compatibility
* Fix deprecation warnings
* regenerate POMs according new dependency versions
This commit is contained in:
Artem Bilan
2017-04-05 17:09:49 -04:00
parent ea919aa4be
commit 2b80cf25a8
74 changed files with 1075 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
dsl/cafe-dsl/pom.xml
View File

@@ -71,7 +71,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-core</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -85,6 +85,12 @@
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -97,6 +103,12 @@
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>

14
dsl/kafka-dsl/pom.xml
View File

@@ -65,7 +65,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-core</artifactId>
<version>5.0.0.BUILD-SNAPSHOT</version>
<version>5.0.0.M3</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -85,6 +85,12 @@
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -97,6 +103,12 @@
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>

12
dsl/pom.xml
View File

@@ -56,6 +56,12 @@
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -68,6 +74,12 @@
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>

12
dsl/si4demo/pom.xml
View File

@@ -110,6 +110,12 @@
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -122,6 +128,12 @@
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>

6
dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/d/DBoot.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2014 the original author or authors.
* Copyright 2014-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,8 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.integration.samples.si4demo.springone.d;
import org.springframework.boot.WebApplicationType;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.context.ConfigurableApplicationContext;
@@ -44,7 +46,7 @@ public class DBoot {
public static void main(String[] args) throws Exception {
ConfigurableApplicationContext ctx =
new SpringApplicationBuilder(DBoot.class)
.web(false)
.web(WebApplicationType.NONE)
.run(args);
System.out.println(ctx.getBean(FooService.class).foo("foo"));
ctx.close();

6
dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/e/EDSL.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2014 the original author or authors.
* Copyright 2014-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,8 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.integration.samples.si4demo.springone.e;
import org.springframework.boot.WebApplicationType;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.context.ConfigurableApplicationContext;
@@ -40,7 +42,7 @@ public class EDSL {
public static void main(String[] args) throws Exception {
ConfigurableApplicationContext ctx =
new SpringApplicationBuilder(EDSL.class)
.web(false)
.web(WebApplicationType.NONE)
.run(args);
System.out.println(ctx.getBean(FooService.class).foo("foo"));
ctx.close();

6
dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/f/FMail.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2014 the original author or authors.
* Copyright 2014-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,9 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.integration.samples.si4demo.springone.f;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.WebApplicationType;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -49,7 +51,7 @@ public class FMail {
public static void main(String[] args) throws Exception {
ConfigurableApplicationContext ctx =
new SpringApplicationBuilder(FMail.class)
.web(false)
.web(WebApplicationType.NONE)
.run(args);
System.out.println(ctx.getBean(FooService.class).foo("foo"));
ctx.close();

6
dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/g/GIMAP.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2014 the original author or authors.
* Copyright 2014-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,9 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.integration.samples.si4demo.springone.g;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.WebApplicationType;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -45,7 +47,7 @@ public class GIMAP {
public static void main(String[] args) throws Exception {
ConfigurableApplicationContext ctx =
new SpringApplicationBuilder(GIMAP.class)
.web(false)
.web(WebApplicationType.NONE)
.run(args);
System.out.println("Hit Enter to terminate");
System.in.read();