From c534b8d6cf303e60adafda09e637a1622c349e53 Mon Sep 17 00:00:00 2001
From: tobias <thinkdifferent055@gmail.com>
Date: Sat, 25 Feb 2023 17:28:03 +0100
Subject: [PATCH] #728 - Update to spring boot 3.0.3
---
BudgetMasterServer/pom.xml | 8 +++++++-
.../de/deadlocker8/budgetmaster/accounts/Account.java | 6 +++---
.../budgetmaster/accounts/AccountController.java | 2 +-
.../budgetmaster/authentication/LoginController.java | 2 +-
.../deadlocker8/budgetmaster/authentication/User.java | 6 +++---
.../budgetmaster/authentication/WebSecurityConfig.java | 8 ++++----
.../deadlocker8/budgetmaster/categories/Category.java | 6 +++---
.../budgetmaster/categories/CategoryController.java | 2 +-
.../java/de/deadlocker8/budgetmaster/charts/Chart.java | 10 +++++-----
.../budgetmaster/charts/ChartController.java | 2 +-
.../budgetmaster/controller/AboutController.java | 2 +-
.../budgetmaster/controller/BackupController.java | 2 +-
.../budgetmaster/controller/DatePickerController.java | 4 ++--
.../budgetmaster/controller/IndexController.java | 2 +-
.../budgetmaster/filter/FilterHelpersService.java | 2 +-
.../java/de/deadlocker8/budgetmaster/hints/Hint.java | 8 ++++----
.../java/de/deadlocker8/budgetmaster/icon/Icon.java | 2 +-
.../java/de/deadlocker8/budgetmaster/images/Image.java | 4 ++--
.../budgetmaster/repeating/RepeatingOption.java | 2 +-
.../budgetmaster/repeating/endoption/RepeatingEnd.java | 2 +-
.../repeating/endoption/RepeatingEndAfterXTimes.java | 4 ++--
.../repeating/endoption/RepeatingEndDate.java | 4 ++--
.../repeating/endoption/RepeatingEndNever.java | 4 ++--
.../repeating/modifier/RepeatingModifier.java | 2 +-
.../repeating/modifier/RepeatingModifierDays.java | 2 +-
.../repeating/modifier/RepeatingModifierMonths.java | 2 +-
.../repeating/modifier/RepeatingModifierYears.java | 2 +-
.../budgetmaster/reports/ReportController.java | 6 +++---
.../budgetmaster/reports/columns/ReportColumn.java | 2 +-
.../budgetmaster/reports/settings/ReportSettings.java | 8 ++++----
.../budgetmaster/services/ErrorCodeController.java | 4 ++--
.../de/deadlocker8/budgetmaster/settings/Settings.java | 4 ++--
.../budgetmaster/settings/SettingsController.java | 4 ++--
.../budgetmaster/settings/SettingsService.java | 2 +-
.../java/de/deadlocker8/budgetmaster/tags/Tag.java | 6 +++---
.../budgetmaster/templategroup/TemplateGroup.java | 2 +-
.../templategroup/TemplateGroupController.java | 2 +-
.../deadlocker8/budgetmaster/templates/Template.java | 2 +-
.../budgetmaster/templates/TemplateController.java | 2 +-
.../budgetmaster/transactions/Transaction.java | 2 +-
.../transactions/TransactionController.java | 2 +-
.../transactions/TransactionSearchSpecifications.java | 2 +-
.../transactions/TransactionSpecifications.java | 8 ++++----
.../transactions/csvimport/CsvImportSettings.java | 4 ++--
.../csvimport/CsvImportSettingsService.java | 2 +-
.../transactions/keywords/TransactionNameKeyword.java | 8 ++++----
.../keywords/TransactionNameKeywordController.java | 2 +-
.../update/BudgetMasterUpdateConfiguration.java | 2 +-
.../utils/DatabaseConfigurationProperties.java | 6 +++---
.../utils/notification/NotificationLinkBuilder.java | 2 +-
.../budgetmaster/unit/NotificationLinkBuilderTest.java | 2 +-
.../budgetmaster/unit/database/ImportServiceTest.java | 2 +-
.../unit/database/importer/ImporterTestBase.java | 2 +-
pom.xml | 4 ++--
54 files changed, 101 insertions(+), 95 deletions(-)
diff --git a/BudgetMasterServer/pom.xml b/BudgetMasterServer/pom.xml
index 5daef2477..476810500 100644
--- a/BudgetMasterServer/pom.xml
+++ b/BudgetMasterServer/pom.xml
@@ -41,6 +41,7 @@
<jacoco-maven-plugin.version>0.8.8</jacoco-maven-plugin.version>
<opencsv.version>5.7.1</opencsv.version>
<datatables.version>1.13.1</datatables.version>
+ <jakarta.xml.bind-api.version>4.0.0</jakarta.xml.bind-api.version>
<project.outputDirectory>${project.build.directory}/../build/${project.version}</project.outputDirectory>
<project.artifactName>${project.artifactId}-v${project.version}</project.artifactName>
@@ -68,10 +69,15 @@
</dependency>
<dependency>
- <groupId>org.hibernate</groupId>
+ <groupId>org.hibernate.orm</groupId>
<artifactId>hibernate-jpamodelgen</artifactId>
<optional>true</optional>
</dependency>
+ <dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>${jakarta.xml.bind-api.version}</version>
+ </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/accounts/Account.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/accounts/Account.java
index df60b22c6..933d446ab 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/accounts/Account.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/accounts/Account.java
@@ -6,9 +6,9 @@ import de.deadlocker8.budgetmaster.icon.Iconizable;
import de.deadlocker8.budgetmaster.transactions.Transaction;
import de.deadlocker8.budgetmaster.utils.ProvidesID;
-import javax.persistence.*;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.persistence.*;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
import java.util.List;
import java.util.Objects;
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/accounts/AccountController.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/accounts/AccountController.java
index fd6f2a40b..ad7e06092 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/accounts/AccountController.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/accounts/AccountController.java
@@ -18,7 +18,7 @@ import org.springframework.validation.FieldError;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.context.request.WebRequest;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import java.text.MessageFormat;
import java.util.List;
import java.util.Optional;
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/authentication/LoginController.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/authentication/LoginController.java
index 073c2b3c0..c99d800b0 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/authentication/LoginController.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/authentication/LoginController.java
@@ -9,7 +9,7 @@ import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import java.util.Map;
@Controller
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/authentication/User.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/authentication/User.java
index d03f7f45d..d1b073790 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/authentication/User.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/authentication/User.java
@@ -2,9 +2,9 @@ package de.deadlocker8.budgetmaster.authentication;
import de.deadlocker8.budgetmaster.accounts.Account;
-import javax.persistence.*;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.persistence.*;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
@Entity
@Table(name = "login_user")
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/authentication/WebSecurityConfig.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/authentication/WebSecurityConfig.java
index c1a7f158c..8e189f734 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/authentication/WebSecurityConfig.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/authentication/WebSecurityConfig.java
@@ -28,10 +28,10 @@ public class WebSecurityConfig
.csrf()
.and()
- .authorizeRequests()
- .antMatchers("/css/**", "/js/**", "/images/**", "/webjars/**", "/favicon.ico", "/touch_icon.png").permitAll()
- .antMatchers("/login").permitAll()
- .antMatchers("/**").authenticated()
+ .authorizeHttpRequests()
+ .requestMatchers("/css/**", "/js/**", "/images/**", "/webjars/**", "/favicon.ico", "/touch_icon.png").permitAll()
+ .requestMatchers("/login").permitAll()
+ .requestMatchers("/**").authenticated()
.and()
.formLogin()
.loginPage("/login")
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/categories/Category.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/categories/Category.java
index 7f2b26dc4..dd2913d28 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/categories/Category.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/categories/Category.java
@@ -8,9 +8,9 @@ import de.deadlocker8.budgetmaster.utils.ProvidesID;
import de.thecodelabs.utils.util.Color;
import de.thecodelabs.utils.util.ColorUtilsNonJavaFX;
-import javax.persistence.*;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.persistence.*;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
import java.util.List;
import java.util.Objects;
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/categories/CategoryController.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/categories/CategoryController.java
index ef1603db0..d83e123cb 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/categories/CategoryController.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/categories/CategoryController.java
@@ -16,7 +16,7 @@ import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.context.request.WebRequest;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import java.util.List;
import java.util.Optional;
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/charts/Chart.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/charts/Chart.java
index 57b803f74..a5c64fe6a 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/charts/Chart.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/charts/Chart.java
@@ -3,11 +3,11 @@ package de.deadlocker8.budgetmaster.charts;
import com.google.gson.annotations.Expose;
import de.deadlocker8.budgetmaster.utils.ProvidesID;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
import java.util.Objects;
@Entity
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/charts/ChartController.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/charts/ChartController.java
index f13b83849..39f255d57 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/charts/ChartController.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/charts/ChartController.java
@@ -26,7 +26,7 @@ import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.context.request.WebRequest;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import java.text.MessageFormat;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/controller/AboutController.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/controller/AboutController.java
index ab05e6ee2..6106f76ca 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/controller/AboutController.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/controller/AboutController.java
@@ -9,7 +9,7 @@ import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.List;
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/controller/BackupController.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/controller/BackupController.java
index bfcac7f01..22c03e87a 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/controller/BackupController.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/controller/BackupController.java
@@ -7,7 +7,7 @@ import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
@Controller
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/controller/DatePickerController.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/controller/DatePickerController.java
index 8af33f30f..16b58cd68 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/controller/DatePickerController.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/controller/DatePickerController.java
@@ -10,8 +10,8 @@ import org.springframework.web.bind.annotation.CookieValue;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestParam;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletResponse;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/controller/IndexController.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/controller/IndexController.java
index f8a1de0b8..820ee3e42 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/controller/IndexController.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/controller/IndexController.java
@@ -30,7 +30,7 @@ public class IndexController extends BaseController
this.statisticsService = statisticsService;
}
- @GetMapping
+ @GetMapping("/")
public String index()
{
return ReturnValues.INDEX;
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/filter/FilterHelpersService.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/filter/FilterHelpersService.java
index 398f808fa..93ddf9a88 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/filter/FilterHelpersService.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/filter/FilterHelpersService.java
@@ -8,7 +8,7 @@ import de.thecodelabs.utils.util.Localization;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.List;
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/hints/Hint.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/hints/Hint.java
index e3226b51d..d02b0ccd7 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/hints/Hint.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/hints/Hint.java
@@ -1,9 +1,9 @@
package de.deadlocker8.budgetmaster.hints;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
@Entity
public class Hint
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/icon/Icon.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/icon/Icon.java
index fb9735005..0bfd88e8e 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/icon/Icon.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/icon/Icon.java
@@ -7,7 +7,7 @@ import de.deadlocker8.budgetmaster.images.Image;
import de.deadlocker8.budgetmaster.templates.Template;
import de.deadlocker8.budgetmaster.utils.ProvidesID;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.util.Objects;
@Entity
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/images/Image.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/images/Image.java
index 7a16fbfd6..f5ca960f1 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/images/Image.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/images/Image.java
@@ -6,8 +6,8 @@ import de.deadlocker8.budgetmaster.utils.ProvidesID;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.tomcat.util.codec.binary.Base64;
-import javax.persistence.*;
-import javax.validation.constraints.NotNull;
+import jakarta.persistence.*;
+import jakarta.validation.constraints.NotNull;
import java.text.MessageFormat;
import java.util.List;
import java.util.Objects;
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/repeating/RepeatingOption.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/repeating/RepeatingOption.java
index de2d39aac..2b3c402f0 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/repeating/RepeatingOption.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/repeating/RepeatingOption.java
@@ -9,7 +9,7 @@ import de.deadlocker8.budgetmaster.repeating.modifier.RepeatingModifier;
import de.deadlocker8.budgetmaster.transactions.Transaction;
import org.springframework.format.annotation.DateTimeFormat;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.time.LocalDate;
import java.util.ArrayList;
import java.util.Comparator;
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/repeating/endoption/RepeatingEnd.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/repeating/endoption/RepeatingEnd.java
index fbbb74c74..c417390b6 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/repeating/endoption/RepeatingEnd.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/repeating/endoption/RepeatingEnd.java
@@ -2,7 +2,7 @@ package de.deadlocker8.budgetmaster.repeating.endoption;
import com.google.gson.annotations.Expose;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.time.LocalDate;
import java.util.List;
import java.util.Objects;
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/repeating/endoption/RepeatingEndAfterXTimes.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/repeating/endoption/RepeatingEndAfterXTimes.java
index c0299bdf8..7034a4d24 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/repeating/endoption/RepeatingEndAfterXTimes.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/repeating/endoption/RepeatingEndAfterXTimes.java
@@ -2,8 +2,8 @@ package de.deadlocker8.budgetmaster.repeating.endoption;
import com.google.gson.annotations.Expose;
-import javax.persistence.Entity;
-import javax.persistence.Transient;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Transient;
import java.time.LocalDate;
import java.util.List;
import java.util.Objects;
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/repeating/endoption/RepeatingEndDate.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/repeating/endoption/RepeatingEndDate.java
index 9d606e08c..514dee5f5 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/repeating/endoption/RepeatingEndDate.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/repeating/endoption/RepeatingEndDate.java
@@ -3,8 +3,8 @@ package de.deadlocker8.budgetmaster.repeating.endoption;
import com.google.gson.annotations.Expose;
import org.springframework.format.annotation.DateTimeFormat;
-import javax.persistence.Entity;
-import javax.persistence.Transient;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Transient;
import java.time.LocalDate;
import java.util.List;
import java.util.Objects;
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/repeating/endoption/RepeatingEndNever.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/repeating/endoption/RepeatingEndNever.java
index f3ce9f36b..2d196f1b3 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/repeating/endoption/RepeatingEndNever.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/repeating/endoption/RepeatingEndNever.java
@@ -1,7 +1,7 @@
package de.deadlocker8.budgetmaster.repeating.endoption;
-import javax.persistence.Entity;
-import javax.persistence.Transient;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Transient;
import java.time.LocalDate;
import java.util.List;
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/repeating/modifier/RepeatingModifier.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/repeating/modifier/RepeatingModifier.java
index 00c79caec..ad2b21fb3 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/repeating/modifier/RepeatingModifier.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/repeating/modifier/RepeatingModifier.java
@@ -2,7 +2,7 @@ package de.deadlocker8.budgetmaster.repeating.modifier;
import com.google.gson.annotations.Expose;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.time.LocalDate;
import java.util.Objects;
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/repeating/modifier/RepeatingModifierDays.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/repeating/modifier/RepeatingModifierDays.java
index 41f7d9d61..73041ce23 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/repeating/modifier/RepeatingModifierDays.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/repeating/modifier/RepeatingModifierDays.java
@@ -1,6 +1,6 @@
package de.deadlocker8.budgetmaster.repeating.modifier;
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
import java.time.LocalDate;
@Entity
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/repeating/modifier/RepeatingModifierMonths.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/repeating/modifier/RepeatingModifierMonths.java
index 90ed0b96c..6f554c322 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/repeating/modifier/RepeatingModifierMonths.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/repeating/modifier/RepeatingModifierMonths.java
@@ -1,6 +1,6 @@
package de.deadlocker8.budgetmaster.repeating.modifier;
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
import java.time.LocalDate;
@Entity
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/repeating/modifier/RepeatingModifierYears.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/repeating/modifier/RepeatingModifierYears.java
index c830b3351..06e93efb1 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/repeating/modifier/RepeatingModifierYears.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/repeating/modifier/RepeatingModifierYears.java
@@ -1,6 +1,6 @@
package de.deadlocker8.budgetmaster.repeating.modifier;
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
import java.time.LocalDate;
@Entity
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/ReportController.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/ReportController.java
index 9db8d0726..41fc2321f 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/ReportController.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/ReportController.java
@@ -21,9 +21,9 @@ import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.text.MessageFormat;
import java.time.LocalDate;
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/columns/ReportColumn.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/columns/ReportColumn.java
index 596193871..69959c753 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/columns/ReportColumn.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/columns/ReportColumn.java
@@ -2,7 +2,7 @@ package de.deadlocker8.budgetmaster.reports.columns;
import de.deadlocker8.budgetmaster.reports.settings.ReportSettings;
-import javax.persistence.*;
+import jakarta.persistence.*;
@Entity
public class ReportColumn
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/settings/ReportSettings.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/settings/ReportSettings.java
index 2688cdaf8..d7b780017 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/settings/ReportSettings.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/settings/ReportSettings.java
@@ -3,10 +3,10 @@ package de.deadlocker8.budgetmaster.reports.settings;
import de.deadlocker8.budgetmaster.reports.columns.ReportColumn;
import org.springframework.format.annotation.DateTimeFormat;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
import java.time.LocalDate;
import java.util.ArrayList;
import java.util.Comparator;
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/services/ErrorCodeController.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/services/ErrorCodeController.java
index 4de80e0ae..02f90bc88 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/services/ErrorCodeController.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/services/ErrorCodeController.java
@@ -6,8 +6,8 @@ import org.springframework.http.HttpStatus;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.http.HttpServletRequest;
@Controller
public class ErrorCodeController implements ErrorController
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/settings/Settings.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/settings/Settings.java
index 968a8c5bc..2f7c86097 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/settings/Settings.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/settings/Settings.java
@@ -6,8 +6,8 @@ import de.deadlocker8.budgetmaster.utils.DateHelper;
import de.deadlocker8.budgetmaster.utils.LanguageType;
import org.springframework.format.annotation.DateTimeFormat;
-import javax.persistence.Entity;
-import javax.persistence.Id;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
import java.time.LocalDate;
@Entity
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsController.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsController.java
index b437f40d7..2e14ae09f 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsController.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsController.java
@@ -35,8 +35,8 @@ import org.springframework.web.context.request.RequestAttributes;
import org.springframework.web.context.request.WebRequest;
import org.springframework.web.multipart.MultipartFile;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.text.MessageFormat;
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsService.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsService.java
index 52dfa1574..e06c91a83 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsService.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsService.java
@@ -10,7 +10,7 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
import java.lang.reflect.Field;
import java.util.NoSuchElementException;
import java.util.Optional;
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/tags/Tag.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/tags/Tag.java
index 6cae028c9..f66c3c763 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/tags/Tag.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/tags/Tag.java
@@ -5,9 +5,9 @@ import de.deadlocker8.budgetmaster.templates.Template;
import de.deadlocker8.budgetmaster.transactions.Transaction;
import de.deadlocker8.budgetmaster.utils.ProvidesID;
-import javax.persistence.*;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.persistence.*;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
import java.util.List;
import java.util.Objects;
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/templategroup/TemplateGroup.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/templategroup/TemplateGroup.java
index 2b058fdea..bd9c5c443 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/templategroup/TemplateGroup.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/templategroup/TemplateGroup.java
@@ -4,7 +4,7 @@ import com.google.gson.annotations.Expose;
import de.deadlocker8.budgetmaster.templates.Template;
import de.deadlocker8.budgetmaster.utils.ProvidesID;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.util.List;
import java.util.Objects;
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/templategroup/TemplateGroupController.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/templategroup/TemplateGroupController.java
index 0f4ad11cb..9d406f906 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/templategroup/TemplateGroupController.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/templategroup/TemplateGroupController.java
@@ -18,7 +18,7 @@ import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.context.request.WebRequest;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import java.util.Optional;
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/templates/Template.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/templates/Template.java
index 0726f8763..7448b1734 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/templates/Template.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/templates/Template.java
@@ -10,7 +10,7 @@ import de.deadlocker8.budgetmaster.templategroup.TemplateGroup;
import de.deadlocker8.budgetmaster.transactions.Transaction;
import de.deadlocker8.budgetmaster.transactions.TransactionBase;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateController.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateController.java
index e0d58ed22..56b617b1a 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateController.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateController.java
@@ -28,7 +28,7 @@ import org.springframework.web.context.request.RequestAttributes;
import org.springframework.web.context.request.WebRequest;
import org.springframework.web.server.ResponseStatusException;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import java.time.LocalDate;
import java.util.Optional;
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/Transaction.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/Transaction.java
index 13bc67c1a..765dd9262 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/Transaction.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/Transaction.java
@@ -11,7 +11,7 @@ import de.deadlocker8.budgetmaster.utils.DateHelper;
import de.deadlocker8.budgetmaster.utils.ProvidesID;
import org.springframework.format.annotation.DateTimeFormat;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.time.LocalDate;
import java.util.ArrayList;
import java.util.List;
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java
index 0e1315ae0..8675dd7e0 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java
@@ -36,7 +36,7 @@ import org.springframework.web.bind.annotation.*;
import org.springframework.web.context.request.RequestAttributes;
import org.springframework.web.context.request.WebRequest;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import java.text.MessageFormat;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionSearchSpecifications.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionSearchSpecifications.java
index 8f15cc4b8..d6f8b43f1 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionSearchSpecifications.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionSearchSpecifications.java
@@ -7,7 +7,7 @@ import de.deadlocker8.budgetmaster.tags.Tag;
import de.deadlocker8.budgetmaster.tags.Tag_;
import org.springframework.data.jpa.domain.Specification;
-import javax.persistence.criteria.*;
+import jakarta.persistence.criteria.*;
import java.time.LocalDate;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionSpecifications.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionSpecifications.java
index 28a4f313b..76f7b85a8 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionSpecifications.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionSpecifications.java
@@ -6,10 +6,10 @@ import de.deadlocker8.budgetmaster.tags.Tag;
import de.deadlocker8.budgetmaster.tags.Tag_;
import org.springframework.data.jpa.domain.Specification;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.Join;
-import javax.persistence.criteria.JoinType;
-import javax.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.Join;
+import jakarta.persistence.criteria.JoinType;
+import jakarta.persistence.criteria.Predicate;
import java.time.LocalDate;
import java.util.ArrayList;
import java.util.List;
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/csvimport/CsvImportSettings.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/csvimport/CsvImportSettings.java
index dfda7609f..6be9bd0df 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/csvimport/CsvImportSettings.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/csvimport/CsvImportSettings.java
@@ -3,8 +3,8 @@ package de.deadlocker8.budgetmaster.transactions.csvimport;
import de.deadlocker8.budgetmaster.utils.ProvidesID;
-import javax.persistence.Entity;
-import javax.persistence.Id;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
import java.util.Objects;
@Entity
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/csvimport/CsvImportSettingsService.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/csvimport/CsvImportSettingsService.java
index de0bb0125..9e0836e25 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/csvimport/CsvImportSettingsService.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/csvimport/CsvImportSettingsService.java
@@ -6,7 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
@Service
public class CsvImportSettingsService
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/keywords/TransactionNameKeyword.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/keywords/TransactionNameKeyword.java
index 3aa9a9bf0..b803d2a52 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/keywords/TransactionNameKeyword.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/keywords/TransactionNameKeyword.java
@@ -3,10 +3,10 @@ package de.deadlocker8.budgetmaster.transactions.keywords;
import com.google.gson.annotations.Expose;
import de.deadlocker8.budgetmaster.utils.ProvidesID;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
import java.util.Objects;
@Entity
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/keywords/TransactionNameKeywordController.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/keywords/TransactionNameKeywordController.java
index 957744774..8cfcf0051 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/keywords/TransactionNameKeywordController.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/keywords/TransactionNameKeywordController.java
@@ -7,7 +7,7 @@ import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.List;
@Controller
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/update/BudgetMasterUpdateConfiguration.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/update/BudgetMasterUpdateConfiguration.java
index 0777f6bcb..9a80ff33a 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/update/BudgetMasterUpdateConfiguration.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/update/BudgetMasterUpdateConfiguration.java
@@ -14,7 +14,7 @@ import org.springframework.boot.system.ApplicationHome;
import org.springframework.context.annotation.Bean;
import org.springframework.stereotype.Component;
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
import java.io.File;
import java.nio.file.Paths;
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/utils/DatabaseConfigurationProperties.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/utils/DatabaseConfigurationProperties.java
index 78805611b..14531a691 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/utils/DatabaseConfigurationProperties.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/utils/DatabaseConfigurationProperties.java
@@ -3,9 +3,9 @@ package de.deadlocker8.budgetmaster.utils;
import de.deadlocker8.budgetmaster.database.DatabaseType;
import org.springframework.boot.context.properties.ConfigurationProperties;
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotBlank;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.List;
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/utils/notification/NotificationLinkBuilder.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/utils/notification/NotificationLinkBuilder.java
index f9c344189..495899391 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/utils/notification/NotificationLinkBuilder.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/utils/notification/NotificationLinkBuilder.java
@@ -1,6 +1,6 @@
package de.deadlocker8.budgetmaster.utils.notification;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import java.text.MessageFormat;
public class NotificationLinkBuilder
diff --git a/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/NotificationLinkBuilderTest.java b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/NotificationLinkBuilderTest.java
index d53424b24..4826f4b8b 100644
--- a/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/NotificationLinkBuilderTest.java
+++ b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/NotificationLinkBuilderTest.java
@@ -4,7 +4,7 @@ import de.deadlocker8.budgetmaster.utils.notification.NotificationLinkBuilder;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
diff --git a/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/database/ImportServiceTest.java b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/database/ImportServiceTest.java
index b99497a74..99d275039 100644
--- a/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/database/ImportServiceTest.java
+++ b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/database/ImportServiceTest.java
@@ -53,7 +53,7 @@ import org.testcontainers.containers.PostgreSQLContainer;
import org.testcontainers.junit.jupiter.Container;
import org.testcontainers.junit.jupiter.Testcontainers;
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
import java.io.IOException;
import java.net.URISyntaxException;
import java.nio.charset.StandardCharsets;
diff --git a/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/database/importer/ImporterTestBase.java b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/database/importer/ImporterTestBase.java
index 2aa373caa..16b18e906 100644
--- a/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/database/importer/ImporterTestBase.java
+++ b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/database/importer/ImporterTestBase.java
@@ -14,7 +14,7 @@ import org.testcontainers.containers.PostgreSQLContainer;
import org.testcontainers.junit.jupiter.Container;
import org.testcontainers.junit.jupiter.Testcontainers;
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
import java.text.MessageFormat;
import java.util.List;
diff --git a/pom.xml b/pom.xml
index c932b67a3..b6a283c69 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,7 +40,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
- <version>2.7.8</version>
+ <version>3.0.3</version>
<relativePath/>
</parent>
@@ -57,7 +57,7 @@
<testcontainer.version>1.17.6</testcontainer.version>
<assertj-core.version>3.24.2</assertj-core.version>
- <dependency-check-maven.version>8.0.1</dependency-check-maven.version>
+ <dependency-check-maven.version>8.1.0</dependency-check-maven.version>
</properties>
<dependencies>
--
GitLab