Skip to content

Commit 2c52083

Browse files
committed
migrate spring-bootfrom 2 to 3
1 parent bc4fc25 commit 2c52083

File tree

58 files changed

+122
-137
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+122
-137
lines changed

.idea/compiler.xml

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pom.xml

Lines changed: 23 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@
44

55
<groupId>org.woehlke</groupId>
66
<artifactId>simpleworklist</artifactId>
7-
<version>2.4.27-SNAPSHOT</version>
7+
<version>3.0.0-SNAPSHOT</version>
88
<packaging>jar</packaging>
99

1010
<parent>
1111
<groupId>org.springframework.boot</groupId>
1212
<artifactId>spring-boot-starter-parent</artifactId>
13-
<version>2.7.7</version>
13+
<version>3.0.1</version>
14+
<relativePath />
1415
</parent>
1516

1617
<scm>
@@ -148,7 +149,7 @@
148149

149150
<!-- TMP Migration to spring boot 3 -->
150151
<junit-jupiter.version>5.9.1</junit-jupiter.version>
151-
<spring-session-bom.version>2021.2.0</spring-session-bom.version>
152+
<spring-session-bom.version>3.0.0</spring-session-bom.version>
152153
</properties>
153154

154155
<repositories>
@@ -248,20 +249,12 @@
248249

249250
<dependencyManagement>
250251
<dependencies>
251-
<!--
252252
<dependency>
253253
<groupId>jakarta.platform</groupId>
254254
<artifactId>jakarta.jakartaee-api</artifactId>
255255
<version>10.0.0</version>
256256
<scope>provided</scope>
257257
</dependency>
258-
-->
259-
<dependency>
260-
<groupId>jakarta.platform</groupId>
261-
<artifactId>jakarta.jakartaee-api</artifactId>
262-
<version>9.1.0</version>
263-
<scope>provided</scope>
264-
</dependency>
265258
<dependency>
266259
<groupId>org.junit</groupId>
267260
<artifactId>junit-bom</artifactId>
@@ -336,7 +329,7 @@
336329
<artifactId>postgresql</artifactId>
337330
<version>42.5.1</version>
338331
</dependency>
339-
332+
<!--
340333
<dependency>
341334
<groupId>javax.xml.bind</groupId>
342335
<artifactId>jaxb-api</artifactId>
@@ -347,13 +340,13 @@
347340
<artifactId>saxon-dom</artifactId>
348341
<version>8.7</version>
349342
</dependency>
350-
<!--
343+
-->
351344
<dependency>
352345
<groupId>org.glassfish.jaxb</groupId>
353346
<artifactId>jaxb-runtime</artifactId>
354347
<version>4.0.1</version>
355348
</dependency>
356-
-->
349+
357350

358351
<!-- SCM -->
359352
<dependency>
@@ -735,18 +728,12 @@
735728
</dependency>
736729
<dependency>
737730
<groupId>org.thymeleaf</groupId>
738-
<artifactId>thymeleaf-spring5</artifactId>
739-
</dependency>
740-
<dependency>
741-
<groupId>org.thymeleaf.extras</groupId>
742-
<artifactId>thymeleaf-extras-springsecurity5</artifactId>
731+
<artifactId>thymeleaf-spring6</artifactId>
743732
</dependency>
744-
<!--
745733
<dependency>
746734
<groupId>org.thymeleaf.extras</groupId>
747-
<artifactId>thymeleaf-extras-java8time</artifactId>
735+
<artifactId>thymeleaf-extras-springsecurity6</artifactId>
748736
</dependency>
749-
-->
750737
<dependency>
751738
<groupId>com.github.mxab.thymeleaf.extras</groupId>
752739
<artifactId>thymeleaf-extras-data-attribute</artifactId>
@@ -768,22 +755,21 @@
768755
<groupId>com.zaxxer</groupId>
769756
<artifactId>HikariCP</artifactId>
770757
</dependency>
771-
772-
<dependency>
773-
<groupId>javax.xml.bind</groupId>
774-
<artifactId>jaxb-api</artifactId>
775-
</dependency>
776-
<dependency>
777-
<groupId>net.sf.saxon</groupId>
778-
<artifactId>saxon-dom</artifactId>
779-
</dependency>
780-
781758
<!--
782-
<dependency>
783-
<groupId>org.glassfish.jaxb</groupId>
784-
<artifactId>jaxb-runtime</artifactId>
785-
</dependency>
786-
-->
759+
<dependency>
760+
<groupId>javax.xml.bind</groupId>
761+
<artifactId>jaxb-api</artifactId>
762+
</dependency>
763+
<dependency>
764+
<groupId>net.sf.saxon</groupId>
765+
<artifactId>saxon-dom</artifactId>
766+
</dependency>
767+
-->
768+
769+
<dependency>
770+
<groupId>org.glassfish.jaxb</groupId>
771+
<artifactId>jaxb-runtime</artifactId>
772+
</dependency>
787773

