JAVA-20168 Migrating spring-jpa (#14257)

* JAVA-20168 Migrating spring-jpa

* JAVA-20168 Migrate spring-jpa-2

* JAVA-20168 Remove unneeded annotation

---------

Co-authored-by: timis1 <noreplay@yahoo.com>

persistence-modules/pom.xml

@@ -66,7 +66,6 @@
         <module>spring-data-arangodb</module>
         <module>spring-data-cassandra</module>
         <module>spring-data-cassandra-test</module>
-        <!-- <module>spring-data-cassandra-reactive</module> FAILED -->
         <module>spring-data-cosmosdb</module>
         <module>spring-data-couchbase-2</module>
         <module>spring-data-dynamodb</module>
@@ -99,8 +98,8 @@
         <module>spring-data-solr</module>
         <!-- <module>spring-hibernate-3</module> FAILED -->
         <!-- <module>spring-hibernate-5</module> FAILED --> <!-- long running -->
-        <!-- <module>spring-jpa</module>
+        <module>spring-jpa</module>
-        <module>spring-jpa-2</module> FAILED -->
+        <module>spring-jpa-2</module>
         <module>spring-jdbc</module>
         <module>spring-jooq</module>
         <module>spring-mybatis</module>

persistence-modules/spring-jpa-2/pom.xml

@@ -71,7 +71,7 @@
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
-            <version>42.4.0</version>
+            <version>${postgresql.version}</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
@@ -97,15 +97,26 @@
             <version>${org.springframework.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>${jakson-databind.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>${jakson-core.version}</version>
+        </dependency>
     </dependencies>
 
     <properties>
         <!-- Spring -->
-        <org.springframework.version>5.2.0.RELEASE</org.springframework.version>
+        <org.springframework.version>6.0.9</org.springframework.version>
-        <spring-boot.version>2.2.6.RELEASE</spring-boot.version>
+        <spring-boot.version>3.1.0</spring-boot.version>
         <!-- persistence -->
-        <tomcat-dbcp.version>9.0.0.M26</tomcat-dbcp.version>
+        <tomcat-dbcp.version>10.1.9</tomcat-dbcp.version>
-        <h2.version>2.1.214</h2.version>
+        <jakson-databind.version>2.15.1</jakson-databind.version>
+        <jakson-core.version>2.14.2</jakson-core.version>
     </properties>
 
 </project>

persistence-modules/spring-jpa-2/src/main/java/com/baeldung/hibernate/bootstrap/HibernateXMLConf.java

@@ -1,21 +1,9 @@
 package com.baeldung.hibernate.bootstrap;
 
-import com.google.common.base.Preconditions;
-import org.apache.tomcat.dbcp.dbcp2.BasicDataSource;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.ImportResource;
-import org.springframework.context.annotation.PropertySource;
-import org.springframework.core.env.Environment;
-import org.springframework.orm.hibernate5.HibernateTransactionManager;
-import org.springframework.orm.hibernate5.LocalSessionFactoryBean;
-import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
-import javax.sql.DataSource;
-import java.util.Properties;
-
 @Configuration
 @EnableTransactionManagement
 @ImportResource({ "classpath:hibernate5Configuration.xml" })

persistence-modules/spring-jpa-2/src/main/java/com/baeldung/hibernate/bootstrap/model/TestEntity.java

@@ -1,7 +1,7 @@
 package com.baeldung.hibernate.bootstrap.model;
 
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
-import javax.persistence.Id;
+import jakarta.persistence.Id;
 
 @Entity
 public class TestEntity {

persistence-modules/spring-jpa-2/src/main/java/com/baeldung/manytomany/model/Course.java

@@ -1,6 +1,6 @@
 package com.baeldung.manytomany.model;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.HashSet;
 import java.util.Set;
 

persistence-modules/spring-jpa-2/src/main/java/com/baeldung/manytomany/model/CourseRating.java

@@ -1,6 +1,6 @@
 package com.baeldung.manytomany.model;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 @Entity
 @Table(name = "course_rating")

persistence-modules/spring-jpa-2/src/main/java/com/baeldung/manytomany/model/CourseRatingKey.java

@@ -1,7 +1,7 @@
 package com.baeldung.manytomany.model;
 
-import javax.persistence.Column;
+import jakarta.persistence.Column;
-import javax.persistence.Embeddable;
+import jakarta.persistence.Embeddable;
 import java.io.Serializable;
 
 @Embeddable

persistence-modules/spring-jpa-2/src/main/java/com/baeldung/manytomany/model/CourseRegistration.java

@@ -1,6 +1,6 @@
 package com.baeldung.manytomany.model;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.time.LocalDateTime;
 
 @Entity

persistence-modules/spring-jpa-2/src/main/java/com/baeldung/manytomany/model/Student.java

@@ -1,6 +1,6 @@
 package com.baeldung.manytomany.model;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.HashSet;
 import java.util.Set;
 

persistence-modules/spring-jpa-2/src/main/java/com/baeldung/manytomanyremoval/Author.java

@@ -1,6 +1,6 @@
 package com.baeldung.manytomanyremoval;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.HashSet;
 import java.util.Set;
 

persistence-modules/spring-jpa-2/src/main/java/com/baeldung/manytomanyremoval/Book.java

@@ -1,7 +1,6 @@
 package com.baeldung.manytomanyremoval;
 
-
+import jakarta.persistence.*;
-import javax.persistence.*;
 import java.util.HashSet;
 import java.util.Set;
 

persistence-modules/spring-jpa-2/src/main/java/com/baeldung/manytomanyremoval/Category.java

@@ -1,6 +1,6 @@
 package com.baeldung.manytomanyremoval;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 @Entity
 @Table(name = "category")

persistence-modules/spring-jpa-2/src/main/java/com/baeldung/manytomanyremoval/Post.java

@@ -1,7 +1,6 @@
 package com.baeldung.manytomanyremoval;
 
-
+import jakarta.persistence.*;
-import javax.persistence.*;
 import java.util.HashSet;
 import java.util.Set;
 

persistence-modules/spring-jpa-2/src/main/java/com/baeldung/multitenant/config/TenantFilter.java

@@ -4,8 +4,8 @@ import com.baeldung.multitenant.security.AuthenticationService;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
 
-import javax.servlet.*;
+import jakarta.servlet.*;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.io.IOException;
 
 @Component

persistence-modules/spring-jpa-2/src/main/java/com/baeldung/multitenant/domain/Employee.java

@@ -1,11 +1,11 @@
 package com.baeldung.multitenant.domain;
 
-import javax.persistence.Column;
+import jakarta.persistence.Column;
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
-import javax.persistence.Id;
+import jakarta.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Table;
-import javax.persistence.GeneratedValue;
+import jakarta.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
+import jakarta.persistence.GenerationType;
 
 @Entity
 @Table(name = "employee")

persistence-modules/spring-jpa-2/src/main/java/com/baeldung/multitenant/security/AuthenticationFilter.java

@@ -4,11 +4,11 @@ import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.web.filter.GenericFilterBean;
 
-import javax.servlet.FilterChain;
+import jakarta.servlet.FilterChain;
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
-import javax.servlet.ServletRequest;
+import jakarta.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
+import jakarta.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.io.IOException;
 
 public class AuthenticationFilter extends GenericFilterBean {

persistence-modules/spring-jpa-2/src/main/java/com/baeldung/multitenant/security/AuthenticationService.java

@@ -5,8 +5,8 @@ import io.jsonwebtoken.SignatureAlgorithm;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import java.util.Collections;
 import java.util.Date;
 

persistence-modules/spring-jpa-2/src/main/java/com/baeldung/multitenant/security/LoginFilter.java

@@ -9,10 +9,10 @@ import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.web.authentication.AbstractAuthenticationProcessingFilter;
 import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
 
-import javax.servlet.FilterChain;
+import jakarta.servlet.FilterChain;
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Collection;
 import java.util.Collections;

persistence-modules/spring-jpa-2/src/main/java/com/baeldung/multitenant/security/SecurityConfiguration.java

@@ -2,32 +2,39 @@ package com.baeldung.multitenant.security;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.config.Customizer;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
+import org.springframework.security.config.annotation.web.configurers.HeadersConfigurer;
 import org.springframework.security.config.http.SessionCreationPolicy;
+import org.springframework.security.core.userdetails.User;
+import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.security.provisioning.InMemoryUserDetailsManager;
+import org.springframework.security.web.SecurityFilterChain;
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
 
 @Configuration
 @EnableWebSecurity
-public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
+public class SecurityConfiguration {
 
-    @Override
+    @Bean
-    protected void configure(AuthenticationManagerBuilder auth) throws Exception {
+    public InMemoryUserDetailsManager userDetailsService() {
-        auth.inMemoryAuthentication()
+        UserDetails user1 = User
-          .passwordEncoder(passwordEncoder())
+                .withUsername("user")
-          .withUser("user")
+                .password(passwordEncoder().encode("baeldung"))
-          .password(passwordEncoder().encode("baeldung"))
+                .roles("tenant_1")
-          .roles("tenant_1");
+                .build();
 
-        auth.inMemoryAuthentication()
+        UserDetails user2 = User
-          .passwordEncoder(passwordEncoder())
+                .withUsername("admin")
-          .withUser("admin")
+                .password(passwordEncoder().encode("baeldung"))
-          .password(passwordEncoder().encode("baeldung"))
+                .roles("tenant_2")
-          .roles("tenant_2");
+                .build();
+        return new InMemoryUserDetailsManager(user1, user2);
     }
 
     @Bean
@@ -35,22 +42,19 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
         return new BCryptPasswordEncoder();
     }
 
-    @Override
+    @Bean
-    protected void configure(HttpSecurity http) throws Exception {
+    public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
+        final AuthenticationManager authenticationManager = http.getSharedObject(AuthenticationManager.class);
         http
-          .authorizeRequests()
+                .authorizeHttpRequests(authorize ->
-          .antMatchers("/login").permitAll()
+                        authorize.requestMatchers("/login").permitAll().anyRequest().authenticated())
-          .anyRequest().authenticated()
+                .sessionManagement(securityContext -> securityContext.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
-          .and()
+                .addFilterBefore(new LoginFilter("/login", authenticationManager), UsernamePasswordAuthenticationFilter.class)
-          .sessionManagement()
+                .addFilterBefore(new AuthenticationFilter(), UsernamePasswordAuthenticationFilter.class)
-          .sessionCreationPolicy(SessionCreationPolicy.STATELESS)
+                .csrf(AbstractHttpConfigurer::disable)
-          .and()
+                .headers(header -> header.frameOptions(HeadersConfigurer.FrameOptionsConfig::disable))
-          .addFilterBefore(new LoginFilter("/login", authenticationManager()),
+                .httpBasic(Customizer.withDefaults());
-            UsernamePasswordAuthenticationFilter.class)
+
-          .addFilterBefore(new AuthenticationFilter(), UsernamePasswordAuthenticationFilter.class)
+        return http.build();
-          .csrf().disable()
-          .headers().frameOptions().disable()
-          .and()
-          .httpBasic();
     }
 }

persistence-modules/spring-jpa-2/src/main/java/com/baeldung/spring/dao/generics/AbstractJpaDAO.java

@@ -1,7 +1,7 @@
 package com.baeldung.spring.dao.generics;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
+import jakarta.persistence.PersistenceContext;
 import java.io.Serializable;
 import java.util.List;
 

persistence-modules/spring-jpa-2/src/main/java/com/baeldung/spring/dao/generics/Foo.java

@@ -2,7 +2,7 @@ package com.baeldung.spring.dao.generics;
 
 import org.hibernate.annotations.CacheConcurrencyStrategy;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.io.Serializable;
 
 @Entity

persistence-modules/spring-jpa-2/src/main/java/com/baeldung/spring/hibernate/Foo.java

@@ -1,6 +1,6 @@
 package com.baeldung.spring.hibernate;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.io.Serializable;
 
 @Entity

persistence-modules/spring-jpa-2/src/main/java/com/baeldung/spring/transaction/Course.java

@@ -2,10 +2,10 @@ package com.baeldung.spring.transaction;
 
 import java.io.Serializable;
 
-import javax.persistence.Column;
+import jakarta.persistence.Column;
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
-import javax.persistence.Id;
+import jakarta.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Table;
 
 @Entity
 @Table(name = "course")

persistence-modules/spring-jpa-2/src/main/resources/persistence-mysql.properties

@@ -5,7 +5,7 @@ jdbc.user=tutorialuser
 jdbc.pass=tutorialmy5ql
 
 # hibernate.X
-hibernate.dialect=org.hibernate.dialect.MySQL5Dialect
+hibernate.dialect=org.hibernate.dialect.MySQLDialect
 hibernate.show_sql=false
 hibernate.hbm2ddl.auto=create-drop
 

persistence-modules/spring-jpa-2/src/test/java/com/baeldung/hibernate/bootstrap/HibernateBootstrapIntegrationTest.java

@@ -4,14 +4,12 @@ import com.baeldung.hibernate.bootstrap.model.TestEntity;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.junit.Assert;
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.annotation.Commit;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.support.AnnotationConfigContextLoader;
 import org.springframework.test.context.transaction.TestTransaction;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -33,7 +31,7 @@ public class HibernateBootstrapIntegrationTest {
 
         TestEntity newEntity = new TestEntity();
         newEntity.setId(1);
-        session.save(newEntity);
+        session.persist(newEntity);
 
         TestEntity searchEntity = session.find(TestEntity.class, 1);
 
@@ -49,7 +47,7 @@ public class HibernateBootstrapIntegrationTest {
 
         TestEntity newEntity = new TestEntity();
         newEntity.setId(1);
-        session.save(newEntity);
+        session.persist(newEntity);
 
         TestEntity searchEntity = session.find(TestEntity.class, 1);
 
@@ -74,7 +72,7 @@ public class HibernateBootstrapIntegrationTest {
 
         Assert.assertNotNull(searchEntity);
 
-        session.delete(searchEntity);
+        session.remove(searchEntity);
         session.flush();
 
         TestTransaction.end();
@@ -90,7 +88,7 @@ public class HibernateBootstrapIntegrationTest {
 
         Assert.assertNotNull(searchEntity);
 
-        session.delete(searchEntity);
+        session.remove(searchEntity);
         session.flush();
 
         assertTrue(TestTransaction.isActive());
@@ -121,7 +119,7 @@ public class HibernateBootstrapIntegrationTest {
 
         TestEntity newEntity = new TestEntity();
         newEntity.setId(1);
-        session.save(newEntity);
+        session.persist(newEntity);
 
         TestEntity searchEntity = session.find(TestEntity.class, 1);
 
@@ -145,7 +143,7 @@ public class HibernateBootstrapIntegrationTest {
 
         Assert.assertNotNull(searchEntity);
 
-        session.delete(searchEntity);
+        session.remove(searchEntity);
         session.flush();
 
         TestTransaction.flagForRollback();
@@ -162,7 +160,7 @@ public class HibernateBootstrapIntegrationTest {
 
         Assert.assertNotNull(searchEntity);
 
-        session.delete(searchEntity);
+        session.remove(searchEntity);
         session.flush();
 
         assertTrue(TestTransaction.isActive());

persistence-modules/spring-jpa-2/src/test/java/com/baeldung/hibernate/bootstrap/HibernateXMLBootstrapIntegrationTest.java

@@ -26,7 +26,7 @@ public class HibernateXMLBootstrapIntegrationTest {
 
         TestEntity newEntity = new TestEntity();
         newEntity.setId(1);
-        session.save(newEntity);
+        session.persist(newEntity);
 
         TestEntity searchEntity = session.find(TestEntity.class, 1);
 

persistence-modules/spring-jpa-2/src/test/java/com/baeldung/manytomany/ManyToManyIntegrationTest.java

@@ -11,8 +11,8 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
+import jakarta.persistence.PersistenceContext;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.notNullValue;

persistence-modules/spring-jpa-2/src/test/java/com/baeldung/manytomany/ManyToManyTestConfiguration.java

@@ -11,7 +11,7 @@ import org.springframework.orm.jpa.JpaVendorAdapter;
 import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
 import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
 
-import javax.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityManagerFactory;
 import javax.sql.DataSource;
 import java.util.HashMap;
 import java.util.Map;

persistence-modules/spring-jpa-2/src/test/java/com/baeldung/manytomanyremoval/BidirectionalRemovalUnitTest.java

@@ -10,7 +10,7 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = TestContextConfig.class)

persistence-modules/spring-jpa-2/src/test/java/com/baeldung/manytomanyremoval/UnidirectionalRemovalUnitTest.java

@@ -10,7 +10,7 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = TestContextConfig.class)

persistence-modules/spring-jpa/pom.xml

@@ -76,21 +76,21 @@
             <version>${hibernate-validator.version}</version>
         </dependency>
         <dependency>
-            <groupId>javax.el</groupId>
+            <groupId>org.glassfish.expressly</groupId>
-            <artifactId>javax.el-api</artifactId>
+            <artifactId>expressly</artifactId>
-            <version>${javax.el-api.version}</version>
+            <version>${expressly-language.version}</version>
         </dependency>
         <!-- web -->
         <dependency>
-            <groupId>javax.servlet</groupId>
+            <groupId>jakarta.servlet.jsp.jstl</groupId>
-            <artifactId>jstl</artifactId>
+            <artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
-            <version>${jstl.version}</version>
+            <version>${jakarta-servlet-jpa-jstl-api.version}</version>
         </dependency>
         <dependency>
-            <groupId>javax.servlet</groupId>
+            <groupId>jakarta.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <version>${jakarta.servlet-api.version}</version>
             <scope>provided</scope>
-            <version>${javax.servlet.servlet-api.version}</version>
         </dependency>
         <!-- utils -->
         <dependency>
@@ -115,17 +115,18 @@
 
     <properties>
         <!-- Spring -->
-        <org.springframework.version>5.1.5.RELEASE</org.springframework.version>
+        <org.springframework.version>6.0.6</org.springframework.version>
-        <javassist.version>3.21.0-GA</javassist.version>
+        <javassist.version>3.29.2-GA</javassist.version>
-        <mysql-connector-java.version>6.0.6</mysql-connector-java.version>
+        <mysql-connector-java.version>8.0.33</mysql-connector-java.version>
-        <spring-data-jpa.version>2.1.5.RELEASE</spring-data-jpa.version>
+        <spring-data-jpa.version>3.1.0</spring-data-jpa.version>
         <!-- web -->
-        <javax.servlet.servlet-api.version>2.5</javax.servlet.servlet-api.version>
+        <jakarta.servlet-api.version>6.0.0</jakarta.servlet-api.version>
         <!-- various -->
-        <hibernate-validator.version>6.0.15.Final</hibernate-validator.version>
+        <hibernate-validator.version>8.0.0.Final</hibernate-validator.version>
-        <xml-apis.version>1.4.01</xml-apis.version>
+        <xml-apis.version>2.0.2</xml-apis.version>
-        <javax.el-api.version>2.2.5</javax.el-api.version>
         <h2.version>2.1.214</h2.version>
+        <expressly-language.version>5.0.0</expressly-language.version>
+        <jakarta-servlet-jpa-jstl-api.version>3.0.0</jakarta-servlet-jpa-jstl-api.version>
     </properties>
 
 </project>

persistence-modules/spring-jpa/src/main/java/com/baeldung/annotations/Person.java

@@ -2,11 +2,11 @@ package com.baeldung.annotations;
 
 import java.util.Date;
 
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
-import javax.persistence.NamedStoredProcedureQueries;
+import jakarta.persistence.NamedStoredProcedureQueries;
-import javax.persistence.NamedStoredProcedureQuery;
+import jakarta.persistence.NamedStoredProcedureQuery;
-import javax.persistence.ParameterMode;
+import jakarta.persistence.ParameterMode;
-import javax.persistence.StoredProcedureParameter;
+import jakarta.persistence.StoredProcedureParameter;
 
 import com.baeldung.persistence.multiple.model.user.User;
 import org.springframework.data.annotation.CreatedBy;
@@ -16,13 +16,13 @@ import org.springframework.data.annotation.LastModifiedBy;
 import org.springframework.data.annotation.Transient;
 
 @Entity
-@NamedStoredProcedureQueries({ 
+@NamedStoredProcedureQueries({
     @NamedStoredProcedureQuery(
         name = "count_by_name", 
         procedureName = "person.count_by_name", 
         parameters = { 
                 @StoredProcedureParameter(
-                    mode = ParameterMode.IN, 
+                    mode = ParameterMode.IN,
                     name = "name", 
                     type = String.class),
                 @StoredProcedureParameter(

persistence-modules/spring-jpa/src/main/java/com/baeldung/annotations/PersonRepository.java

@@ -1,6 +1,6 @@
 package com.baeldung.annotations;
 
-import javax.persistence.LockModeType;
+import jakarta.persistence.LockModeType;
 
 import org.springframework.data.jpa.repository.Lock;
 import org.springframework.data.jpa.repository.Modifying;

persistence-modules/spring-jpa/src/main/java/com/baeldung/config/PersistenceJPAConfig.java

@@ -2,7 +2,7 @@ package com.baeldung.config;
 
 import java.util.Properties;
 
-import javax.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityManagerFactory;
 import javax.sql.DataSource;
 
 import org.springframework.beans.factory.annotation.Autowired;

persistence-modules/spring-jpa/src/main/java/com/baeldung/config/SpringWebConfig.java

@@ -4,14 +4,13 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 import org.springframework.web.servlet.view.InternalResourceViewResolver;
 import org.springframework.web.servlet.view.JstlView;
 
 @EnableWebMvc
 @Configuration
 @ComponentScan({ "com.baeldung.web" })
-public class SpringWebConfig extends WebMvcConfigurerAdapter {
+public class SpringWebConfig {
 
     @Bean
     public InternalResourceViewResolver viewResolver() {

persistence-modules/spring-jpa/src/main/java/com/baeldung/config/StudentJpaConfig.java

@@ -2,7 +2,7 @@ package com.baeldung.config;
 
 import java.util.Properties;
 
-import javax.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityManagerFactory;
 import javax.sql.DataSource;
 
 import org.springframework.beans.factory.annotation.Autowired;

persistence-modules/spring-jpa/src/main/java/com/baeldung/inmemory/persistence/model/KVTag.java

@@ -1,6 +1,6 @@
 package com.baeldung.inmemory.persistence.model;
 
-import javax.persistence.Embeddable;
+import jakarta.persistence.Embeddable;
 
 @Embeddable
 public class KVTag {

persistence-modules/spring-jpa/src/main/java/com/baeldung/inmemory/persistence/model/LocationTag.java

@@ -1,6 +1,6 @@
 package com.baeldung.inmemory.persistence.model;
 
-import javax.persistence.Embeddable;
+import jakarta.persistence.Embeddable;
 
 @Embeddable
 public class LocationTag {

persistence-modules/spring-jpa/src/main/java/com/baeldung/inmemory/persistence/model/ManyStudent.java

@@ -1,6 +1,6 @@
 package com.baeldung.inmemory.persistence.model;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.HashSet;
 import java.util.Set;
 

persistence-modules/spring-jpa/src/main/java/com/baeldung/inmemory/persistence/model/ManyTag.java

@@ -1,6 +1,6 @@
 package com.baeldung.inmemory.persistence.model;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.HashSet;
 import java.util.Set;
 

persistence-modules/spring-jpa/src/main/java/com/baeldung/inmemory/persistence/model/SkillTag.java

@@ -1,6 +1,6 @@
 package com.baeldung.inmemory.persistence.model;
 
-import javax.persistence.Embeddable;
+import jakarta.persistence.Embeddable;
 
 @Embeddable
 public class SkillTag {

persistence-modules/spring-jpa/src/main/java/com/baeldung/inmemory/persistence/model/Student.java

@@ -2,9 +2,9 @@ package com.baeldung.inmemory.persistence.model;
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.persistence.ElementCollection;
+import jakarta.persistence.ElementCollection;
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
-import javax.persistence.Id;
+import jakarta.persistence.Id;
 
 @Entity
 public class Student {

persistence-modules/spring-jpa/src/main/java/com/baeldung/persistence/dao/AbstractJpaDAO.java

@@ -3,8 +3,8 @@ package com.baeldung.persistence.dao;
 import java.io.Serializable;
 import java.util.List;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
+import jakarta.persistence.PersistenceContext;
 
 public abstract class AbstractJpaDAO<T extends Serializable> {
 

persistence-modules/spring-jpa/src/main/java/com/baeldung/persistence/model/Bar.java

@@ -3,15 +3,15 @@ package com.baeldung.persistence.model;
 import java.io.Serializable;
 import java.util.List;
 
-import javax.persistence.CascadeType;
+import jakarta.persistence.CascadeType;
-import javax.persistence.Column;
+import jakarta.persistence.Column;
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
-import javax.persistence.FetchType;
+import jakarta.persistence.FetchType;
-import javax.persistence.GeneratedValue;
+import jakarta.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
+import jakarta.persistence.GenerationType;
-import javax.persistence.Id;
+import jakarta.persistence.Id;
-import javax.persistence.OneToMany;
+import jakarta.persistence.OneToMany;
-import javax.persistence.OrderBy;
+import jakarta.persistence.OrderBy;
 
 @Entity
 public class Bar implements Serializable {

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

@@ -2,7 +2,7 @@ package com.baeldung.persistence.model;
 
 import org.hibernate.annotations.CacheConcurrencyStrategy;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.io.Serializable;
 
 @Entity

persistence-modules/spring-jpa/src/main/java/com/baeldung/persistence/multiple/model/user/Possession.java

@@ -1,6 +1,6 @@
 package com.baeldung.persistence.multiple.model.user;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 @Entity
 @Table(schema = "spring_jpa_user")

persistence-modules/spring-jpa/src/main/java/com/baeldung/persistence/multiple/model/user/User.java

@@ -1,6 +1,6 @@
 package com.baeldung.persistence.multiple.model.user;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.List;
 
 @Entity

persistence-modules/spring-jpa/src/main/java/com/baeldung/sqlfiles/Country.java

@@ -1,11 +1,11 @@
 package com.baeldung.sqlfiles;
 
-import static javax.persistence.GenerationType.IDENTITY;
+import static jakarta.persistence.GenerationType.IDENTITY;
 
-import javax.persistence.Column;
+import jakarta.persistence.Column;
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
-import javax.persistence.GeneratedValue;
+import jakarta.persistence.GeneratedValue;
-import javax.persistence.Id;
+import jakarta.persistence.Id;
 
 @Entity
 public class Country {

persistence-modules/spring-jpa/src/main/resources/persistence-mysql.properties

@@ -5,7 +5,7 @@ jdbc.user=tutorialuser
 jdbc.pass=tutorialmy5ql
 
 # hibernate.X
-hibernate.dialect=org.hibernate.dialect.MySQL5Dialect
+hibernate.dialect=org.hibernate.dialect.MySQLDialect
 hibernate.show_sql=false
 hibernate.hbm2ddl.auto=create-drop
 hibernate.cache.use_second_level_cache=false

persistence-modules/spring-jpa/src/main/resources/persistence-student.properties

@@ -3,7 +3,7 @@ jdbc.url=jdbc:mysql://localhost:3306/myDb
 jdbc.user=tutorialuser
 jdbc.pass=tutorialpass
 
-hibernate.dialect=org.hibernate.dialect.MySQL5Dialect
+hibernate.dialect=org.hibernate.dialect.MySQLDialect
 hibernate.show_sql=false
 hibernate.hbm2ddl.auto=create-drop
 

persistence-modules/spring-jpa/src/test/java/META-INF/persistence.xml

@@ -6,11 +6,11 @@
         <class>com.baeldung.persistence.model.Foo</class>
         <class>com.baeldung.persistence.model.Bar</class>
         <properties>
-            <property name="javax.persistence.jdbc.user" value="root"/>
+            <property name="jakarta.persistence.jdbc.user" value="root"/>
-            <property name="javax.persistence.jdbc.driver" value="com.mysql.jdbc.Driver"/>
+            <property name="jakarta.persistence.jdbc.driver" value="com.mysql.jdbc.Driver"/>
-            <property name="javax.persistence.jdbc.url" value="jdbc:mysql://localhost:3306/HIBERTEST"/>
+            <property name="jakarta.persistence.jdbc.url" value="jdbc:mysql://localhost:3306/HIBERTEST"/>
-            <property name="javax.persistence.ddl-generation" value="drop-and-create-tables"/>
+            <property name="jakarta.persistence.ddl-generation" value="drop-and-create-tables"/>
-            <property name="javax.persistence.logging.level" value="INFO"/>
+            <property name="jakarta.persistence.logging.level" value="INFO"/>
             <property name="hibernate.show_sql" value="false"/>
             <property name="hibernate.cache.use_second_level_cache" value="false"/>
             <property name="hibernate.cache.use_query_cache" value="false"/>

persistence-modules/spring-jpa/src/test/java/com/baeldung/persistence/repository/AdvancedTaggingIntegrationTest.java

@@ -17,7 +17,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.support.AnnotationConfigContextLoader;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;

persistence-modules/spring-jpa/src/test/java/com/baeldung/persistence/repository/InMemoryDBIntegrationTest.java

@@ -11,7 +11,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.support.AnnotationConfigContextLoader;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 import java.util.Arrays;
 import java.util.List;

persistence-modules/spring-jpa/src/test/java/com/baeldung/persistence/service/FooPaginationPersistenceIntegrationTest.java

@@ -7,13 +7,13 @@ import static org.junit.Assert.assertThat;
 
 import java.util.List;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
+import jakarta.persistence.PersistenceContext;
-import javax.persistence.Query;
+import jakarta.persistence.Query;
-import javax.persistence.TypedQuery;
+import jakarta.persistence.TypedQuery;
-import javax.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Root;
+import jakarta.persistence.criteria.Root;
 
 import com.baeldung.config.PersistenceJPAConfig;
 import com.baeldung.persistence.model.Foo;

persistence-modules/spring-jpa/src/test/java/com/baeldung/persistence/service/FooServiceSortingIntegrationTest.java

@@ -2,13 +2,13 @@ package com.baeldung.persistence.service;
 
 import java.util.List;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
+import jakarta.persistence.PersistenceContext;
-import javax.persistence.Query;
+import jakarta.persistence.Query;
-import javax.persistence.TypedQuery;
+import jakarta.persistence.TypedQuery;
-import javax.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Root;
+import jakarta.persistence.criteria.Root;
 
 import com.baeldung.config.PersistenceJPAConfig;
 import com.baeldung.persistence.model.Bar;

persistence-modules/spring-jpa/src/test/java/com/baeldung/persistence/service/FooServiceSortingWitNullsManualIntegrationTest.java

@@ -5,9 +5,9 @@ import static org.junit.Assert.assertNull;
 
 import java.util.List;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
+import jakarta.persistence.PersistenceContext;
-import javax.persistence.Query;
+import jakarta.persistence.Query;
 
 import com.baeldung.config.PersistenceJPAConfig;
 import com.baeldung.persistence.model.Foo;