Skip to content

Commit bceea9e

Browse files
thomaswoehlkethomaswoehlke
committed
migrate spring-bootfrom 2 to 3
1 parent 5120a40 commit bceea9e

File tree

2 files changed

+158
-20
lines changed

2 files changed

+158
-20
lines changed

‎pom.xml‎

Lines changed: 156 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
34
<modelVersion>4.0.0</modelVersion>
45

56
<groupId>org.woehlke</groupId>
@@ -11,7 +12,7 @@
1112
<groupId>org.springframework.boot</groupId>
1213
<artifactId>spring-boot-starter-parent</artifactId>
1314
<version>3.0.1</version>
14-
<relativePath />
15+
<relativePath/>
1516
</parent>
1617

1718
<scm>
@@ -103,7 +104,8 @@
103104

104105
<!-- Docker -->
105106
<version.docker-compose-maven-plugin>4.0.0</version.docker-compose-maven-plugin>
106-
<docker-compose-maven-plugin.composeFile>${project.basedir}/docker-compose.yml</docker-compose-maven-plugin.composeFile>
107+
<docker-compose-maven-plugin.composeFile>${project.basedir}/docker-compose.yml
108+
</docker-compose-maven-plugin.composeFile>
107109
<docker-compose-maven-plugin.verbose>true</docker-compose-maven-plugin.verbose>
108110
<docker-compose-maven-plugin.removeImages>true</docker-compose-maven-plugin.removeImages>
109111
<docker-compose-maven-plugin.removeVolumes>true</docker-compose-maven-plugin.removeVolumes>
@@ -329,18 +331,18 @@
329331
<artifactId>postgresql</artifactId>
330332
<version>42.5.1</version>
331333
</dependency>
332-
<!--
333-
<dependency>
334-
<groupId>javax.xml.bind</groupId>
335-
<artifactId>jaxb-api</artifactId>
336-
<version>${javax-jaxb.version}</version>
337-
</dependency>
338-
<dependency>
339-
<groupId>net.sf.saxon</groupId>
340-
<artifactId>saxon-dom</artifactId>
341-
<version>8.7</version>
342-
</dependency>
343-
-->
334+
<!--
335+
<dependency>
336+
<groupId>javax.xml.bind</groupId>
337+
<artifactId>jaxb-api</artifactId>
338+
<version>${javax-jaxb.version}</version>
339+
</dependency>
340+
<dependency>
341+
<groupId>net.sf.saxon</groupId>
342+
<artifactId>saxon-dom</artifactId>
343+
<version>8.7</version>
344+
</dependency>
345+
-->
344346
<dependency>
345347
<groupId>org.glassfish.jaxb</groupId>
346348
<artifactId>jaxb-runtime</artifactId>
@@ -604,6 +606,23 @@
604606
<artifactId>snakeyaml</artifactId>
605607
<version>1.33</version>
606608
</dependency>
609+
<dependency>
610+
<groupId>org.hibernate.orm</groupId>
611+
<artifactId>hibernate-core</artifactId>
612+
<version>${hibernate.version}</version>
613+
<scope>compile</scope>
614+
<exclusions>
615+
<exclusion>
616+
<groupId>org.antlr</groupId>
617+
<artifactId>antlr-runtime4</artifactId>
618+
</exclusion>
619+
</exclusions>
620+
</dependency>
621+
<dependency>
622+
<groupId>org.antlr</groupId>
623+
<artifactId>antlr-runtime</artifactId>
624+
<version>3.5.3</version>
625+
</dependency>
607626
</dependencies>
608627
</dependencyManagement>
609628

@@ -766,10 +785,10 @@
766785
</dependency>
767786
-->
768787

769-
<dependency>
770-
<groupId>org.glassfish.jaxb</groupId>
771-
<artifactId>jaxb-runtime</artifactId>
772-
</dependency>
788+
<dependency>
789+
<groupId>org.glassfish.jaxb</groupId>
790+
<artifactId>jaxb-runtime</artifactId>
791+
</dependency>
773792

