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

Upgrade to SI-5.0-GA, SS-5.0-GA, SF-5.0.2, SK-2.0

Browse Source 
Remove exclude for the `TwitterAutoConfiguration` since it doesn't
exist in Spring Boot any more
This commit is contained in:
Artem Bilan
2017-11-28 15:48:06 -05:00
parent 77477a953d
commit 38202d8b1f
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
build.gradle
View File

@@ -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'

3
dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/annotations/Application.java
View File

@@ -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 {

5
dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/dsl/Application.java
View File

@@ -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);