Release

.github/workflows/check-build.yml

@@ -25,7 +25,7 @@ jobs:
     timeout-minutes: 30
     strategy:
       matrix:
-        java: [17, 21, 25]
+        java: [21, 25]
         distribution: [temurin]
     steps:
     - uses: actions/checkout@v6
@@ -107,7 +107,7 @@ jobs:
     timeout-minutes: 15
     strategy:
       matrix:
-        java: [17]
+        java: [21]
         distribution: [temurin]
     steps:
     - uses: actions/checkout@v6

.github/workflows/release.yml

@@ -20,7 +20,7 @@ jobs:
     - name: Set up JDK
       uses: actions/setup-java@v5
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'temurin'
 
     # Try to reuse existing cache from check-build
@@ -125,7 +125,7 @@ jobs:
       uses: actions/setup-java@v5
       with: # running setup-java overwrites the settings.xml
         distribution: 'temurin'
-        java-version: '17'
+        java-version: '21'
         server-id: github-central
         server-password: PACKAGES_CENTRAL_TOKEN
         gpg-passphrase: MAVEN_GPG_PASSPHRASE
@@ -147,7 +147,7 @@ jobs:
       uses: actions/setup-java@v5
       with: # running setup-java again overwrites the settings.xml
         distribution: 'temurin'
-        java-version: '17'
+        java-version: '21'
         server-id: sonatype-central-portal
         server-username: MAVEN_CENTRAL_USERNAME
         server-password: MAVEN_CENTRAL_TOKEN
@@ -182,7 +182,7 @@ jobs:
     - name: Setup - Java
       uses: actions/setup-java@v5
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'temurin'
 
     # Try to reuse existing cache from check-build

.github/workflows/run-integration-tests.yml

@@ -42,7 +42,15 @@ jobs:
       with:
         distribution: temurin
         java-version: ${{ matrix.java }}
-        cache: 'maven'
+
+    - name: Cache Maven
+      uses: actions/cache@v5
+      with:
+        path: ~/.m2/repository
+        key: ${{ runner.os }}-mvn-it-build-${{ hashFiles('**/pom.xml') }}
+        restore-keys: |
+          ${{ runner.os }}-mvn-it-build-
+          ${{ runner.os }}-mvn-build-
 
     - name: Test
       run: |

.github/workflows/test-deploy.yml

@@ -14,7 +14,7 @@ jobs:
       uses: actions/setup-java@v5
       with: # running setup-java overwrites the settings.xml
         distribution: 'temurin'
-        java-version: '17'
+        java-version: '21'
         server-id: github-central
         server-password: PACKAGES_CENTRAL_TOKEN
         gpg-passphrase: MAVEN_GPG_PASSPHRASE
@@ -36,7 +36,7 @@ jobs:
       uses: actions/setup-java@v5
       with: # running setup-java again overwrites the settings.xml
         distribution: 'temurin'
-        java-version: '17'
+        java-version: '21'
         server-id: sonatype-central-portal
         server-username: MAVEN_CENTRAL_USERNAME
         server-password: MAVEN_CENTRAL_TOKEN

CHANGELOG.md

