upgrade to spring boot 3.2.0

.gitignore

@@ -1,8 +1,31 @@
 bin/
 target/
+config/
 .settings/
 .project
 .classpath
 hs_err*.log
 application.properties
 usernames.txt
+
+# IDEs and editors
+.idea/
+.project
+.classpath
+.c9/
+*.launch
+.settings/
+*.sublime-workspace
+
+# Visual Studio Code
+.vscode
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+.history/*
+
+# System files
+.DS_Store
+Thumbs.db

application/src/main/java/de/bstly/we/Application.java

@@ -5,9 +5,9 @@ package de.bstly.we;
 
 import java.util.EnumSet;
 
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
-import javax.servlet.SessionTrackingMode;
+import jakarta.servlet.SessionTrackingMode;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -33,7 +33,7 @@ public class Application extends SpringBootServletInitializer {
 	/*
 	 * @see
 	 * org.springframework.boot.web.servlet.support.SpringBootServletInitializer#
-	 * onStartup(javax.servlet.ServletContext)
+	 * onStartup(jakarta.servlet.ServletContext)
 	 */
 	@Override
 	public void onStartup(ServletContext servletContext) throws ServletException {

borrow/pom.xml

@@ -22,5 +22,13 @@
 			<artifactId>webstly-jwt</artifactId>
 			<version>${revision}</version>
 		</dependency>		
+		
+		<!-- Query DSL -->
+		<dependency>
+			<groupId>com.querydsl</groupId>
+			<artifactId>querydsl-apt</artifactId>
+			<version>${querydsl.version}</version>
+			<classifier>jakarta</classifier>
+		</dependency>
 	</dependencies>
 </project>

borrow/src/main/java/de/bstly/we/borrow/controller/BorrowRequestController.java

@@ -6,8 +6,8 @@ package de.bstly.we.borrow.controller;
 import java.text.ParseException;
 import java.util.Optional;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;

borrow/src/main/java/de/bstly/we/borrow/model/BorrowItem.java

@@ -6,16 +6,16 @@ package de.bstly.we.borrow.model;
 import java.time.Duration;
 import java.util.List;
 
-import javax.persistence.Column;
+import jakarta.persistence.Column;
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
-import javax.persistence.EnumType;
+import jakarta.persistence.EnumType;
-import javax.persistence.Enumerated;
+import jakarta.persistence.Enumerated;
-import javax.persistence.GeneratedValue;
+import jakarta.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
+import jakarta.persistence.GenerationType;
-import javax.persistence.Id;
+import jakarta.persistence.Id;
-import javax.persistence.Lob;
+import jakarta.persistence.Lob;
-import javax.persistence.Table;
+import jakarta.persistence.Table;
-import javax.persistence.Transient;
+import jakarta.persistence.Transient;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 

borrow/src/main/java/de/bstly/we/borrow/model/BorrowItemManualSlot.java

@@ -5,9 +5,9 @@ package de.bstly.we.borrow.model;
 
 import java.time.Instant;
 
-import javax.persistence.Column;
+import jakarta.persistence.Column;
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Table;
 
 /**
  * The Class BorrowItemManualSlot.

borrow/src/main/java/de/bstly/we/borrow/model/BorrowItemPeriodSlot.java

@@ -6,11 +6,11 @@ package de.bstly.we.borrow.model;
 import java.time.DayOfWeek;
 import java.time.LocalTime;
 
-import javax.persistence.Column;
+import jakarta.persistence.Column;
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
-import javax.persistence.EnumType;
+import jakarta.persistence.EnumType;
-import javax.persistence.Enumerated;
+import jakarta.persistence.Enumerated;
-import javax.persistence.Table;
+import jakarta.persistence.Table;
 
 /**
  * The Class BorrowItemPeriodSlot.

borrow/src/main/java/de/bstly/we/borrow/model/BorrowItemSlot.java

@@ -3,15 +3,15 @@
  */
 package de.bstly.we.borrow.model;
 
-import javax.persistence.Column;
+import jakarta.persistence.Column;
-import javax.persistence.DiscriminatorColumn;
+import jakarta.persistence.DiscriminatorColumn;
-import javax.persistence.DiscriminatorType;
+import jakarta.persistence.DiscriminatorType;
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
-import javax.persistence.GeneratedValue;
+import jakarta.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
+import jakarta.persistence.GenerationType;
-import javax.persistence.Id;
+import jakarta.persistence.Id;
-import javax.persistence.Inheritance;
+import jakarta.persistence.Inheritance;
-import javax.persistence.InheritanceType;
+import jakarta.persistence.InheritanceType;
 
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;

borrow/src/main/java/de/bstly/we/borrow/model/BorrowRequest.java

@@ -5,16 +5,16 @@ package de.bstly.we.borrow.model;
 
 import java.time.Instant;
 
-import javax.persistence.Column;
+import jakarta.persistence.Column;
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
-import javax.persistence.EnumType;
+import jakarta.persistence.EnumType;
-import javax.persistence.Enumerated;
+import jakarta.persistence.Enumerated;
-import javax.persistence.GeneratedValue;
+import jakarta.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
+import jakarta.persistence.GenerationType;
-import javax.persistence.Id;
+import jakarta.persistence.Id;
-import javax.persistence.Lob;
+import jakarta.persistence.Lob;
-import javax.persistence.Table;
+import jakarta.persistence.Table;
-import javax.persistence.Transient;
+import jakarta.persistence.Transient;
 
 import de.bstly.we.model.UserData;
 

core/pom.xml

@@ -41,12 +41,15 @@
 		<!-- Query DSL -->
 		<dependency>
 			<groupId>com.querydsl</groupId>
-			<artifactId>querydsl-apt</artifactId>
+			<artifactId>querydsl-jpa</artifactId>
+			<version>${querydsl.version}</version>
+			<classifier>jakarta</classifier>
 		</dependency>
-
 		<dependency>
 			<groupId>com.querydsl</groupId>
-			<artifactId>querydsl-jpa</artifactId>
+			<artifactId>querydsl-apt</artifactId>
+			<version>${querydsl.version}</version>
+			<classifier>jakarta</classifier>
 		</dependency>
 
 		<!-- Utils -->
@@ -70,7 +73,7 @@
 		<dependency>
 			<groupId>org.passay</groupId>
 			<artifactId>passay</artifactId>
-			<version>1.6.1</version>
+			<version>1.6.4</version>
 		</dependency>
 
 		<dependency>

core/src/main/java/de/bstly/we/CoreConfiguration.java

@@ -3,7 +3,7 @@
  */
 package de.bstly.we;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;

core/src/main/java/de/bstly/we/businesslogic/UserManager.java

@@ -10,8 +10,9 @@ import java.io.IOException;
 import java.io.InputStreamReader;
 import java.util.List;
 import java.util.Map;
+import java.util.StringTokenizer;
 
-import javax.servlet.ServletOutputStream;
+import jakarta.servlet.ServletOutputStream;
 
 import org.apache.commons.lang3.RandomStringUtils;
 import org.slf4j.Logger;
@@ -238,7 +239,14 @@ public class UserManager implements UserDataProvider {
 				myWriter.write(publicKey);
 				myWriter.close();
 				String command = "gpg --import " + publicKeyPath;
-				Runtime.getRuntime().exec(command);
+				StringTokenizer st = new StringTokenizer(command);
+				String[] cmdarray = new String[st.countTokens()];
+				int i = 0;
+				while (st.hasMoreTokens()) {
+					cmdarray[i] = st.nextToken();
+					i++;
+				}
+				Runtime.getRuntime().exec(cmdarray);
 			} catch (IOException e) {
 				e.printStackTrace();
 			}

core/src/main/java/de/bstly/we/businesslogic/support/AbstractModelEventListener.java

@@ -3,13 +3,13 @@
  */
 package de.bstly.we.businesslogic.support;
 
-import javax.persistence.PostLoad;
+import jakarta.persistence.PostLoad;
-import javax.persistence.PostPersist;
+import jakarta.persistence.PostPersist;
-import javax.persistence.PostRemove;
+import jakarta.persistence.PostRemove;
-import javax.persistence.PostUpdate;
+import jakarta.persistence.PostUpdate;
-import javax.persistence.PrePersist;
+import jakarta.persistence.PrePersist;
-import javax.persistence.PreRemove;
+import jakarta.persistence.PreRemove;
-import javax.persistence.PreUpdate;
+import jakarta.persistence.PreUpdate;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationEventPublisher;

core/src/main/java/de/bstly/we/controller/AuthenticationController.java

@@ -6,8 +6,8 @@ package de.bstly.we.controller;
 import java.io.IOException;
 import java.util.Optional;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;

core/src/main/java/de/bstly/we/controller/ItemController.java

@@ -6,7 +6,7 @@ package de.bstly.we.controller;
 import java.util.Map;
 import java.util.Set;
 
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSession;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;

core/src/main/java/de/bstly/we/controller/PermissionController.java

@@ -5,7 +5,7 @@ package de.bstly.we.controller;
 
 import java.util.List;
 
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSession;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;

core/src/main/java/de/bstly/we/controller/PretixApiController.java

@@ -6,7 +6,7 @@ package de.bstly.we.controller;
 import java.io.IOException;
 import java.util.Map.Entry;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;

core/src/main/java/de/bstly/we/controller/QuotaController.java

@@ -5,7 +5,7 @@ package de.bstly.we.controller;
 
 import java.util.List;
 
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSession;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;

core/src/main/java/de/bstly/we/controller/UserController.java

@@ -3,7 +3,7 @@
  */
 package de.bstly.we.controller;
 
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSession;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;

core/src/main/java/de/bstly/we/controller/support/EntityResponseStatusException.java

@@ -7,7 +7,7 @@ import javax.annotation.Nullable;
 
 import org.springframework.core.NestedExceptionUtils;
 import org.springframework.core.NestedRuntimeException;
-import org.springframework.http.HttpStatus;
+import org.springframework.http.HttpStatusCode;
 import org.springframework.util.Assert;
 
 /**
@@ -20,7 +20,7 @@ public class EntityResponseStatusException extends NestedRuntimeException {
 	 */
 	private static final long serialVersionUID = 1L;
 
-	private final HttpStatus status;
+	private final HttpStatusCode status;
 
 	@Nullable
 	private final Object body;
@@ -30,7 +30,7 @@ public class EntityResponseStatusException extends NestedRuntimeException {
 	 *
 	 * @param status the status
 	 */
-	public EntityResponseStatusException(HttpStatus status) {
+	public EntityResponseStatusException(HttpStatusCode status) {
 		this(null, status);
 	}
 
@@ -40,7 +40,7 @@ public class EntityResponseStatusException extends NestedRuntimeException {
 	 * @param body   the body
 	 * @param status the status
 	 */
-	public EntityResponseStatusException(@Nullable Object body, HttpStatus status) {
+	public EntityResponseStatusException(@Nullable Object body, HttpStatusCode status) {
 		this(body, status, null);
 	}
 
@@ -51,7 +51,7 @@ public class EntityResponseStatusException extends NestedRuntimeException {
 	 * @param status the status
 	 * @param cause  the cause
 	 */
-	public EntityResponseStatusException(@Nullable Object body, HttpStatus status, @Nullable Throwable cause) {
+	public EntityResponseStatusException(@Nullable Object body, HttpStatusCode status, @Nullable Throwable cause) {
 		super(null, cause);
 		Assert.notNull(status, "HttpStatus is required");
 		this.status = status;
@@ -63,7 +63,7 @@ public class EntityResponseStatusException extends NestedRuntimeException {
 	 *
 	 * @return the status
 	 */
-	public HttpStatus getStatus() {
+	public HttpStatusCode getStatus() {
 		return this.status;
 	}
 

core/src/main/java/de/bstly/we/controller/support/TokenSessionManager.java

@@ -7,7 +7,7 @@ import java.time.Instant;
 import java.util.List;
 import java.util.Set;
 
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSession;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;

core/src/main/java/de/bstly/we/model/Permission.java

@@ -5,12 +5,12 @@ package de.bstly.we.model;
 
 import java.time.Instant;
 
-import javax.persistence.Column;
+import jakarta.persistence.Column;
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
-import javax.persistence.GeneratedValue;
+import jakarta.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
+import jakarta.persistence.GenerationType;
-import javax.persistence.Id;
+import jakarta.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Table;
 
 /**
  * The Class Permission.

core/src/main/java/de/bstly/we/model/PermissionMapping.java

@@ -7,17 +7,17 @@ import java.time.Instant;
 import java.time.temporal.ChronoUnit;
 import java.util.Set;
 
-import javax.persistence.AttributeConverter;
+import jakarta.persistence.AttributeConverter;
-import javax.persistence.CollectionTable;
+import jakarta.persistence.CollectionTable;
-import javax.persistence.Column;
+import jakarta.persistence.Column;
-import javax.persistence.Convert;
+import jakarta.persistence.Convert;
-import javax.persistence.Converter;
+import jakarta.persistence.Converter;
-import javax.persistence.ElementCollection;
+import jakarta.persistence.ElementCollection;
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
-import javax.persistence.GeneratedValue;
+import jakarta.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
+import jakarta.persistence.GenerationType;
-import javax.persistence.Id;
+import jakarta.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Table;
 
 import org.hibernate.annotations.LazyCollection;
 import org.hibernate.annotations.LazyCollectionOption;

core/src/main/java/de/bstly/we/model/PersistentLogin.java

@@ -5,10 +5,10 @@ package de.bstly.we.model;
 
 import java.time.Instant;
 
-import javax.persistence.Column;
+import jakarta.persistence.Column;
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
-import javax.persistence.Id;
+import jakarta.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Table;
 
 /**
  * The Class PersistentLogin.

core/src/main/java/de/bstly/we/model/Quota.java

@@ -3,12 +3,12 @@
  */
 package de.bstly.we.model;
 
-import javax.persistence.Column;
+import jakarta.persistence.Column;
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
-import javax.persistence.GeneratedValue;
+import jakarta.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
+import jakarta.persistence.GenerationType;
-import javax.persistence.Id;
+import jakarta.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Table;
 
 /**
  * The Class Quota.

core/src/main/java/de/bstly/we/model/QuotaMapping.java

@@ -5,14 +5,14 @@ package de.bstly.we.model;
 
 import java.util.Set;
 
-import javax.persistence.CollectionTable;
+import jakarta.persistence.CollectionTable;
-import javax.persistence.Column;
+import jakarta.persistence.Column;
-import javax.persistence.ElementCollection;
+import jakarta.persistence.ElementCollection;
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
-import javax.persistence.GeneratedValue;
+import jakarta.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
+import jakarta.persistence.GenerationType;
-import javax.persistence.Id;
+import jakarta.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Table;
 
 import org.hibernate.annotations.LazyCollection;
 import org.hibernate.annotations.LazyCollectionOption;

core/src/main/java/de/bstly/we/model/SystemProfileField.java

@@ -3,10 +3,10 @@
  */
 package de.bstly.we.model;
 
-import javax.persistence.Column;
+import jakarta.persistence.Column;
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
-import javax.persistence.Id;
+import jakarta.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Table;
 
 /**
  * The Class SystemProfileField.

core/src/main/java/de/bstly/we/model/SystemProperty.java

@@ -3,11 +3,11 @@
  */
 package de.bstly.we.model;
 
-import javax.persistence.Column;
+import jakarta.persistence.Column;
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
-import javax.persistence.Id;
+import jakarta.persistence.Id;
-import javax.persistence.Lob;
+import jakarta.persistence.Lob;
-import javax.persistence.Table;
+import jakarta.persistence.Table;
 
 /**
  * The Class SystemProperty.

core/src/main/java/de/bstly/we/model/User.java

@@ -3,13 +3,13 @@
  */
 package de.bstly.we.model;
 
-import javax.persistence.Column;
+import jakarta.persistence.Column;
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
-import javax.persistence.GeneratedValue;
+import jakarta.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
+import jakarta.persistence.GenerationType;
-import javax.persistence.Id;
+import jakarta.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Table;
-import javax.persistence.UniqueConstraint;
+import jakarta.persistence.UniqueConstraint;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 

core/src/main/java/de/bstly/we/model/UserAlias.java

@@ -3,13 +3,13 @@
  */
 package de.bstly.we.model;
 
-import javax.persistence.Column;
+import jakarta.persistence.Column;
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
-import javax.persistence.GeneratedValue;
+import jakarta.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
+import jakarta.persistence.GenerationType;
-import javax.persistence.Id;
+import jakarta.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Table;
-import javax.persistence.UniqueConstraint;
+import jakarta.persistence.UniqueConstraint;
 
 /**
  * The Class UserAlias.

core/src/main/java/de/bstly/we/model/UserDomain.java

@@ -3,13 +3,13 @@
  */
 package de.bstly.we.model;
 
-import javax.persistence.Column;
+import jakarta.persistence.Column;
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
-import javax.persistence.GeneratedValue;
+import jakarta.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
+import jakarta.persistence.GenerationType;
-import javax.persistence.Id;
+import jakarta.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Table;
-import javax.persistence.UniqueConstraint;
+import jakarta.persistence.UniqueConstraint;
 
 /**
  * The Class UserDomain.

core/src/main/java/de/bstly/we/model/UserProfileField.java

@@ -5,13 +5,13 @@ package de.bstly.we.model;
 
 import java.io.Serializable;
 
-import javax.persistence.Column;
+import jakarta.persistence.Column;
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
-import javax.persistence.Id;
+import jakarta.persistence.Id;
-import javax.persistence.IdClass;
+import jakarta.persistence.IdClass;
-import javax.persistence.Lob;
+import jakarta.persistence.Lob;
-import javax.persistence.Table;
+import jakarta.persistence.Table;
-import javax.persistence.UniqueConstraint;
+import jakarta.persistence.UniqueConstraint;
 
 import de.bstly.we.model.UserProfileField.UserProfileFieldId;
 

core/src/main/java/de/bstly/we/model/UserTotp.java

@@ -5,15 +5,15 @@ package de.bstly.we.model;
 
 import java.util.List;
 
-import javax.persistence.CollectionTable;
+import jakarta.persistence.CollectionTable;
-import javax.persistence.Column;
+import jakarta.persistence.Column;
-import javax.persistence.ElementCollection;
+import jakarta.persistence.ElementCollection;
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
-import javax.persistence.GeneratedValue;
+import jakarta.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
+import jakarta.persistence.GenerationType;
-import javax.persistence.Id;
+import jakarta.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Table;
-import javax.persistence.UniqueConstraint;
+import jakarta.persistence.UniqueConstraint;
 
 import org.hibernate.annotations.LazyCollection;
 import org.hibernate.annotations.LazyCollectionOption;

core/src/main/java/de/bstly/we/model/VoucherMapping.java

@@ -3,12 +3,12 @@
  */
 package de.bstly.we.model;
 
-import javax.persistence.Column;
+import jakarta.persistence.Column;
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
-import javax.persistence.GeneratedValue;
+import jakarta.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
+import jakarta.persistence.GenerationType;
-import javax.persistence.Id;
+import jakarta.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Table;
 
 /**
  * The Class VoucherMapping.

core/src/main/java/de/bstly/we/security/LocalAuthenticationEntryPoint.java

@@ -6,9 +6,9 @@ package de.bstly.we.security;
 import java.io.IOException;
 import java.util.List;
 
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.security.core.AuthenticationException;
@@ -35,8 +35,8 @@ public class LocalAuthenticationEntryPoint extends LoginUrlAuthenticationEntryPo
 
 	/*
 	 * @see org.springframework.security.web.authentication.
-	 * LoginUrlAuthenticationEntryPoint#commence(javax.servlet.http.
+	 * LoginUrlAuthenticationEntryPoint#commence(jakarta.servlet.http.
-	 * HttpServletRequest, javax.servlet.http.HttpServletResponse,
+	 * HttpServletRequest, jakarta.servlet.http.HttpServletResponse,
 	 * org.springframework.security.core.AuthenticationException)
 	 */
 	@Override

core/src/main/java/de/bstly/we/security/LocalRememberMeServices.java

@@ -9,8 +9,8 @@ import java.util.Arrays;
 import java.util.Date;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.log.LogMessage;
@@ -54,7 +54,7 @@ public class LocalRememberMeServices extends PersistentTokenBasedRememberMeServi
 
 	/*
 	 * @see org.springframework.security.web.authentication.rememberme.
-	 * AbstractRememberMeServices#rememberMeRequested(javax.servlet.http.
+	 * AbstractRememberMeServices#rememberMeRequested(jakarta.servlet.http.
 	 * HttpServletRequest, java.lang.String)
 	 */
 	@Override

core/src/main/java/de/bstly/we/security/PasswordEncoderConfig.java

@@ -7,6 +7,18 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.crypto.argon2.Argon2PasswordEncoder;
 
+import dev.samstevens.totp.code.CodeGenerator;
+import dev.samstevens.totp.code.CodeVerifier;
+import dev.samstevens.totp.code.DefaultCodeGenerator;
+import dev.samstevens.totp.code.DefaultCodeVerifier;
+import dev.samstevens.totp.code.HashingAlgorithm;
+import dev.samstevens.totp.qr.QrDataFactory;
+import dev.samstevens.totp.recovery.RecoveryCodeGenerator;
+import dev.samstevens.totp.secret.DefaultSecretGenerator;
+import dev.samstevens.totp.secret.SecretGenerator;
+import dev.samstevens.totp.time.SystemTimeProvider;
+import dev.samstevens.totp.time.TimeProvider;
+
 /**
  * The Class PasswordEncoderConfig.
  */
@@ -20,6 +32,40 @@ public class PasswordEncoderConfig {
 	 */
 	@Bean(name = "passwordEncoder")
 	public Argon2PasswordEncoder passwordEncoder() {
-		return new Argon2PasswordEncoder();
+		return Argon2PasswordEncoder.defaultsForSpringSecurity_v5_8();
+	}
+
+	@Bean
+	public SecretGenerator secretGenerator() {
+		return new DefaultSecretGenerator(32);
+	}
+
+	@Bean
+	public TimeProvider timeProvider() {
+		return new SystemTimeProvider();
+	}
+
+	@Bean
+	public CodeGenerator codeGenerator() {
+		return new DefaultCodeGenerator(HashingAlgorithm.SHA1, 6);
+	}
+
+	@Bean
+	public CodeVerifier codeVerifier() {
+		DefaultCodeVerifier verifier = new DefaultCodeVerifier(codeGenerator(), timeProvider());
+		verifier.setTimePeriod(30);
+		verifier.setAllowedTimePeriodDiscrepancy(1);
+
+		return verifier;
+	}
+
+	@Bean
+	public QrDataFactory qrDataFactory() {
+		return new QrDataFactory(HashingAlgorithm.SHA1, 6, 30);
+	}
+
+	@Bean
+	public RecoveryCodeGenerator recoveryCodeGenerator() {
+		return new RecoveryCodeGenerator();
 	}
 }

core/src/main/java/de/bstly/we/security/SecurityConfig.java

@@ -13,9 +13,10 @@ import javax.sql.DataSource;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
-import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
+import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.http.SessionCreationPolicy;
@@ -51,7 +52,8 @@ import dev.samstevens.totp.code.HashingAlgorithm;
  * The Class SecurityConfig.
  */
 @EnableWebSecurity
-@EnableGlobalMethodSecurity(prePostEnabled = true)
+@EnableMethodSecurity(prePostEnabled = true)
+@Configuration
 public class SecurityConfig {
 
 	@Autowired

core/src/main/java/de/bstly/we/security/filter/FormSecondFactorAuthenticationFilter.java

@@ -5,9 +5,9 @@ package de.bstly.we.security.filter;
 
 import java.io.IOException;
 
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.lang.Nullable;
 import org.springframework.security.authentication.AuthenticationCredentialsNotFoundException;
@@ -42,8 +42,8 @@ public class FormSecondFactorAuthenticationFilter extends AbstractAuthentication
 
 	/*
 	 * @see org.springframework.security.web.authentication.
-	 * AbstractAuthenticationProcessingFilter#attemptAuthentication(javax.servlet.
+	 * AbstractAuthenticationProcessingFilter#attemptAuthentication(jakarta.servlet.
-	 * http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
+	 * http.HttpServletRequest, jakarta.servlet.http.HttpServletResponse)
 	 */
 	@Override
 	public Authentication attemptAuthentication(HttpServletRequest request, HttpServletResponse response)
@@ -76,7 +76,7 @@ public class FormSecondFactorAuthenticationFilter extends AbstractAuthentication
 	/*
 	 * @see org.springframework.security.web.authentication.
 	 * AbstractAuthenticationProcessingFilter#unsuccessfulAuthentication(javax.
-	 * servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse,
+	 * servlet.http.HttpServletRequest, jakarta.servlet.http.HttpServletResponse,
 	 * org.springframework.security.core.AuthenticationException)
 	 */
 	@Override

core/src/main/java/de/bstly/we/security/filter/LocalAnonymousAuthenticationFilter.java

@@ -5,11 +5,11 @@ package de.bstly.we.security.filter;
 
 import java.io.IOException;
 
-import javax.servlet.FilterChain;
+import jakarta.servlet.FilterChain;
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
-import javax.servlet.ServletRequest;
+import jakarta.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
+import jakarta.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
@@ -35,8 +35,8 @@ public class LocalAnonymousAuthenticationFilter extends AnonymousAuthenticationF
 	/*
 	 * @see
 	 * org.springframework.security.web.authentication.AnonymousAuthenticationFilter
-	 * #doFilter(javax.servlet.ServletRequest, javax.servlet.ServletResponse,
+	 * #doFilter(jakarta.servlet.ServletRequest, jakarta.servlet.ServletResponse,
-	 * javax.servlet.FilterChain)
+	 * jakarta.servlet.FilterChain)
 	 */
 	@Override
 	public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain)
@@ -50,7 +50,7 @@ public class LocalAnonymousAuthenticationFilter extends AnonymousAuthenticationF
 	/*
 	 * @see
 	 * org.springframework.security.web.authentication.AnonymousAuthenticationFilter
-	 * #createAuthentication(javax.servlet.http.HttpServletRequest)
+	 * #createAuthentication(jakarta.servlet.http.HttpServletRequest)
 	 */
 	@Override
 	protected Authentication createAuthentication(HttpServletRequest request) {

core/src/main/java/de/bstly/we/security/filter/RestAuthenticationFilter.java

@@ -5,9 +5,9 @@ package de.bstly.we.security.filter;
 
 import java.io.IOException;
 
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.security.authentication.AuthenticationCredentialsNotFoundException;
 import org.springframework.security.authentication.AuthenticationServiceException;
@@ -45,8 +45,8 @@ public class RestAuthenticationFilter extends AbstractAuthenticationProcessingFi
 
 	/*
 	 * @see org.springframework.security.web.authentication.
-	 * AbstractAuthenticationProcessingFilter#attemptAuthentication(javax.servlet.
+	 * AbstractAuthenticationProcessingFilter#attemptAuthentication(jakarta.servlet.
-	 * http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
+	 * http.HttpServletRequest, jakarta.servlet.http.HttpServletResponse)
 	 */
 	@Override
 	public Authentication attemptAuthentication(HttpServletRequest request, HttpServletResponse response)

core/src/main/java/de/bstly/we/security/filter/RestSecondFactorAuthenticationFilter.java

@@ -3,9 +3,9 @@ package de.bstly.we.security.filter;
 
 import java.io.IOException;
 
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.security.authentication.AuthenticationCredentialsNotFoundException;
 import org.springframework.security.authentication.AuthenticationServiceException;
@@ -41,8 +41,8 @@ public class RestSecondFactorAuthenticationFilter extends FormSecondFactorAuthen
 
 	/*
 	 * @see de.bstly.we.security.filter.FormSecondFactorAuthenticationFilter#
-	 * attemptAuthentication(javax.servlet.http.HttpServletRequest,
+	 * attemptAuthentication(jakarta.servlet.http.HttpServletRequest,
-	 * javax.servlet.http.HttpServletResponse)
+	 * jakarta.servlet.http.HttpServletResponse)
 	 */
 	@Override
 	public Authentication attemptAuthentication(HttpServletRequest request, HttpServletResponse response)
@@ -91,8 +91,8 @@ public class RestSecondFactorAuthenticationFilter extends FormSecondFactorAuthen
 
 	/*
 	 * @see de.bstly.we.security.filter.FormSecondFactorAuthenticationFilter#
-	 * unsuccessfulAuthentication(javax.servlet.http.HttpServletRequest,
+	 * unsuccessfulAuthentication(jakarta.servlet.http.HttpServletRequest,
-	 * javax.servlet.http.HttpServletResponse,
+	 * jakarta.servlet.http.HttpServletResponse,
 	 * org.springframework.security.core.AuthenticationException)
 	 */
 	@Override

core/src/main/java/de/bstly/we/security/handler/FormAuthenticationSuccessHandler.java

@@ -3,9 +3,9 @@ package de.bstly.we.security.handler;
 import java.io.IOException;
 import java.util.List;
 
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.security.core.Authentication;
 import org.springframework.security.web.authentication.RememberMeServices;
@@ -66,7 +66,7 @@ public class FormAuthenticationSuccessHandler extends SavedRequestAwareAuthentic
 	/*
 	 * @see org.springframework.security.web.authentication.
 	 * SavedRequestAwareAuthenticationSuccessHandler#onAuthenticationSuccess(javax.
-	 * servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse,
+	 * servlet.http.HttpServletRequest, jakarta.servlet.http.HttpServletResponse,
 	 * org.springframework.security.core.Authentication)
 	 */
 	@Override

core/src/main/java/de/bstly/we/security/handler/RestAuthenticationFailureHandler.java

@@ -2,9 +2,9 @@ package de.bstly.we.security.handler;
 
 import java.io.IOException;
 
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.security.core.AuthenticationException;
@@ -20,8 +20,8 @@ public class RestAuthenticationFailureHandler implements AuthenticationFailureHa
 	/*
 	 * @see
 	 * org.springframework.security.web.authentication.AuthenticationFailureHandler#
-	 * onAuthenticationFailure(javax.servlet.http.HttpServletRequest,
+	 * onAuthenticationFailure(jakarta.servlet.http.HttpServletRequest,
-	 * javax.servlet.http.HttpServletResponse,
+	 * jakarta.servlet.http.HttpServletResponse,
 	 * org.springframework.security.core.AuthenticationException)
 	 */
 	@Override

core/src/main/java/de/bstly/we/security/handler/RestAuthenticationSuccessHandler.java

@@ -2,9 +2,9 @@ package de.bstly.we.security.handler;
 
 import java.io.IOException;
 
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.security.core.Authentication;
@@ -31,8 +31,8 @@ public class RestAuthenticationSuccessHandler extends FormAuthenticationSuccessH
 
 	/*
 	 * @see de.bstly.we.security.handler.FormAuthenticationSuccessHandler#
-	 * onAuthenticationSuccess(javax.servlet.http.HttpServletRequest,
+	 * onAuthenticationSuccess(jakarta.servlet.http.HttpServletRequest,
-	 * javax.servlet.http.HttpServletResponse,
+	 * jakarta.servlet.http.HttpServletResponse,
 	 * org.springframework.security.core.Authentication)
 	 */
 	@Override

i18n/pom.xml

@@ -17,5 +17,13 @@
 			<artifactId>webstly-core</artifactId>
 			<version>${revision}</version>
 		</dependency>	
+		
+		<!-- Query DSL -->
+		<dependency>
+			<groupId>com.querydsl</groupId>
+			<artifactId>querydsl-apt</artifactId>
+			<version>${querydsl.version}</version>
+			<classifier>jakarta</classifier>
+		</dependency>
 	</dependencies>
 </project>

i18n/src/main/java/de/bstly/we/i18n/controller/I18nController.java

@@ -6,7 +6,7 @@ package de.bstly.we.i18n.controller;
 import java.io.IOException;
 import java.util.List;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;

i18n/src/main/java/de/bstly/we/i18n/model/I18n.java

@@ -3,12 +3,12 @@
  */
 package de.bstly.we.i18n.model;
 
-import javax.persistence.Column;
+import jakarta.persistence.Column;
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
-import javax.persistence.Id;
+import jakarta.persistence.Id;
-import javax.persistence.Lob;
+import jakarta.persistence.Lob;
-import javax.persistence.Table;
+import jakarta.persistence.Table;
-import javax.persistence.UniqueConstraint;
+import jakarta.persistence.UniqueConstraint;
 
 /**
  * The Class I18n.

invite/pom.xml

@@ -17,5 +17,13 @@
 			<artifactId>webstly-core</artifactId>
 			<version>${revision}</version>
 		</dependency>	
+		
+		<!-- Query DSL -->
+		<dependency>
+			<groupId>com.querydsl</groupId>
+			<artifactId>querydsl-apt</artifactId>
+			<version>${querydsl.version}</version>
+			<classifier>jakarta</classifier>
+		</dependency>
 	</dependencies>
 </project>

invite/src/main/java/de/bstly/we/invite/model/Invite.java

@@ -5,13 +5,13 @@ package de.bstly.we.invite.model;
 
 import java.time.Instant;
 
-import javax.persistence.Column;
+import jakarta.persistence.Column;
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
-import javax.persistence.GeneratedValue;
+import jakarta.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
+import jakarta.persistence.GenerationType;
-import javax.persistence.Id;
+import jakarta.persistence.Id;
-import javax.persistence.Lob;
+import jakarta.persistence.Lob;
-import javax.persistence.Table;
+import jakarta.persistence.Table;
 
 import de.bstly.we.model.UserData;
 

invite/src/main/java/de/bstly/we/invite/model/InviteMapping.java

@@ -5,10 +5,10 @@ package de.bstly.we.invite.model;
 
 import java.time.Instant;
 
-import javax.persistence.Column;
+import jakarta.persistence.Column;
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
-import javax.persistence.Id;
+import jakarta.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Table;
 
 /**
  * The Class InviteMapping.

jitsi/pom.xml

@@ -26,7 +26,15 @@
 		<dependency>
 			<groupId>com.nimbusds</groupId>
 			<artifactId>nimbus-jose-jwt</artifactId>
-			<version>9.21</version>
+			<version>${nimbus.version}</version>
+		</dependency>	
+		
+		<!-- Query DSL -->
+		<dependency>
+			<groupId>com.querydsl</groupId>
+			<artifactId>querydsl-apt</artifactId>
+			<version>${querydsl.version}</version>
+			<classifier>jakarta</classifier>
 		</dependency>
 	</dependencies>
 </project>

jitsi/src/main/java/de/bstly/we/jitsi/model/JitsiRoom.java

@@ -5,13 +5,13 @@ package de.bstly.we.jitsi.model;
 
 import java.time.Instant;
 
-import javax.persistence.Column;
+import jakarta.persistence.Column;
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
-import javax.persistence.GeneratedValue;
+import jakarta.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
+import jakarta.persistence.GenerationType;
-import javax.persistence.Id;
+import jakarta.persistence.Id;
-import javax.persistence.Lob;
+import jakarta.persistence.Lob;
-import javax.persistence.Table;
+import jakarta.persistence.Table;
 
 import org.springframework.data.annotation.Reference;
 

jukebox/src/main/java/de/bstly/we/jukebox/controller/JukeboxController.java

@@ -10,7 +10,7 @@ import java.time.temporal.ChronoUnit;
 import java.util.Map;
 import java.util.Optional;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;

jukebox/src/main/java/de/bstly/we/jukebox/controller/JukeboxManagementController.java

@@ -6,7 +6,7 @@ package de.bstly.we.jukebox.controller;
 import java.io.IOException;
 import java.util.Optional;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;

jwt/pom.xml

@@ -21,7 +21,16 @@
 		<dependency>
 			<groupId>com.nimbusds</groupId>
 			<artifactId>nimbus-jose-jwt</artifactId>
-			<version>9.21</version>
+			<version>${nimbus.version}</version>
+		</dependency>
+
+		<!-- Query DSL -->
+		<dependency>
+			<groupId>com.querydsl</groupId>
+			<artifactId>querydsl-apt</artifactId>
+			<version>${querydsl.version}</version>
+			<classifier>jakarta</classifier>
+			<scope>provided</scope>
 		</dependency>
 	</dependencies>
 </project>

jwt/src/main/java/de/bstly/we/jwt/businesslogic/JwtKeyManager.java

@@ -9,7 +9,7 @@ import java.time.temporal.ChronoUnit;
 import java.util.List;
 import java.util.UUID;
 
-import javax.transaction.Transactional;
+import jakarta.transaction.Transactional;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageRequest;

jwt/src/main/java/de/bstly/we/jwt/controller/JwtUserDataController.java

@@ -5,8 +5,8 @@ package de.bstly.we.jwt.controller;
 
 import java.text.ParseException;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;

jwt/src/main/java/de/bstly/we/jwt/model/JwtKey.java

@@ -5,13 +5,13 @@ package de.bstly.we.jwt.model;
 
 import java.time.Instant;
 
-import javax.persistence.Column;
+import jakarta.persistence.Column;
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
-import javax.persistence.GeneratedValue;
+import jakarta.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
+import jakarta.persistence.GenerationType;
-import javax.persistence.Id;
+import jakarta.persistence.Id;
-import javax.persistence.Lob;
+import jakarta.persistence.Lob;
-import javax.persistence.Table;
+import jakarta.persistence.Table;
 
 import com.nimbusds.jose.JWSAlgorithm;
 import com.nimbusds.jose.jwk.Curve;
@@ -33,8 +33,7 @@ public class JwtKey {
 	private String name;
 	@Column(name = "key_id", nullable = true)
 	private String keyID;
-	@Lob
+	@Column(name = "data", nullable = true, columnDefinition="LONGTEXT")
-	@Column(name = "data", nullable = true)
 	private String data;
 	@Column(name = "key_type", nullable = false)
 	private String keyType = KeyType.EC.getValue();

membership/src/main/java/de/bstly/we/membership/controller/MembershipController.java

@@ -7,7 +7,7 @@ import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.Optional;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;

minetest/src/main/java/de/bstly/we/minetest/model/MinetestAccount.java

@@ -3,11 +3,11 @@
  */
 package de.bstly.we.minetest.model;
 
-import javax.persistence.Column;
+import jakarta.persistence.Column;
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
-import javax.persistence.Id;
+import jakarta.persistence.Id;
-import javax.persistence.Lob;
+import jakarta.persistence.Lob;
-import javax.persistence.Table;
+import jakarta.persistence.Table;
 
 import de.bstly.we.model.UserData;
 

oidc/pom.xml

@@ -17,5 +17,13 @@
 			<artifactId>webstly-jwt</artifactId>
 			<version>${revision}</version>
 		</dependency>
+		
+		<!-- Query DSL -->
+		<dependency>
+			<groupId>com.querydsl</groupId>
+			<artifactId>querydsl-apt</artifactId>
+			<version>${querydsl.version}</version>
+			<classifier>jakarta</classifier>
+		</dependency>
 	</dependencies>
 </project>

oidc/src/main/java/de/bstly/we/oidc/businesslogic/OidcClientManager.java

@@ -5,7 +5,7 @@ package de.bstly.we.oidc.businesslogic;
 
 import java.util.Set;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.apache.commons.lang3.RandomStringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

oidc/src/main/java/de/bstly/we/oidc/businesslogic/OidcSessionManager.java

@@ -14,6 +14,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.HttpStatusCode;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
@@ -364,7 +365,7 @@ public class OidcSessionManager {
 		try {
 			response = webClient.method(HttpMethod.POST).uri(client.getBackchannelLogoutUri())
 					.contentType(MediaType.APPLICATION_FORM_URLENCODED).body(BodyInserters.fromFormData(formData))
-					.retrieve().onStatus(HttpStatus::isError, error -> Mono.empty()).toBodilessEntity().block();
+					.retrieve().onStatus(HttpStatusCode::isError, error -> Mono.empty()).toBodilessEntity().block();
 		} catch (Exception e) {
 			logger.warn("backchannelLogout POST '" + client.getBackchannelLogoutUri() + "' failed", e);
 		}

oidc/src/main/java/de/bstly/we/oidc/controller/OidcAuthorizationController.java

@@ -8,8 +8,8 @@ import java.net.URI;
 import java.util.List;
 import java.util.Set;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

oidc/src/main/java/de/bstly/we/oidc/controller/OidcDiscoveryController.java

@@ -6,8 +6,8 @@ package de.bstly.we.oidc.controller;
 import java.net.URI;
 import java.net.URISyntaxException;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;

oidc/src/main/java/de/bstly/we/oidc/controller/OidcSessionController.java

@@ -8,8 +8,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;

oidc/src/main/java/de/bstly/we/oidc/controller/OidcTokenController.java

@@ -9,9 +9,9 @@ import java.time.Instant;
 import java.util.Base64;
 import java.util.Set;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.transaction.Transactional;
+import jakarta.transaction.Transactional;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

oidc/src/main/java/de/bstly/we/oidc/model/OidcAuthorization.java

@@ -5,14 +5,14 @@ package de.bstly.we.oidc.model;
 
 import java.util.Set;
 
-import javax.persistence.CollectionTable;
+import jakarta.persistence.CollectionTable;
-import javax.persistence.Column;
+import jakarta.persistence.Column;
-import javax.persistence.ElementCollection;
+import jakarta.persistence.ElementCollection;
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
-import javax.persistence.GeneratedValue;
+import jakarta.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
+import jakarta.persistence.GenerationType;
-import javax.persistence.Id;
+import jakarta.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Table;
 
 import org.hibernate.annotations.LazyCollection;
 import org.hibernate.annotations.LazyCollectionOption;

oidc/src/main/java/de/bstly/we/oidc/model/OidcClient.java

@@ -5,16 +5,16 @@ package de.bstly.we.oidc.model;
 
 import java.util.Set;
 
-import javax.persistence.CollectionTable;
+import jakarta.persistence.CollectionTable;
-import javax.persistence.Column;
+import jakarta.persistence.Column;
-import javax.persistence.ElementCollection;
+import jakarta.persistence.ElementCollection;
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
-import javax.persistence.EnumType;
+import jakarta.persistence.EnumType;
-import javax.persistence.Enumerated;
+import jakarta.persistence.Enumerated;
-import javax.persistence.GeneratedValue;
+import jakarta.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
+import jakarta.persistence.GenerationType;
-import javax.persistence.Id;
+import jakarta.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Table;
 
 import org.hibernate.annotations.LazyCollection;
 import org.hibernate.annotations.LazyCollectionOption;

oidc/src/main/java/de/bstly/we/oidc/model/OidcSession.java

@@ -3,12 +3,12 @@
  */
 package de.bstly.we.oidc.model;
 
-import javax.persistence.Column;
+import jakarta.persistence.Column;
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
-import javax.persistence.GeneratedValue;
+import jakarta.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
+import jakarta.persistence.GenerationType;
-import javax.persistence.Id;
+import jakarta.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Table;
 
 /**
  * The Class OidcSession.

oidc/src/main/java/de/bstly/we/oidc/model/OidcToken.java

@@ -6,13 +6,13 @@ package de.bstly.we.oidc.model;
 import java.time.Instant;
 import java.util.Set;
 
-import javax.persistence.Column;
+import jakarta.persistence.Column;
-import javax.persistence.ElementCollection;
+import jakarta.persistence.ElementCollection;
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
-import javax.persistence.GeneratedValue;
+import jakarta.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
+import jakarta.persistence.GenerationType;
-import javax.persistence.Id;
+import jakarta.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Table;
 
 import org.hibernate.annotations.LazyCollection;
 import org.hibernate.annotations.LazyCollectionOption;

partey/pom.xml

@@ -27,5 +27,13 @@
 			<artifactId>webstly-i18n</artifactId>
 			<version>${revision}</version>
 		</dependency>
+		
+		<!-- Query DSL -->
+		<dependency>
+			<groupId>com.querydsl</groupId>
+			<artifactId>querydsl-apt</artifactId>
+			<version>${querydsl.version}</version>
+			<classifier>jakarta</classifier>
+		</dependency>
 	</dependencies>
 </project>

partey/src/main/java/de/bstly/we/partey/api/controller/DebugController.java

@@ -5,8 +5,8 @@ package de.bstly.we.partey.api.controller;
 
 import java.util.Optional;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;

partey/src/main/java/de/bstly/we/partey/api/controller/MapController.java

@@ -5,8 +5,8 @@ package de.bstly.we.partey.api.controller;
 
 import java.util.Optional;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;

partey/src/main/java/de/bstly/we/partey/api/controller/ReportController.java

@@ -3,7 +3,7 @@
  */
 package de.bstly.we.partey.api.controller;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;

partey/src/main/java/de/bstly/we/partey/api/controller/RoomController.java

@@ -6,7 +6,7 @@ package de.bstly.we.partey.api.controller;
 import java.util.List;
 import java.util.Optional;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;

partey/src/main/java/de/bstly/we/partey/api/controller/WokaController.java

@@ -6,7 +6,7 @@ package de.bstly.we.partey.api.controller;
 import java.util.Map;
 import java.util.Optional;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;

partey/src/main/java/de/bstly/we/partey/api/controller/support/DebugLogger.java

@@ -6,7 +6,7 @@ package de.bstly.we.partey.api.controller.support;
 import java.util.Iterator;
 import java.util.Optional;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

partey/src/main/java/de/bstly/we/partey/api/security/ParteyApiAuthentication.java

@@ -3,7 +3,7 @@
  */
 package de.bstly.we.partey.api.security;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;

partey/src/main/java/de/bstly/we/partey/businesslogic/ParteyMapManager.java

@@ -8,7 +8,7 @@ import java.net.URISyntaxException;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;

partey/src/main/java/de/bstly/we/partey/model/ParteyMap.java

@@ -5,13 +5,13 @@ package de.bstly.we.partey.model;
 
 import java.util.List;
 
-import javax.persistence.CollectionTable;
+import jakarta.persistence.CollectionTable;
-import javax.persistence.ElementCollection;
+import jakarta.persistence.ElementCollection;
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
-import javax.persistence.EnumType;
+import jakarta.persistence.EnumType;
-import javax.persistence.Enumerated;
+import jakarta.persistence.Enumerated;
-import javax.persistence.Id;
+import jakarta.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Table;
 
 import org.hibernate.annotations.LazyCollection;
 import org.hibernate.annotations.LazyCollectionOption;

partey/src/main/java/de/bstly/we/partey/model/ParteyUserReport.java

@@ -5,12 +5,12 @@ package de.bstly.we.partey.model;
 
 import java.time.Instant;
 
-import javax.persistence.Column;
+import jakarta.persistence.Column;
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
-import javax.persistence.GeneratedValue;
+import jakarta.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
+import jakarta.persistence.GenerationType;
-import javax.persistence.Id;
+import jakarta.persistence.Id;
-import javax.persistence.Lob;
+import jakarta.persistence.Lob;
 
 /**
  * The Class ParteyUserReport.

partey/src/main/java/de/bstly/we/partey/model/ParteyUserReportModerator.java

@@ -3,11 +3,11 @@
  */
 package de.bstly.we.partey.model;
 
-import javax.persistence.Column;
+import jakarta.persistence.Column;
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
-import javax.persistence.GeneratedValue;
+import jakarta.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
+import jakarta.persistence.GenerationType;
-import javax.persistence.Id;
+import jakarta.persistence.Id;
 
 /**
  * The Class ParteyUserReportModerator.

partey/src/main/java/de/bstly/we/partey/model/ParteyUserTag.java

@@ -6,11 +6,11 @@ package de.bstly.we.partey.model;
 import java.io.Serializable;
 import java.time.Instant;
 
-import javax.persistence.Column;
+import jakarta.persistence.Column;
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
-import javax.persistence.Id;
+import jakarta.persistence.Id;
-import javax.persistence.IdClass;
+import jakarta.persistence.IdClass;
-import javax.persistence.Table;
+import jakarta.persistence.Table;
 
 import de.bstly.we.model.UserData;
 import de.bstly.we.partey.model.ParteyUserTag.ParteyUserTagId;

partey/src/main/java/de/bstly/we/partey/model/ParteyUserTextures.java

@@ -5,12 +5,12 @@ package de.bstly.we.partey.model;
 
 import java.util.List;
 
-import javax.persistence.CollectionTable;
+import jakarta.persistence.CollectionTable;
-import javax.persistence.Column;
+import jakarta.persistence.Column;
-import javax.persistence.ElementCollection;
+import jakarta.persistence.ElementCollection;
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
-import javax.persistence.Id;
+import jakarta.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Table;
 
 import org.hibernate.annotations.LazyCollection;
 import org.hibernate.annotations.LazyCollectionOption;

partey/src/main/java/de/bstly/we/partey/timeslot/model/Timeslot.java

@@ -5,16 +5,16 @@ package de.bstly.we.partey.timeslot.model;
 
 import java.time.Instant;
 
-import javax.persistence.Column;
+import jakarta.persistence.Column;
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
-import javax.persistence.EnumType;
+import jakarta.persistence.EnumType;
-import javax.persistence.Enumerated;
+import jakarta.persistence.Enumerated;
-import javax.persistence.GeneratedValue;
+import jakarta.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
+import jakarta.persistence.GenerationType;
-import javax.persistence.Id;
+import jakarta.persistence.Id;
-import javax.persistence.Lob;
+import jakarta.persistence.Lob;
-import javax.persistence.Table;
+import jakarta.persistence.Table;
-import javax.persistence.Transient;
+import jakarta.persistence.Transient;
 
 import de.bstly.we.model.UserData;
 import de.bstly.we.model.Visibility;

pom.xml

@@ -11,15 +11,17 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<java.version>11</java.version>
+		<java.version>17</java.version>
-		<log4j2.version>2.20.0</log4j2.version>
+		<querydsl.version>5.0.0</querydsl.version>
-		<revision>2.0.6-SNAPSHOT</revision>
+		<nimbus.version>9.37.1</nimbus.version>
+		<hibernate.version>6.4.0.Final</hibernate.version>
+		<revision>3.0.0-SNAPSHOT</revision>
 	</properties>
 
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.7.9</version>
+		<version>3.2.0</version>
 		<relativePath />
 	</parent>
 
@@ -41,25 +43,4 @@
 		<module>urlshortener</module>
 		<module>wireguard</module>
 	</modules>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>com.mysema.maven</groupId>
-				<artifactId>apt-maven-plugin</artifactId>
-				<version>1.1.3</version>
-				<executions>
-					<execution>
-						<goals>
-							<goal>process</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>target/generated-sources/java</outputDirectory>
-							<processor>com.querydsl.apt.jpa.JPAAnnotationProcessor</processor>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
 </project>

services/pom.xml

@@ -22,5 +22,13 @@
 			<artifactId>webstly-oidc</artifactId>
 			<version>${revision}</version>
 		</dependency>
+		
+		<!-- Query DSL -->
+		<dependency>
+			<groupId>com.querydsl</groupId>
+			<artifactId>querydsl-apt</artifactId>
+			<version>${querydsl.version}</version>
+			<classifier>jakarta</classifier>
+		</dependency>
 	</dependencies>
 </project>

services/src/main/java/de/bstly/we/services/model/Service.java

@@ -3,11 +3,11 @@
  */
 package de.bstly.we.services.model;
 
-import javax.persistence.Column;
+import jakarta.persistence.Column;
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
-import javax.persistence.Id;
+import jakarta.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Table;
-import javax.persistence.UniqueConstraint;
+import jakarta.persistence.UniqueConstraint;
 
 /**
  * The Class Service.

urlshortener/pom.xml

@@ -17,5 +17,13 @@
 			<artifactId>webstly-core</artifactId>
 			<version>${revision}</version>
 		</dependency>
+		
+		<!-- Query DSL -->
+		<dependency>
+			<groupId>com.querydsl</groupId>
+			<artifactId>querydsl-apt</artifactId>
+			<version>${querydsl.version}</version>
+			<classifier>jakarta</classifier>
+		</dependency>
 	</dependencies>
 </project>

urlshortener/src/main/java/de/bstly/we/urlshortener/controller/ShortenedUrlController.java

@@ -8,8 +8,8 @@ import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.Optional;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;

urlshortener/src/main/java/de/bstly/we/urlshortener/model/ShortenedUrl.java

@@ -5,13 +5,13 @@ package de.bstly.we.urlshortener.model;
 
 import java.time.Instant;
 
-import javax.persistence.Column;
+import jakarta.persistence.Column;
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
-import javax.persistence.EntityListeners;
+import jakarta.persistence.EntityListeners;
-import javax.persistence.Id;
+import jakarta.persistence.Id;
-import javax.persistence.Lob;
+import jakarta.persistence.Lob;
-import javax.persistence.Table;
+import jakarta.persistence.Table;
-import javax.persistence.Transient;
+import jakarta.persistence.Transient;
 
 import org.springframework.util.StringUtils;
 

wireguard/pom.xml

@@ -17,5 +17,13 @@
 			<artifactId>webstly-core</artifactId>
 			<version>${revision}</version>
 		</dependency>
+		
+		<!-- Query DSL -->
+		<dependency>
+			<groupId>com.querydsl</groupId>
+			<artifactId>querydsl-apt</artifactId>
+			<version>${querydsl.version}</version>
+			<classifier>jakarta</classifier>
+		</dependency>
 	</dependencies>
 </project>