Skip to content

Commit 68611c8

Browse files
panos-kakospanos-kakos
committed
[JAVA-18499] Upgraded to spring boot 3
1 parent 5f1cab4 commit 68611c8

Some content is hidden

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

42 files changed

+200
-201
lines changed

‎pom.xml‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<parent>
1414
<groupId>org.springframework.boot</groupId>
1515
<artifactId>spring-boot-starter-parent</artifactId>
16-
<version>2.7.5</version>
16+
<version>3.1.0</version>
1717
</parent>
1818

1919
<dependencies>
@@ -51,14 +51,14 @@
5151
</dependency>
5252
<dependency>
5353
<groupId>org.thymeleaf.extras</groupId>
54-
<artifactId>thymeleaf-extras-springsecurity5</artifactId>
54+
<artifactId>thymeleaf-extras-springsecurity6</artifactId>
5555
</dependency>
5656

5757
<!-- Servlet -->
5858
<dependency>
5959
<groupId>javax.servlet</groupId>
60-
<artifactId>jstl</artifactId>
61-
<scope>runtime</scope>
60+
<artifactId>javax.servlet-api</artifactId>
61+
<version>${javax.servlet-api.version}</version>
6262
</dependency>
6363

6464
<dependency>
@@ -84,6 +84,7 @@
8484
<dependency>
8585
<groupId>mysql</groupId>
8686
<artifactId>mysql-connector-java</artifactId>
87+
<version>${mysql-connector-java.version}</version>
8788
</dependency>
8889

8990
<dependency>
@@ -166,8 +167,8 @@
166167
<groupId>org.apache.maven.plugins</groupId>
167168
<artifactId>maven-compiler-plugin</artifactId>
168169
<configuration>
169-
<source>1.8</source>
170-
<target>1.8</target>
170+
<source>17</source>
171+
<target>17</target>
171172
</configuration>
172173
</plugin>
173174

@@ -228,10 +229,12 @@
228229
</profiles>
229230

230231
<properties>
231-
<java-version>1.8</java-version>
232+
<java-version>17</java-version>
232233
<javax.servlet.jsp-api.version>2.3.2-b01</javax.servlet.jsp-api.version>
233234
<javax.el.version>2.2</javax.el.version>
234235
<jstl.version>1.2</jstl.version>
236+
<javax.servlet-api.version>4.0.1</javax.servlet-api.version>
237+
<mysql-connector-java.version>8.0.32</mysql-connector-java.version>
235238
<guava.version>32.0.0-jre</guava.version>
236239
<passay.version>1.0</passay.version>
237240
<logstash-logback-encoder.version>4.8</logstash-logback-encoder.version>

‎src/main/java/com/baeldung/captcha/AbstractCaptchaService.java‎

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

33
import java.util.regex.Pattern;
44

5-
import javax.servlet.http.HttpServletRequest;
5+
import jakarta.servlet.http.HttpServletRequest;
66

77
import org.slf4j.Logger;
88
import org.slf4j.LoggerFactory;

‎src/main/java/com/baeldung/persistence/model/DeviceMetadata.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.baeldung.persistence.model;
22

3-
import javax.persistence.*;
3+
import jakarta.persistence.*;
44
import java.util.Date;
55
import java.util.Objects;
66

‎src/main/java/com/baeldung/persistence/model/NewLocationToken.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package com.baeldung.persistence.model;
22

3-
import javax.persistence.Entity;
4-
import javax.persistence.FetchType;
5-
import javax.persistence.GeneratedValue;
6-
import javax.persistence.GenerationType;
7-
import javax.persistence.Id;
8-
import javax.persistence.JoinColumn;
9-
import javax.persistence.OneToOne;
3+
import jakarta.persistence.Entity;
4+
import jakarta.persistence.FetchType;
5+
import jakarta.persistence.GeneratedValue;
6+
import jakarta.persistence.GenerationType;
7+
import jakarta.persistence.Id;
8+
import jakarta.persistence.JoinColumn;
9+
import jakarta.persistence.OneToOne;
1010

