Upgrade spring version (#1384)

* Upgrade gradlew version

* Upgrade Spring version but keep junit version to 4

* Remove junit depedency specification from the main gradle file

* Make tests happy

* Treat realms configuration as an array

acceptance-test/build.gradle

@@ -95,6 +95,8 @@ dependencies {
     testRuntime 'org.pegdown:pegdown:1.6.0'
     testCompile project(path: ':core-common', configuration: 'testOutput')
     testCompile project(path: ':core-services', configuration: 'testOutput')
+
+    testCompile 'junit:junit:4.13.1'
 }
 
 task acceptanceTest(type: Test) {

app/src/main/java/org/zalando/nakadi/config/SecurityConfiguration.java

@@ -30,7 +30,9 @@
 import java.io.IOException;
 import java.text.MessageFormat;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import static org.springframework.http.HttpMethod.DELETE;
 import static org.springframework.http.HttpMethod.GET;
@@ -55,7 +57,7 @@ public class SecurityConfiguration extends ResourceServerConfigurerAdapter {
     private String uidScope;
 
     @Value("${nakadi.oauth2.realms}")
-    private String realms;
+    private String[] realms;
 
     @Value("${nakadi.oauth2.scopes.nakadiAdmin}")
     private String nakadiAdminScope;
@@ -73,8 +75,11 @@ public static String hasScope(final String scope) {
         return MessageFormat.format("#oauth2.hasScope(''{0}'')", scope);
     }
 
-    public static String hasUidScopeAndAnyRealm(final String realms) {
-        return MessageFormat.format("#oauth2.hasUidScopeAndAnyRealm(''{0}'')", realms);
+    public static String hasUidScopeAndAnyRealm(final String[] realms) {
+        final String formattedRealms = Arrays.stream(realms)
+                .map(r -> MessageFormat.format("''{0}''", r))
+                .collect(Collectors.joining(","));
+        return MessageFormat.format("#oauth2.hasUidScopeAndAnyRealm({0})", formattedRealms);
     }
 
     @Override

build.gradle

@@ -1,7 +1,7 @@
 subprojects {
     buildscript {
         ext {
-            springBootVersion = '2.3.1.RELEASE'
+            springBootVersion = '2.5.12'
         }
         repositories {
             mavenCentral()

core-common/build.gradle

@@ -115,6 +115,7 @@ dependencies {
         exclude module: "hamcrest-library"
     }
     testCompile 'com.jayway.jsonpath:json-path'
+    testCompile 'junit:junit:4.13.1'
     testRuntime 'org.pegdown:pegdown:1.6.0'
 }
 // end::dependencies[]

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -130,7 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath

gradlew.bat

@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,29 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell