From 91a69b36f92836351ea069519a55180b46754d0c Mon Sep 17 00:00:00 2001 From: Marcus Da Coregio Date: Mon, 6 Dec 2021 10:05:41 -0300 Subject: [PATCH] Migrate java-configuration:data sample to new major version Spring Security 6.0.0-SNAPSHOT, SpringFramework 6.0.0-SNAPSHOT, Hibernate-core 6.0.0.Beta2 --- servlet/java-configuration/data/build.gradle | 13 ++++++------- .../data/src/main/java/example/Message.java | 12 ++++++------ .../data/src/main/java/example/User.java | 8 ++++---- 3 files changed, 16 insertions(+), 17 deletions(-) diff --git a/servlet/java-configuration/data/build.gradle b/servlet/java-configuration/data/build.gradle index d0456ff..d4cd613 100644 --- a/servlet/java-configuration/data/build.gradle +++ b/servlet/java-configuration/data/build.gradle @@ -9,20 +9,19 @@ repositories { } dependencies { - implementation platform("org.springframework:spring-framework-bom:5.3.0") - implementation platform("org.springframework.data:spring-data-releasetrain:Neumann-SR5") - implementation platform("org.springframework.security:spring-security-bom:5.5.0-SNAPSHOT") + implementation platform("org.springframework:spring-framework-bom:6.0.0-SNAPSHOT") + implementation platform("org.springframework.security:spring-security-bom:6.0.0-SNAPSHOT") implementation platform("org.junit:junit-bom:5.7.0") implementation "org.springframework.security:spring-security-config" implementation "org.springframework.security:spring-security-data" implementation "org.springframework.security:spring-security-web" implementation 'jakarta.validation:jakarta.validation-api:2.0.2' - implementation 'javax.persistence:javax.persistence-api:2.2' - implementation 'org.hibernate:hibernate-entitymanager:5.4.22.Final' - implementation 'org.hibernate.validator:hibernate-validator:6.1.6.Final' + implementation 'jakarta.persistence:jakarta.persistence-api:3.0.0' + implementation 'org.hibernate.orm:hibernate-core:6.0.0.Beta2' + implementation 'org.hibernate.validator:hibernate-validator:7.0.1.Final' implementation 'org.hsqldb:hsqldb:2.5.1' - implementation 'org.springframework.data:spring-data-jpa' + implementation 'org.springframework.data:spring-data-jpa:3.0.0-SNAPSHOT' testImplementation "org.assertj:assertj-core:3.18.0" testImplementation "org.springframework:spring-test" diff --git a/servlet/java-configuration/data/src/main/java/example/Message.java b/servlet/java-configuration/data/src/main/java/example/Message.java index 62f83f2..c9c0fb6 100644 --- a/servlet/java-configuration/data/src/main/java/example/Message.java +++ b/servlet/java-configuration/data/src/main/java/example/Message.java @@ -18,12 +18,12 @@ package example; import java.util.Calendar; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.validation.constraints.NotEmpty; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.validation.constraints.NotEmpty; @Entity public class Message { diff --git a/servlet/java-configuration/data/src/main/java/example/User.java b/servlet/java-configuration/data/src/main/java/example/User.java index 4785e64..2253b0a 100644 --- a/servlet/java-configuration/data/src/main/java/example/User.java +++ b/servlet/java-configuration/data/src/main/java/example/User.java @@ -16,10 +16,10 @@ package example; -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; /** * A user.