1111
@Entity
1212
public class NewLocationToken {

‎src/main/java/com/baeldung/persistence/model/PasswordResetToken.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
import java.util.Calendar;
44
import java.util.Date;
55

6-
import javax.persistence.Entity;
7-
import javax.persistence.FetchType;
8-
import javax.persistence.GeneratedValue;
9-
import javax.persistence.GenerationType;
10-
import javax.persistence.Id;
11-
import javax.persistence.JoinColumn;
12-
import javax.persistence.OneToOne;
6+
import jakarta.persistence.Entity;
7+
import jakarta.persistence.FetchType;
8+
import jakarta.persistence.GeneratedValue;
9+
import jakarta.persistence.GenerationType;
10+
import jakarta.persistence.Id;
11+
import jakarta.persistence.JoinColumn;
12+
import jakarta.persistence.OneToOne;
1313

1414
@Entity
1515
public class PasswordResetToken {

‎src/main/java/com/baeldung/persistence/model/Privilege.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
import java.util.Collection;
44

5-
import javax.persistence.Entity;
6-
import javax.persistence.GeneratedValue;
7-
import javax.persistence.GenerationType;
8-
import javax.persistence.Id;
9-
import javax.persistence.ManyToMany;
5+
import jakarta.persistence.Entity;
6+
import jakarta.persistence.GeneratedValue;
7+
import jakarta.persistence.GenerationType;
8+
import jakarta.persistence.Id;
9+
import jakarta.persistence.ManyToMany;
1010

1111
@Entity
1212
public class Privilege {

‎src/main/java/com/baeldung/persistence/model/Role.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
import java.util.Collection;
44

5-
import javax.persistence.Entity;
6-
import javax.persistence.GeneratedValue;
7-
import javax.persistence.GenerationType;
8-
import javax.persistence.Id;
9-
import javax.persistence.JoinColumn;
10-
import javax.persistence.JoinTable;
11-
import javax.persistence.ManyToMany;
5+
import jakarta.persistence.Entity;
6+
import jakarta.persistence.GeneratedValue;
7+
import jakarta.persistence.GenerationType;
8+
import jakarta.persistence.Id;
9+
import jakarta.persistence.JoinColumn;
10+
import jakarta.persistence.JoinTable;
11+
import jakarta.persistence.ManyToMany;
1212

1313
@Entity
1414
public class Role {

‎src/main/java/com/baeldung/persistence/model/User.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22

33
import java.util.Collection;
44

5-
import javax.persistence.Column;
6-
import javax.persistence.Entity;
7-
import javax.persistence.FetchType;
8-
import javax.persistence.GeneratedValue;
9-
import javax.persistence.GenerationType;
10-
import javax.persistence.Id;
11-
import javax.persistence.JoinColumn;
12-
import javax.persistence.JoinTable;
13-
import javax.persistence.ManyToMany;
14-
import javax.persistence.Table;
5+
import jakarta.persistence.Column;
6+
import jakarta.persistence.Entity;
7+
import jakarta.persistence.FetchType;
8+
import jakarta.persistence.GeneratedValue;
9+
import jakarta.persistence.GenerationType;
10+
import jakarta.persistence.Id;
11+
import jakarta.persistence.JoinColumn;
12+
import jakarta.persistence.JoinTable;
13+
import jakarta.persistence.ManyToMany;
14+
import jakarta.persistence.Table;
1515

1616
import org.jboss.aerogear.security.otp.api.Base32;
1717

‎src/main/java/com/baeldung/persistence/model/UserLocation.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package com.baeldung.persistence.model;
22

3-
import javax.persistence.Entity;
4-
import javax.persistence.FetchType;
5-
import javax.persistence.GeneratedValue;
6-
import javax.persistence.GenerationType;
7-
import javax.persistence.Id;
8-
import javax.persistence.JoinColumn;
9-
import javax.persistence.ManyToOne;
3+
import jakarta.persistence.Entity;
4+
import jakarta.persistence.FetchType;
5+
import jakarta.persistence.GeneratedValue;
6+
import jakarta.persistence.GenerationType;
7+
import jakarta.persistence.Id;
8+
import jakarta.persistence.JoinColumn;
9+
import jakarta.persistence.ManyToOne;
1010

1111
@Entity
1212
public class UserLocation {

‎src/main/java/com/baeldung/persistence/model/VerificationToken.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import java.util.Calendar;
44
import java.util.Date;
55

6-
import javax.persistence.*;
6+
import jakarta.persistence.*;
77

88
@Entity
99
public class VerificationToken {

0 commit comments

Comments
 (0)