From 38202d8b1ff25572c448aea0af0f629b5ae1ffba Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Tue, 28 Nov 2017 15:48:06 -0500 Subject: [PATCH] Upgrade to SI-5.0-GA, SS-5.0-GA, SF-5.0.2, SK-2.0 Remove exclude for the `TwitterAutoConfiguration` since it doesn't exist in Spring Boot any more --- build.gradle | 10 +++++----- .../samples/si4demo/annotations/Application.java | 3 +-- .../integration/samples/si4demo/dsl/Application.java | 5 ++--- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index ab5d6b00..da6281a9 100644 --- a/build.gradle +++ b/build.gradle @@ -210,13 +210,13 @@ subprojects { subproject -> oracleDriverVersion = '11.2.0.3' postgresVersion = '42.0.0' subethasmtpVersion = '1.2' - slf4jVersion = '1.7.22' - springIntegrationVersion = '5.0.0.M7' + slf4jVersion = '1.7.25' + springIntegrationVersion = '5.0.0.RELEASE' springIntegrationKafkaVersion = '3.0.0.M2' springIntegrationSplunkVersion = '1.1.0.RELEASE' - springKafkaVersion = '2.0.0.RC1' - springVersion = '5.0.0.RC4' - springSecurityVersion = '5.0.0.M4' + springKafkaVersion = '2.0.0.RELEASE' + springVersion = '5.0.2.RELEASE' + springSecurityVersion = '5.0.0.RELEASE' springWebFlowVersion = '2.3.3.RELEASE' tilesJspVersion = '2.2.1' validationApiVersion = '1.0.0.GA' diff --git a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/annotations/Application.java b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/annotations/Application.java index e0942092..d4ddb70c 100644 --- a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/annotations/Application.java +++ b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/annotations/Application.java @@ -19,7 +19,6 @@ package org.springframework.integration.samples.si4demo.annotations; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.autoconfigure.social.TwitterAutoConfiguration; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; @@ -67,7 +66,7 @@ import org.springframework.social.twitter.api.impl.TwitterTemplate; */ @Configuration @ComponentScan -@EnableAutoConfiguration(exclude = TwitterAutoConfiguration.class) +@EnableAutoConfiguration public class Application { public static void main(String[] args) throws Exception { diff --git a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/dsl/Application.java b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/dsl/Application.java index 5b3049de..9c996d28 100644 --- a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/dsl/Application.java +++ b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/dsl/Application.java @@ -21,7 +21,6 @@ import java.util.Scanner; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.autoconfigure.social.TwitterAutoConfiguration; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; @@ -75,7 +74,7 @@ import org.springframework.social.twitter.api.impl.TwitterTemplate; @Configuration @ComponentScan @IntegrationComponentScan -@EnableAutoConfiguration(exclude = TwitterAutoConfiguration.class) +@EnableAutoConfiguration public class Application { public static void main(String[] args) throws Exception { @@ -87,7 +86,7 @@ public class Application { ctx.close(); } - @MessagingGateway(defaultRequestChannel="requestChannel") + @MessagingGateway(defaultRequestChannel = "requestChannel") public interface Gateway { String sendReceive(String in);