@@ -1,3 +1,15 @@
+# 2.0.0
+_Minimum required Java version: 21_
+* Updated to Spring Boot 4.x
+  * Removed fork of `OidcUserService` to move closer to the standard implementation. Only fork the required `OidcUserRequestUtils#shouldRetrieveUserInfo`
+* Update Vaadin to 25
+  * Removed `TotalVaadinFlowWebSecurity` as it's no longer supported
+  * Please note that Stylesheet [may now required being added to `PublicStatelessPathsProvider`](https://vaadin.com/docs/v25/upgrading#themes-and-styling)
+* Updated Jackson Databind to v3
+* `ActuatorUserConfig`: Remove deprecated `passwordSha256` - Use `passwordHash` instead
+* Migrated demos and tests
+* Code cleanup
+
 # 1.5.3
 _Last expected version for Spring Boot 3.x_
 * Updated dependencies

bom/pom.xml

@@ -6,7 +6,7 @@
 
 	<groupId>software.xdev.sse</groupId>
 	<artifactId>bom</artifactId>
-	<version>1.5.4-SNAPSHOT</version>
+	<version>2.0.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>bom</name>
@@ -51,62 +51,62 @@
 			<dependency>
 				<groupId>software.xdev.sse</groupId>
 				<artifactId>client-storage</artifactId>
-				<version>1.5.4-SNAPSHOT</version>
+				<version>2.0.0-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>software.xdev.sse</groupId>
 				<artifactId>crypto-symmetric</artifactId>
-				<version>1.5.4-SNAPSHOT</version>
+				<version>2.0.0-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>software.xdev.sse</groupId>
 				<artifactId>crypto-symmetric-managed</artifactId>
-				<version>1.5.4-SNAPSHOT</version>
+				<version>2.0.0-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>software.xdev.sse</groupId>
 				<artifactId>codec-sha256</artifactId>
-				<version>1.5.4-SNAPSHOT</version>
+				<version>2.0.0-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>software.xdev.sse</groupId>
 				<artifactId>csp</artifactId>
-				<version>1.5.4-SNAPSHOT</version>
+				<version>2.0.0-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>software.xdev.sse</groupId>
 				<artifactId>metrics</artifactId>
-				<version>1.5.4-SNAPSHOT</version>
+				<version>2.0.0-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>software.xdev.sse</groupId>
 				<artifactId>oauth2-oidc</artifactId>
-				<version>1.5.4-SNAPSHOT</version>
+				<version>2.0.0-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>software.xdev.sse</groupId>
 				<artifactId>oauth2-oidc-remember-me</artifactId>
-				<version>1.5.4-SNAPSHOT</version>
+				<version>2.0.0-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>software.xdev.sse</groupId>
 				<artifactId>vaadin</artifactId>
-				<version>1.5.4-SNAPSHOT</version>
+				<version>2.0.0-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>software.xdev.sse</groupId>
 				<artifactId>web</artifactId>
-				<version>1.5.4-SNAPSHOT</version>
+				<version>2.0.0-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>software.xdev.sse</groupId>
 				<artifactId>web-sidecar-actuator</artifactId>
-				<version>1.5.4-SNAPSHOT</version>
+				<version>2.0.0-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>software.xdev.sse</groupId>
 				<artifactId>web-sidecar-common</artifactId>
-				<version>1.5.4-SNAPSHOT</version>
+				<version>2.0.0-SNAPSHOT</version>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>

client-storage/pom.xml

@@ -6,7 +6,7 @@
 
 	<groupId>software.xdev.sse</groupId>
 	<artifactId>client-storage</artifactId>
-	<version>1.5.4-SNAPSHOT</version>
+	<version>2.0.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>client-storage</name>
@@ -42,7 +42,7 @@
 	</licenses>
 
 	<properties>
-		<javaVersion>17</javaVersion>
+		<javaVersion>21</javaVersion>
 		<maven.compiler.release>${javaVersion}</maven.compiler.release>
 
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

codec-sha256/pom.xml

@@ -6,7 +6,7 @@
 
 	<groupId>software.xdev.sse</groupId>
 	<artifactId>codec-sha256</artifactId>
-	<version>1.5.4-SNAPSHOT</version>
+	<version>2.0.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>codec-sha256</name>
@@ -42,7 +42,7 @@
 	</licenses>
 
 	<properties>
-		<javaVersion>17</javaVersion>
+		<javaVersion>21</javaVersion>
 		<maven.compiler.release>${javaVersion}</maven.compiler.release>
 
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

crypto-symmetric-managed/pom.xml

@@ -6,7 +6,7 @@
 
 	<groupId>software.xdev.sse</groupId>
 	<artifactId>crypto-symmetric-managed</artifactId>
-	<version>1.5.4-SNAPSHOT</version>
+	<version>2.0.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>crypto-symmetric-managed</name>
@@ -42,7 +42,7 @@
 	</licenses>
 
 	<properties>
-		<javaVersion>17</javaVersion>
+		<javaVersion>21</javaVersion>
 		<maven.compiler.release>${javaVersion}</maven.compiler.release>
 
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -54,7 +54,7 @@
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-dependencies</artifactId>
-				<version>3.5.9</version>
+				<version>4.0.2</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>

crypto-symmetric/pom.xml

@@ -6,7 +6,7 @@
 
 	<groupId>software.xdev.sse</groupId>
 	<artifactId>crypto-symmetric</artifactId>
-	<version>1.5.4-SNAPSHOT</version>
+	<version>2.0.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>crypto-symmetric</name>
@@ -42,7 +42,7 @@
 	</licenses>
 
 	<properties>
-		<javaVersion>17</javaVersion>
+		<javaVersion>21</javaVersion>
 		<maven.compiler.release>${javaVersion}</maven.compiler.release>
 
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

csp/pom.xml

@@ -6,7 +6,7 @@
 
 	<groupId>software.xdev.sse</groupId>
 	<artifactId>csp</artifactId>
-	<version>1.5.4-SNAPSHOT</version>
+	<version>2.0.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>csp</name>
@@ -42,7 +42,7 @@
 	</licenses>
 
 	<properties>
-		<javaVersion>17</javaVersion>
+		<javaVersion>21</javaVersion>
 		<maven.compiler.release>${javaVersion}</maven.compiler.release>
 
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -54,7 +54,7 @@
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-dependencies</artifactId>
-				<version>3.5.9</version>
+				<version>4.0.2</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>

demo/entities-metamodel/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>software.xdev.sse.demo</groupId>
 		<artifactId>demo</artifactId>
-		<version>1.5.4-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>entities-metamodel</artifactId>
 
@@ -28,7 +28,7 @@
 
 		<dependency>
 			<groupId>org.hibernate.orm</groupId>
-			<artifactId>hibernate-jpamodelgen</artifactId>
+			<artifactId>hibernate-processor</artifactId>
 			<optional>true</optional>
 		</dependency>
 	</dependencies>
@@ -83,30 +83,6 @@
 					</execution>
 				</executions>
 			</plugin>
-
-			<!-- Can be removed once fix for https://hibernate.atlassian.net/browse/HHH-18863 is released -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-clean-plugin</artifactId>
-				<executions>
-					<!-- Workaround for https://hibernate.atlassian.net/browse/HHH-18873 -->
-					<execution>
-						<id>wipe-hibernate-entity-index</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>clean</goal>
-						</goals>
-						<configuration>
-							<excludeDefaultDirectories>true</excludeDefaultDirectories>
-							<filesets>
-								<fileset>
-									<directory>${project.generated.sources}/entity</directory>
-								</fileset>
-							</filesets>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
 		</plugins>
 	</build>
 </project>

demo/entities-metamodel/src/gen/java/software/xdev/sse/demo/entities/IdentifiableEntity_.java

@@ -4,21 +4,28 @@
 import jakarta.persistence.metamodel.SingularAttribute;
 import jakarta.persistence.metamodel.StaticMetamodel;
 
+/**
+ * Static metamodel for {@link software.xdev.sse.demo.entities.IdentifiableEntity}
+ **/
 @StaticMetamodel(IdentifiableEntity.class)
 public abstract class IdentifiableEntity_ {
 
+
+	/**
+	 * @see #id
+	 **/
 	public static final String ID = "id";
 
 
 	/**
-	 * @see software.xdev.sse.demo.entities.IdentifiableEntity#id
+	 * Static metamodel type for {@link software.xdev.sse.demo.entities.IdentifiableEntity}
 	 **/
-	public static volatile SingularAttribute<IdentifiableEntity, Long> id;
+	public static volatile MappedSuperclassType<IdentifiableEntity> class_;
 
 	/**
-	 * @see software.xdev.sse.demo.entities.IdentifiableEntity
+	 * Static metamodel for attribute {@link software.xdev.sse.demo.entities.IdentifiableEntity#id}
 	 **/
-	public static volatile MappedSuperclassType<IdentifiableEntity> class_;
+	public static volatile SingularAttribute<IdentifiableEntity, Long> id;
 
 }