Update springboot version

Signed-off-by: Alfredo Moises Boullosa <aboullos@redhat.com>
This commit is contained in:
Alfredo Moises Boullosa 2023-11-27 10:58:50 +01:00 committed by Hynek Mlnařík
parent d387f13525
commit 0b48bef0b1
4 changed files with 12 additions and 35 deletions

View file

@ -213,8 +213,7 @@
<tomcat9.version>9.0.16</tomcat9.version> <tomcat9.version>9.0.16</tomcat9.version>
<!-- Spring Boot versions, used for tests --> <!-- Spring Boot versions, used for tests -->
<spring-boot24.version>2.4.13</spring-boot24.version> <spring-boot27.version>2.7.14</spring-boot27.version>
<spring-boot26.version>2.6.1</spring-boot26.version>
<!-- webauthn support --> <!-- webauthn support -->
<webauthn4j.version>0.21.5.RELEASE</webauthn4j.version> <webauthn4j.version>0.21.5.RELEASE</webauthn4j.version>

View file

@ -343,14 +343,14 @@ that you need to use property `migration.mode` with the value `manual` .
## Spring Boot adapter tests ## Spring Boot adapter tests
Currently, we are testing Spring Boot with three different containers `Tomcat 8`, `Undertow` and `Jetty 9.4`. Currently, we are testing Spring Boot with three different containers `Tomcat 8`, `Undertow` and `Jetty 9.4`.
We are testing various versions of Spring Boot 2.x. All versions are specified in [root pom.xml](../../pom.xml) (i.e. see properties `spring-boot24.version` and `spring-boot26.version`). We are testing with Spring Boot 2.7. The version is specified in [root pom.xml](../../pom.xml) (i.e. see property `spring-boot27.version`).
To run tests execute following command. Default version of Spring Boot is 2.4.x, to run tests with version 2.6.x add profile `-Pspringboot26`. To run tests execute following command. Default version of Spring Boot is 2.7.x, there is also a profile `-Pspringboot27`.
``` ```
mvn -f testsuite/integration-arquillian/tests/other/springboot-tests/pom.xml \ mvn -f testsuite/integration-arquillian/tests/other/springboot-tests/pom.xml \
clean test \ clean test \
-Dadapter.container=[tomcat|undertow|jetty94] \ -Dadapter.container=[tomcat|undertow|jetty94] \
[-Pspringboot26] [-Pspringboot27]
``` ```
## Base UI tests ## Base UI tests

View file

@ -18,7 +18,7 @@
<jetty.version>${jetty94.version}</jetty.version> <jetty.version>${jetty94.version}</jetty.version>
<undertow.version>${undertow-legacy.version}</undertow.version> <undertow.version>${undertow-legacy.version}</undertow.version>
<springboot-version>2.4</springboot-version> <springboot-version>2.7</springboot-version>
<spring-boot-adapter-jetty>false</spring-boot-adapter-jetty> <spring-boot-adapter-jetty>false</spring-boot-adapter-jetty>
<spring.boot.tomcat.adapter.artifactId>keycloak-tomcat-adapter</spring.boot.tomcat.adapter.artifactId> <spring.boot.tomcat.adapter.artifactId>keycloak-tomcat-adapter</spring.boot.tomcat.adapter.artifactId>
@ -67,33 +67,18 @@
<profiles> <profiles>
<profile> <profile>
<id>spring.boot.2.4</id> <id>spring.boot.2.7</id>
<activation> <activation>
<activeByDefault>true</activeByDefault> <activeByDefault>true</activeByDefault>
<property> <property>
<name>springboot-version</name> <name>springboot-version</name>
<value>2.4</value> <value>2.7</value>
</property> </property>
</activation> </activation>
<properties> <properties>
<spring-boot.version>${spring-boot24.version}</spring-boot.version> <spring-boot.version>${spring-boot27.version}</spring-boot.version>
</properties>
</profile>
<profile>
<id>spring.boot.2.6</id>
<activation>
<property>
<name>springboot-version</name>
<value>2.6</value>
</property>
</activation>
<properties>
<spring-boot.version>${spring-boot26.version}</spring-boot.version>
</properties> </properties>
</profile> </profile>
@ -192,7 +177,7 @@
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>${spring-boot26.version}</version> <version>${spring-boot27.version}</version>
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>

View file

@ -15,7 +15,7 @@
<adapter.container>tomcat</adapter.container> <adapter.container>tomcat</adapter.container>
<maven.settings.file/> <maven.settings.file/>
<springboot.version.option>2.4</springboot.version.option> <springboot.version.option>2.7</springboot.version.option>
<spring.boot.adapter.version>${project.version}</spring.boot.adapter.version> <spring.boot.adapter.version>${project.version}</spring.boot.adapter.version>
<app.server.debug.port>5006</app.server.debug.port> <app.server.debug.port>5006</app.server.debug.port>
@ -226,16 +226,9 @@
</profile> </profile>
<profile> <profile>
<id>springboot24</id> <id>springboot27</id>
<properties> <properties>
<springboot.version.option>2.4</springboot.version.option> <springboot.version.option>2.7</springboot.version.option>
</properties>
</profile>
<profile>
<id>springboot26</id>
<properties>
<springboot.version.option>2.6</springboot.version.option>
</properties> </properties>
</profile> </profile>