Skip to content

Commit a89eda2

Browse files
committed
YD-153 Upgraded to Spring Boot 1.3.2
Removed the workaround for spring-projects/spring-boot#4919, as that issue is fixed.
1 parent 25406ce commit a89eda2

File tree

4 files changed

+4
-10
lines changed

4 files changed

+4
-10
lines changed

adminservice/src/main/java/nu/yona/server/AdminServiceApplication.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import org.springframework.beans.factory.annotation.Autowired;
1313
import org.springframework.boot.SpringApplication;
1414
import org.springframework.boot.autoconfigure.SpringBootApplication;
15-
import org.springframework.boot.autoconfigure.security.SecurityFilterAutoConfiguration;
1615
import org.springframework.cache.annotation.EnableCaching;
1716
import org.springframework.context.annotation.Bean;
1817
import org.springframework.context.annotation.ComponentScan;
@@ -35,8 +34,7 @@
3534
import springfox.documentation.swagger2.annotations.EnableSwagger2;
3635

3736
@ComponentScan("nu.yona.server")
38-
// Exclude because of https://github.com/spring-projects/spring-boot/issues/4919
39-
@SpringBootApplication(exclude = { SecurityFilterAutoConfiguration.class })
37+
@SpringBootApplication
4038
@EnableSwagger2
4139
@EnableCaching
4240
public class AdminServiceApplication

analysisservice/src/main/java/nu/yona/server/AnalysisServiceApplication.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
import org.springframework.boot.SpringApplication;
1010
import org.springframework.boot.autoconfigure.SpringBootApplication;
11-
import org.springframework.boot.autoconfigure.security.SecurityFilterAutoConfiguration;
1211
import org.springframework.cache.annotation.EnableCaching;
1312
import org.springframework.context.annotation.Bean;
1413
import org.springframework.web.bind.annotation.RequestMethod;
@@ -22,8 +21,7 @@
2221
import springfox.documentation.spring.web.plugins.Docket;
2322
import springfox.documentation.swagger2.annotations.EnableSwagger2;
2423

25-
// Exclude because of https://github.com/spring-projects/spring-boot/issues/4919
26-
@SpringBootApplication(exclude = { SecurityFilterAutoConfiguration.class })
24+
@SpringBootApplication
2725
@EnableSwagger2
2826
@EnableCaching
2927
public class AnalysisServiceApplication

appservice/src/main/java/nu/yona/server/AppServiceApplication.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
import org.springframework.boot.SpringApplication;
1010
import org.springframework.boot.autoconfigure.SpringBootApplication;
11-
import org.springframework.boot.autoconfigure.security.SecurityFilterAutoConfiguration;
1211
import org.springframework.cache.annotation.EnableCaching;
1312
import org.springframework.context.annotation.Bean;
1413
import org.springframework.web.bind.annotation.RequestMethod;
@@ -22,8 +21,7 @@
2221
import springfox.documentation.spring.web.plugins.Docket;
2322
import springfox.documentation.swagger2.annotations.EnableSwagger2;
2423

25-
// Exclude because of https://github.com/spring-projects/spring-boot/issues/4919
26-
@SpringBootApplication(exclude = { SecurityFilterAutoConfiguration.class })
24+
@SpringBootApplication
2725
@EnableSwagger2
2826
@EnableCaching
2927
public class AppServiceApplication

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ subprojects {
2424
targetCompatibility = 1.8
2525

2626
project.ext {
27-
springBootVersion = '1.3.1.RELEASE'
27+
springBootVersion = '1.3.2.RELEASE'
2828
yona_adminservice_scheme=project.hasProperty('yona_adminservice_scheme')? project.yona_adminservice_scheme : 'http'
2929
yona_adminservice_host=project.hasProperty('yona_adminservice_host')? project.yona_adminservice_host : 'localhost'
3030
yona_adminservice_port=project.hasProperty('yona_adminservice_port')? project.yona_adminservice_port : '8080'

0 commit comments

Comments
 (0)