Skip to content

Commit fd5fc37

Browse files
[JAVA-37419] Change from Javax to Jakarta on Spring exceptions module
1 parent 80668ec commit fd5fc37

File tree

11 files changed

+49
-49
lines changed

11 files changed

+49
-49
lines changed

spring-exceptions/pom.xml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -78,15 +78,15 @@
7878
</dependency>
7979
<!-- web -->
8080
<dependency>
81-
<groupId>javax.servlet</groupId>
82-
<artifactId>javax.servlet-api</artifactId>
83-
<version>${javax.servlet-api.version}</version>
81+
<groupId>jakarta.servlet</groupId>
82+
<artifactId>jakarta.servlet-api</artifactId>
83+
<version>${jakarta.servlet-api.version}</version>
8484
<scope>provided</scope>
8585
</dependency>
8686
<dependency>
87-
<groupId>javax.servlet</groupId>
88-
<artifactId>jstl</artifactId>
89-
<version>${jstl.version}</version>
87+
<groupId>jakarta.servlet.jsp.jstl</groupId>
88+
<artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
89+
<version>${jakarta-servlet-jpa-jstl-api.version}</version>
9090
<scope>runtime</scope>
9191
</dependency>
9292
<!-- util -->
@@ -156,18 +156,22 @@
156156
</build>
157157

158158
<properties>
159+
<java.version>17</java.version>
160+
159161
<!-- Spring -->
160-
<org.springframework.version>5.3.25</org.springframework.version>
162+
<org.springframework.version>6.0.6</org.springframework.version>
161163
<org.springframework.security.version>4.2.0.RELEASE</org.springframework.security.version>
162164
<javassist.version>3.21.0-GA</javassist.version>
163165
<!-- persistence -->
164-
<hibernate.version>5.2.5.Final</hibernate.version>
166+
<hibernate.version>6.4.2.Final</hibernate.version>
165167
<mysql-connector-java.version>8.2.0</mysql-connector-java.version>
166168
<tomcat-dbcp.version>7.0.73</tomcat-dbcp.version>
167169
<derby.version>10.13.1.1</derby.version>
168170
<!-- various -->
169171
<hibernate-validator.version>8.0.1.Final</hibernate-validator.version>
170172
<jaxb-api.version>2.3.0</jaxb-api.version>
173+
<jakarta.servlet-api.version>6.1.0</jakarta.servlet-api.version>
174+
<jakarta-servlet-jpa-jstl-api.version>3.0.0</jakarta-servlet-jpa-jstl-api.version>
171175
<!-- util -->
172176
<httpcore.version>4.4.5</httpcore.version>
173177
<httpclient.version>4.5.2</httpclient.version>

spring-exceptions/src/main/java/com/baeldung/ex/mappingexception/cause1/persistence/model/Foo.java

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

33
import java.io.Serializable;
44

5-
import javax.persistence.GeneratedValue;
6-
import javax.persistence.GenerationType;
7-
import javax.persistence.Id;
5+
import jakarta.persistence.GeneratedValue;
6+
import jakarta.persistence.GenerationType;
7+
import jakarta.persistence.Id;
88

99
public class Foo implements Serializable {
1010

spring-exceptions/src/main/java/com/baeldung/ex/mappingexception/cause2/persistence/model/Foo.java

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

33
import java.io.Serializable;
44

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

1010
@Entity
1111
public class Foo implements Serializable {

spring-exceptions/src/main/java/com/baeldung/ex/mappingexception/cause3/persistence/model/Foo.java

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

33
import java.io.Serializable;
44

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

1010
@Entity
1111
public class Foo implements Serializable {

spring-exceptions/src/main/java/com/baeldung/ex/mappingexception/cause4/persistence/model/Foo.java

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

33
import java.io.Serializable;
44

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

1010
@Entity
1111
public class Foo implements Serializable {

spring-exceptions/src/main/java/com/baeldung/persistence/model/Child.java

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

33
import java.io.Serializable;
44

5-
import javax.persistence.Entity;
6-
import javax.persistence.GeneratedValue;
7-
import javax.persistence.Id;
8-
import javax.persistence.OneToOne;
5+
import jakarta.persistence.Entity;
6+
import jakarta.persistence.GeneratedValue;
7+
import jakarta.persistence.Id;
8+
import jakarta.persistence.OneToOne;
99

1010
@Entity
1111
public class Child implements Serializable {

spring-exceptions/src/main/java/com/baeldung/persistence/model/Foo.java

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

33
import java.io.Serializable;
44

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

1111
@Entity
1212
public class Foo implements Serializable {

spring-exceptions/src/main/java/com/baeldung/persistence/model/Parent.java

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

33
import java.io.Serializable;
44

5-
import javax.persistence.CascadeType;
6-
import javax.persistence.Entity;
7-
import javax.persistence.GeneratedValue;
8-
import javax.persistence.Id;
9-
import javax.persistence.JoinColumn;
10-
import javax.persistence.OneToOne;
5+
import jakarta.persistence.CascadeType;
6+
import jakarta.persistence.Entity;
7+
import jakarta.persistence.GeneratedValue;
8+
import jakarta.persistence.Id;
9+
import jakarta.persistence.JoinColumn;
10+
import jakarta.persistence.OneToOne;
1111

1212
@Entity
1313
public class Parent implements Serializable {

spring-exceptions/src/main/java/com/baeldung/spring/config/CoreConfig.java

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

33
import org.springframework.context.annotation.ComponentScan;
44
import org.springframework.context.annotation.Configuration;
5-
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
5+
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
66

77
@Configuration
88
@ComponentScan("com.baeldung.core")
9-
public class CoreConfig extends WebMvcConfigurerAdapter {
9+
public class CoreConfig implements WebMvcConfigurer {
1010

1111
public CoreConfig() {
1212
super();

spring-exceptions/src/main/java/com/baeldung/spring/config/MainWebAppInitializer.java

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

33
import java.util.Set;
44

5-
import javax.servlet.ServletContext;
6-
import javax.servlet.ServletException;
7-
import javax.servlet.ServletRegistration;
5+
import jakarta.servlet.ServletContext;
6+
import jakarta.servlet.ServletException;
7+
import jakarta.servlet.ServletRegistration;
88

99
import org.springframework.web.WebApplicationInitializer;
1010
import org.springframework.web.context.ContextLoaderListener;

0 commit comments

Comments
 (0)