From e3fdfeb04043627535c5a3e146b16542b75eff39 Mon Sep 17 00:00:00 2001
From: mhajas <mhajas@redhat.com>
Date: Thu, 24 Oct 2019 10:27:28 +0200
Subject: [PATCH] KEYCLOAK-11706 Add tests for spring version 2.2.0

---
 pom.xml                                       |  1 +
 .../test-apps/spring-boot-adapter-app/pom.xml | 41 ++++++++++++++++++-
 .../tests/other/springboot-tests/pom.xml      | 19 ++++++---
 3 files changed, 53 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 04866ea001..511d5b116b 100755
--- a/pom.xml
+++ b/pom.xml
@@ -164,6 +164,7 @@
         <!-- Spring Boot versions, used for tests -->
         <spring-boot15.version>1.5.20.RELEASE</spring-boot15.version>
         <spring-boot21.version>2.1.3.RELEASE</spring-boot21.version>
+        <spring-boot22.version>2.2.0.RELEASE</spring-boot22.version>
 
         <!-- webauthn support -->
         <webauthn4j.version>0.9.7.RELEASE</webauthn4j.version>
diff --git a/testsuite/integration-arquillian/test-apps/spring-boot-adapter-app/pom.xml b/testsuite/integration-arquillian/test-apps/spring-boot-adapter-app/pom.xml
index 4c9cdd190a..e95c2dd003 100644
--- a/testsuite/integration-arquillian/test-apps/spring-boot-adapter-app/pom.xml
+++ b/testsuite/integration-arquillian/test-apps/spring-boot-adapter-app/pom.xml
@@ -17,6 +17,8 @@
         <java.version>1.8</java.version>
         <jetty.version>${jetty94.version}</jetty.version>
 
+        <springboot-version>1.5</springboot-version>
+
         <spring-boot-adapter-jetty>false</spring-boot-adapter-jetty>
         <spring.boot.tomcat.adapter.artifactId>keycloak-tomcat-adapter</spring.boot.tomcat.adapter.artifactId>
 
@@ -52,7 +54,8 @@
                 <activeByDefault>true</activeByDefault>
 
                 <property>
-                    <name>!springboot21</name>
+                    <name>springboot-version</name>
+                    <value>1.5</value>
                 </property>
             </activation>
 
@@ -374,7 +377,8 @@
 
             <activation>
                 <property>
-                    <name>springboot21</name>
+                    <name>springboot-version</name>
+                    <value>2.1</value>
                 </property>
             </activation>
 
@@ -401,6 +405,39 @@
             </dependencies>
         </profile>
 
+        <profile>
+            <id>spring.boot.2.2</id>
+
+            <activation>
+                <property>
+                    <name>springboot-version</name>
+                    <value>2.2</value>
+                </property>
+            </activation>
+
+            <properties>
+                <spring-boot.version>${spring-boot22.version}</spring-boot.version>
+            </properties>
+
+            <dependencyManagement>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.eclipse.jetty</groupId>
+                        <artifactId>jetty-bom</artifactId>
+                        <version>${jetty.version}</version>
+                        <type>pom</type>
+                    </dependency>
+                </dependencies>
+            </dependencyManagement>
+
+            <dependencies>
+                <dependency>
+                    <groupId>org.keycloak</groupId>
+                    <artifactId>keycloak-spring-boot-2-adapter</artifactId>
+                </dependency>
+            </dependencies>
+        </profile>
+
         <profile>
             <id>spring-boot-adapter-tomcat</id>
             <dependencies>
diff --git a/testsuite/integration-arquillian/tests/other/springboot-tests/pom.xml b/testsuite/integration-arquillian/tests/other/springboot-tests/pom.xml
index 9420d095f5..de44350ad2 100644
--- a/testsuite/integration-arquillian/tests/other/springboot-tests/pom.xml
+++ b/testsuite/integration-arquillian/tests/other/springboot-tests/pom.xml
@@ -15,7 +15,7 @@
         <adapter.container>tomcat</adapter.container>
 
         <maven.settings.file/>
-        <springboot.version.option>-Dspringboot15</springboot.version.option>
+        <springboot.version.option>1.5</springboot.version.option>
 
         <app.server.debug.port>5006</app.server.debug.port>
         <app.server.debug.suspend>n</app.server.debug.suspend>
@@ -68,7 +68,7 @@
                                         <argument>-B</argument>
                                         <argument>-Pspring-boot-adapter-${adapter.container}</argument>
                                         <argument>-Dmaven.repo.local=${settings.localRepository}</argument>
-                                        <argument>${springboot.version.option}</argument>
+                                        <argument>-Dspringboot-version=${springboot.version.option}</argument>
                                     </arguments>
                                 </configuration>
                             </execution>
@@ -89,7 +89,7 @@
                                         <argument>-B</argument>
                                         <argument>-Pspring-boot-adapter-${adapter.container}</argument>
                                         <argument>-Dmaven.repo.local=${settings.localRepository}</argument>
-                                        <argument>${springboot.version.option}</argument>
+                                        <argument>-Dspringboot-version=${springboot.version.option}</argument>
                                         <argument>-Dapp.server.debug.port=${app.server.debug.port}</argument>
                                         <argument>-Dapp.server.debug.suspend=${app.server.debug.suspend}</argument>
                                     </arguments>
@@ -148,7 +148,7 @@
                                         <argument>-B</argument>
                                         <argument>-Pspring-boot-adapter-${adapter.container}</argument>
                                         <argument>-Dmaven.repo.local=${settings.localRepository}</argument>
-                                        <argument>${springboot.version.option}</argument>
+                                        <argument>-Dspringboot-version=${springboot.version.option}</argument>
                                         <argument>${repo.argument}</argument>
                                     </arguments>
                                 </configuration>
@@ -172,7 +172,7 @@
                                         <argument>${settings.path}</argument>
                                         <argument>-Pspring-boot-adapter-${adapter.container}</argument>
                                         <argument>-Dmaven.repo.local=${settings.localRepository}</argument>
-                                        <argument>${springboot.version.option}</argument>
+                                        <argument>-Dspringboot-version=${springboot.version.option}</argument>
                                         <argument>-Dapp.server.debug.port=${app.server.debug.port}</argument>
                                         <argument>-Dapp.server.debug.suspend=${app.server.debug.suspend}</argument>
                                         <argument>${repo.argument}</argument>
@@ -195,7 +195,14 @@
         <profile>
             <id>springboot21</id>
             <properties>
-                <springboot.version.option>-Dspringboot21</springboot.version.option>
+                <springboot.version.option>2.1</springboot.version.option>
+            </properties>
+        </profile>
+
+        <profile>
+            <id>springboot22</id>
+            <properties>
+                <springboot.version.option>2.2</springboot.version.option>
             </properties>
         </profile>