Merge pull request #103 from omarkacimi3254/master

jdk11 upgrade (along necessary spring and spring boot upgrade)
otto-de · Jan 25, 2019 · 35d6095 · 35d6095
2 parents 3fb6b5a + bcdcb3f
commit 35d6095
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 17 deletions.
diff --git 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/...-testsupport/src/main/java/de/otto/edison/testsupport/togglz/TogglzTestConfiguration.java b/...-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

diff --git 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
@@ -0,0 +1,3 @@
+spring:
+    main:
+        allow-bean-definition-overriding: true
diff --git 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}",