diff --git a/BudgetMasterServer/pom.xml b/BudgetMasterServer/pom.xml index 5daef24775d5861b1c2b4c6e3062054e3368acb2..476810500342ecf422c78516f192951b65b3b247 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 df60b22c6dd9c600e4675f53c610801319cfd264..933d446ab8d888ad0d8020bd9f7eeca93e9b0d14 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 fd6f2a40bfbcea9470b9aeaa8641fc7dedb8a8cb..ad7e06092c71734c0459aed3b61638a6a10cae6f 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 073c2b3c0aa95d714bfe111cd413782aeff4833f..c99d800b0acbe093d341d5d69be96219d6ce9f81 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 d03f7f45dafa6bed654f62ecf4681ae6e7e7ce85..d1b073790dad15494745b083689aaf1bcda57942 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 c1a7f158c4f11b01fdfda9a45a682d9e40a98cb5..8e189f7342cef18843d97aba4ec7f11ed2732c6a 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 7f2b26dc46dd8510d01a0e78ec49917b5dad4acc..dd2913d286fd26bf49b2421f393ddb39c2c78dd6 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 ef1603db076ed6bc03775988a78123746264953d..d83e123cbf179f189f8fef215fb9fb0323c78d0b 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 57b803f74472c60063d973057e89074d2627a903..a5c64fe6add16dd9962b38bd5ce2b79b22aec923 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 f13b838495e3b4d21a88b2068db3450ad42c17a7..39f255d57680b830175d5e791a1add1f782163c1 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 ab05e6ee2e6ac9b7c2770828d12b61feb7c2c779..6106f76ca995974c1e90a1b9aea316dc5ae9e261 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 bfcac7f018c984c61b38fc5740e42e11cd509099..22c03e87a16c996448eb80cb98e5315bea137d86 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 8af33f30ff768fc6f6d73b0ad521163b85078773..16b58cd68b19000480005d2700a9b095d543d4dd 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 f8a1de0b817d8763567d636ed170c4fcdef8712f..820ee3e4220a1fd39506b167478be9d3ca9841aa 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 398f808fa086c9b7ab057f9a729136d7a7662691..93ddf9a889389de429f5632b7daf5372e522df26 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 e3226b51d7da02174e0360e79ce8ff732341fd5d..d02b0ccd7a2e79ce1cab1e69b3a2d0cc16a9ad79 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 fb973500531f14dd4090668b12f89734af898a29..0bfd88e8ec1a1b00f862995058d3920d5d44b681 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 7a16fbfd60e9e955c8286e911881a2b151f03093..f5ca960f135671f35554dfff94bdac693eee2a08 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 de2d39aac8c28e5532fdc2a4a4bc59474db12b77..2b3c402f08022f204076fd99c03af2a215f0f312 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 fbbb74c7453b65340190aa743c3d3123a26f2084..c417390b6f82d43dcf7ca0a260c0ef389833dcf1 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 c0299bdf842dd256852a3882765dd42037d84927..7034a4d2475581b75ed56f65c1e838442099d920 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 9d606e08c450d4cd220651f5287356fc78aaf700..514dee5f5a6fac91b003dce71d2b572c495e9aa3 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 f3ce9f36b75c9ec306d569efb5f753237e2d63f5..2d196f1b33b469186c4cbeda382e09ef5f79e2f5 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 00c79caec06378e0ac34752e2cc47a813be3cd93..ad2b21fb3a8273029d02ca4b4fa7445033484b9c 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 41f7d9d6191599bde87ecebec7afe8567b90b352..73041ce23b5533ec66b28d587a145768cf2a1a39 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 90ed0b96cc118c2fbb2ffa53177af69dd6bb3c88..6f554c3227d4fdbfd4e995c8620f8190105ff29c 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 c830b33518bc57bc10d160283a5e3eb033a92e59..06e93efb1019e7e3d64b0ba97c5c11547aa26de0 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 9db8d0726674307248cd9442c22bf284eda52531..41fc2321fdecfc4e44d66c96d9d3fd66e297e45f 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 596193871f029d061426d3c1b2789fe4db4e7f68..69959c753bd11e713eb1a068f3a0829808ee713b 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 2688cdaf8e1c85ac0f77dace391641ff9a4c67ca..d7b780017f13d40103beeb210bca61f5d117ad40 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 4de80e0ae0fecc0965a28731599f7a1ff48cf42e..02f90bc8899344b5a49e3945649766dbac4f0bee 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 968a8c5bcfda45fdc38c76899b81005c0b705abc..2f7c860977208cd1618065afef7a548b9c2670f4 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 b437f40d7139340af9382d9780466eb295f4a354..2e14ae09f7d46bc06058e22b1058bebc5d1c553a 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 52dfa1574c756b9cb51a162efcacb756b62fb9eb..e06c91a8366244dc05cd30a900867e26b054fb65 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 6cae028c9ce558bdb2f7be65461a99cd46932b23..f66c3c763aaacb656193969aafcd76423a3bb9b2 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 2b058fdeade4d5159c20647d868a20f5eb8357c7..bd9c5c443610ccad3838caab11411893af123442 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 0f4ad11cbd2c4fb3c2ba0d5041ed8f79ceb5e41f..9d406f906eef78c3915e3a9195e3e3db03792c6b 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 0726f87630338d70fa326ca18ba63054f3245c8d..7448b173488dfc654a82f3df76d84a3dc10303bd 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 e0d58ed2282406e52750ff53a098422f668656ad..56b617b1a45d64cf3816a333cc77d1f47157dc2e 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 13bc67c1aede6e28d0426494c8b315ce53460c5d..765dd926217bfa402603defa2a6ea5987ab6ae57 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 0e1315ae02760d90934916c6d9b2b775c30a65c0..8675dd7e076d5330e9e4eeb1b2305ffff5afc6d1 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 8f15cc4b831137e6d9d79f28509f7bae654ede60..d6f8b43f1a53c21c3d70bba8253553d87f82f540 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 28a4f313b8805074502f42b52d5b32bf75dcedb6..76f7b85a889995755ba8735624a5f5412d411a90 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 dfda7609f44da2126d59cb6b5a41336be0e61579..6be9bd0dff1e2da602e098fd9bfecce8314230ba 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 de0bb0125d9930696af60333de9a273bf7d6ccf7..9e0836e2512e5324b5364b0b9d6682eb0b2adcbc 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 3aa9a9bf0607cefa1a40a56789d6e557087af809..b803d2a521ba2e77070065fc279d2d54969d55b9 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 95774477461be8a59145e03c5db2e9e0998a5cc1..8cfcf0051e5d7fa70eeaf9923f78e4af3ab3373b 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 0777f6bcbf5136af22caa80f9dbaec577a3e846c..9a80ff33a46bdb292152e2599888a4e648952432 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 78805611b8b86a1ae7dc7f7be50fe6a97229db54..14531a691c7699d3c4f86f5d7103d072edc0ca82 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 f9c344189a706d48820ccadf94200ff3f61983a6..49589939142a2e2965ec82581d982f07a173edc0 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 d53424b24e0141257f937278010e62c9d6cae3c3..4826f4b8b87d8ccd1334e88d35bd28b6b31fb112 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 b99497a7412391d8317db685e727e455fd1dec87..99d2750393b0002029efc07e5e5751426c88bd20 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 2aa373caa903dbfced53ff1a908b0e7e92d504f6..16b18e906a11de69409b3de92f6134c13cd77771 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 c932b67a3c2946956ad9109d2a39924671e88b0e..b6a283c69502d866826589da55f4ba8ae64f0cc1 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>