774793
<dependency>
775794
<groupId>org.junit.jupiter</groupId>
@@ -954,6 +973,124 @@
954973
<type>maven-plugin</type>
955974
<scope>provided</scope>
956975
</dependency>
976+
<!--
977+
<dependency>
978+
<groupId>org.hibernate.orm</groupId>
979+
<artifactId>hibernate-agroal</artifactId>
980+
</dependency>
981+
<dependency>
982+
<groupId>org.hibernate.orm</groupId>
983+
<artifactId>hibernate-ant</artifactId>
984+
</dependency>
985+
<dependency>
986+
<groupId>org.hibernate.orm</groupId>
987+
<artifactId>hibernate-c3p0</artifactId>
988+
</dependency>
989+
<dependency>
990+
<groupId>org.hibernate.orm</groupId>
991+
<artifactId>hibernate-community-dialects</artifactId>
992+
</dependency>
993+
-->
994+
<dependency>
995+
<groupId>org.hibernate.orm</groupId>
996+
<artifactId>hibernate-core</artifactId>
997+
<exclusions>
998+
<exclusion>
999+
<groupId>org.antlr</groupId>
1000+
<artifactId>antlr-runtime4</artifactId>
1001+
</exclusion>
1002+
</exclusions>
1003+
</dependency>
1004+
<!--
1005+
<dependency>
1006+
<groupId>org.hibernate.orm</groupId>
1007+
<artifactId>hibernate-envers</artifactId>
1008+
</dependency>
1009+
-->
1010+
<dependency>
1011+
<groupId>org.hibernate.orm</groupId>
1012+
<artifactId>hibernate-hikaricp</artifactId>
1013+
<exclusions>
1014+
<exclusion>
1015+
<groupId>org.antlr</groupId>
1016+
<artifactId>antlr-runtime4</artifactId>
1017+
</exclusion>
1018+
</exclusions>
1019+
</dependency>
1020+
<!--
1021+
<dependency>
1022+
<groupId>org.hibernate.orm</groupId>
1023+
<artifactId>hibernate-jcache</artifactId>
1024+
</dependency>
1025+
-->
1026+
<dependency>
1027+
<groupId>org.hibernate.orm</groupId>
1028+
<artifactId>hibernate-jpamodelgen</artifactId>
1029+
<exclusions>
1030+
<exclusion>
1031+
<groupId>org.antlr</groupId>
1032+
<artifactId>antlr-runtime4</artifactId>
1033+
</exclusion>
1034+
</exclusions>
1035+
</dependency>
1036+
<!--
1037+
<dependency>
1038+
<groupId>org.hibernate.orm</groupId>
1039+
<artifactId>hibernate-proxool</artifactId>
1040+
</dependency>
1041+
-->
1042+
<dependency>
1043+
<groupId>org.hibernate.orm</groupId>
1044+
<artifactId>hibernate-testing</artifactId>
1045+
<exclusions>
1046+
<exclusion>
1047+
<groupId>junit</groupId>
1048+
<artifactId>junit</artifactId>
1049+
</exclusion>
1050+
<exclusion>
1051+
<groupId>org.jboss.remoting</groupId>
1052+
<artifactId>jboss-remoting</artifactId>
1053+
</exclusion>
1054+
<exclusion>
1055+
<groupId>org.wildfly.transaction</groupId>
1056+
<artifactId>wildfly-transaction-client-jakarta</artifactId>
1057+
</exclusion>
1058+
<exclusion>
1059+
<groupId>org.antlr</groupId>
1060+
<artifactId>antlr-runtime4</artifactId>
1061+
</exclusion>
1062+
</exclusions>
1063+
</dependency>
1064+
<!--
1065+
<dependency>
1066+
<groupId>org.hibernate.orm</groupId>
1067+
<artifactId>hibernate-vibur</artifactId>
1068+
</dependency>
1069+
-->
1070+
<dependency>
1071+
<groupId>org.hibernate.validator</groupId>
1072+
<artifactId>hibernate-validator</artifactId>
1073+
<exclusions>
1074+
<exclusion>
1075+
<groupId>org.antlr</groupId>
1076+
<artifactId>antlr-runtime4</artifactId>
1077+
</exclusion>
1078+
</exclusions>
1079+
</dependency>
1080+
<dependency>
1081+
<groupId>org.hibernate.validator</groupId>
1082+
<artifactId>hibernate-validator-annotation-processor</artifactId>
1083+
<exclusions>
1084+
<exclusion>
1085+
<groupId>org.antlr</groupId>
1086+
<artifactId>antlr-runtime4</artifactId>
1087+
</exclusion>
1088+
</exclusions>
1089+
</dependency>
1090+
<dependency>
1091+
<groupId>org.antlr</groupId>
1092+
<artifactId>antlr-runtime</artifactId>
1093+
</dependency>
9571094
</dependencies>
9581095

9591096
<build>

‎src/main/java/org/woehlke/java/simpleworklist/domain/db/user/UserAccount.java‎

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

33
import jakarta.validation.constraints.Email;
44

5+
import jakarta.validation.constraints.NotBlank;
56
import lombok.EqualsAndHashCode;
67
import lombok.Getter;
78
import lombok.Setter;
@@ -17,7 +18,7 @@
1718

1819
import jakarta.persistence.*;
1920
import jakarta.persistence.Index;
20-
import jakarta.validation.constraints.NotBlank;
21+
2122

2223
@Entity
2324
@Table(

0 commit comments

Comments
 (0)