788774
<dependency>
789775
<groupId>org.junit.jupiter</groupId>

src/main/java/org/woehlke/java/simpleworklist/application/framework/AuditModel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import org.springframework.data.annotation.LastModifiedDate;
88
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
99

10-
import javax.persistence.*;
10+
import jakarta.persistence.*;
1111
import java.io.Serializable;
1212
import java.util.Date;
1313
import java.util.Objects;

src/main/java/org/woehlke/java/simpleworklist/config/SimpleworklistProperties.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import org.springframework.stereotype.Component;
77
import org.springframework.validation.annotation.Validated;
88

9-
import javax.validation.Valid;
10-
import javax.validation.constraints.NotNull;
9+
import jakarta.validation.Valid;
10+
import jakarta.validation.constraints.NotNull;
1111

1212
@Component
1313
@Getter

src/main/java/org/woehlke/java/simpleworklist/config/WebMvcConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import org.springframework.web.servlet.i18n.SessionLocaleResolver;
2020
import org.thymeleaf.dialect.springdata.SpringDataDialect;
2121

22-
import javax.validation.constraints.NotNull;
22+
import jakarta.validation.constraints.NotNull;
2323
import java.util.Locale;
2424
import java.util.Properties;
2525

src/main/java/org/woehlke/java/simpleworklist/domain/AbstractController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import org.woehlke.java.simpleworklist.domain.meso.session.UserSessionBean;
1717
import org.woehlke.java.simpleworklist.domain.security.login.LoginSuccessService;
1818

19-
import javax.validation.constraints.NotNull;
19+
import jakarta.validation.constraints.NotNull;
2020
import java.util.List;
2121
import java.util.Locale;
2222

src/main/java/org/woehlke/java/simpleworklist/domain/ApplicationErrorController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import org.springframework.web.bind.annotation.ExceptionHandler;
99
import org.springframework.web.bind.annotation.RequestMapping;
1010

11-
import javax.servlet.http.HttpServletRequest;
11+
import jakarta.servlet.http.HttpServletRequest;
1212

1313
import static javax.servlet.RequestDispatcher.*;
1414
import static org.springframework.web.bind.annotation.RequestMethod.*;

src/main/java/org/woehlke/java/simpleworklist/domain/PagesController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import org.springframework.web.bind.annotation.RequestMethod;
1010
import org.woehlke.java.simpleworklist.domain.meso.session.UserSessionBean;
1111

12-
import javax.validation.constraints.NotNull;
12+
import jakarta.validation.constraints.NotNull;
1313
import java.util.Locale;
1414

1515
@Slf4j

src/main/java/org/woehlke/java/simpleworklist/domain/ProjectIdController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
import org.springframework.beans.factory.annotation.Autowired;
2727

28-
import javax.validation.Valid;
28+
import jakarta.validation.Valid;
2929
import java.util.List;
3030
import java.util.Locale;
3131

src/main/java/org/woehlke/java/simpleworklist/domain/ProjectIdTaskController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import org.woehlke.java.simpleworklist.domain.meso.session.UserSessionBean;
2424
import org.woehlke.java.simpleworklist.domain.meso.task.TaskLifecycleService;
2525

26-
import javax.validation.Valid;
26+
import jakarta.validation.Valid;
2727
import java.util.List;
2828
import java.util.Locale;
2929

0 commit comments

Comments
 (0)