From 577f9e42c499e9f75dc0b7ce9ee121d8a159d5df Mon Sep 17 00:00:00 2001 From: okacimi Date: Fri, 25 Jan 2019 11:45:15 +0100 Subject: [PATCH 1/2] [boyscout] refactoring --- .../edison/testsupport/togglz/TogglzTestConfiguration.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/edison-testsupport/src/main/java/de/otto/edison/testsupport/togglz/TogglzTestConfiguration.java b/edison-testsupport/src/main/java/de/otto/edison/testsupport/togglz/TogglzTestConfiguration.java index 5f8281227..eb9c29ec5 100644 --- a/edison-testsupport/src/main/java/de/otto/edison/testsupport/togglz/TogglzTestConfiguration.java +++ b/edison-testsupport/src/main/java/de/otto/edison/testsupport/togglz/TogglzTestConfiguration.java @@ -21,12 +21,7 @@ public class TogglzTestConfiguration { @Bean @Profile("test") public UserProvider userProvider() { - return new UserProvider() { - @Override - public FeatureUser getCurrentUser() { - return new SimpleFeatureUser("someName", false); - } - }; + return () -> new SimpleFeatureUser("someName", false); } @Bean From bcdcb3f18ad42060108ecee813dbbbff4be71070 Mon Sep 17 00:00:00 2001 From: okacimi Date: Fri, 25 Jan 2019 11:46:30 +0100 Subject: [PATCH 2/2] [boyscout] spring and spring boot upgrade + fixed naming of gradle variables --- edison-oauth/build.gradle | 6 +++--- .../src/test/resources/application.yml | 2 ++ .../src/test/resources/application.yml | 3 +++ gradle/dependencies.gradle | 17 +++++++++-------- 4 files changed, 17 insertions(+), 11 deletions(-) create mode 100644 examples/example-togglz/src/test/resources/application.yml diff --git a/edison-oauth/build.gradle b/edison-oauth/build.gradle index bf263af7e..ec7a3712f 100644 --- a/edison-oauth/build.gradle +++ b/edison-oauth/build.gradle @@ -2,9 +2,9 @@ dependencies { compile libraries.spring_boot_autoconfigure compile libraries.spring_boot_starter_web compile libraries.async_http_client - compile libraries.spring_boot_security - compile libraries.spring_boot_security_oauth - compile libraries.spring_boot_security_jwt + compile libraries.spring_security + compile libraries.spring_security_oauth + compile libraries.spring_security_jwt compile java_xml testCompile libraries.async_http_client diff --git a/edison-togglz/src/test/resources/application.yml b/edison-togglz/src/test/resources/application.yml index 1629be2d6..dd200d49b 100644 --- a/edison-togglz/src/test/resources/application.yml +++ b/edison-togglz/src/test/resources/application.yml @@ -1,4 +1,6 @@ spring: + main: + allow-bean-definition-overriding: true application: name: togglztest diff --git a/examples/example-togglz/src/test/resources/application.yml b/examples/example-togglz/src/test/resources/application.yml new file mode 100644 index 000000000..e03ff18f1 --- /dev/null +++ b/examples/example-togglz/src/test/resources/application.yml @@ -0,0 +1,3 @@ +spring: + main: + allow-bean-definition-overriding: true \ No newline at end of file diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 4479f81a8..b4234640e 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -4,11 +4,12 @@ */ ext { versions = [ - spring_boot : '2.0.4.RELEASE', - spring : '5.0.8.RELEASE', - spring_boot_security_oauth : '2.3.3.RELEASE', - spring_boot_security_jwt : '1.0.9.RELEASE', - async_http_client : '2.5.2', + spring_boot : '2.1.2.RELEASE', + spring : '5.1.4.RELEASE', + spring_security_core : '5.1.3.RELEASE', + spring_security_oauth : '2.3.4.RELEASE', + spring_security_jwt : '1.0.10.RELEASE', + async_http_client : '2.7.0', jcip_annotations : '1.0', logback_classic : '1.2.3', javax_servlet_api : '3.1.0', @@ -49,9 +50,9 @@ ext { spring_boot_starter_cache : "org.springframework.boot:spring-boot-starter-cache:${versions.spring_boot}", spring_boot_starter_actuator : "org.springframework.boot:spring-boot-starter-actuator:${versions.spring_boot}", spring_boot_starter_thymeleaf : "org.springframework.boot:spring-boot-starter-thymeleaf:${versions.spring_boot}", - spring_boot_security : "org.springframework.security:spring-security-core:${versions.spring}", - spring_boot_security_oauth : "org.springframework.security.oauth:spring-security-oauth2:${versions.spring_boot_security_oauth}", - spring_boot_security_jwt : "org.springframework.security:spring-security-jwt:${versions.spring_boot_security_jwt}", + spring_security : "org.springframework.security:spring-security-core:${versions.spring_security_core}", + spring_security_oauth : "org.springframework.security.oauth:spring-security-oauth2:${versions.spring_security_oauth}", + spring_security_jwt : "org.springframework.security:spring-security-jwt:${versions.spring_security_jwt}", aws_sdk_s3 : "software.amazon.awssdk:s3:${versions.aws_sdk}", aws_sdk_ssm : "software.amazon.awssdk:ssm:${versions.aws_sdk}", async_http_client : "org.asynchttpclient:async-http-client:${versions.async_http_client}",