Skip to content

Commit 375794d

Browse files
michael-simonsmichael-simons
committed
Upgrade to Spring Boot 3.2, including Javax -> Jakarta migration.
1 parent a10fe3f commit 375794d

Some content is hidden

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

53 files changed

+257
-273
lines changed

‎pom.xml‎

Lines changed: 10 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.springframework.boot</groupId>
77
<artifactId>spring-boot-starter-parent</artifactId>
8-
<version>2.7.13</version>
8+
<version>3.2.0</version>
99
<relativePath />
1010
</parent>
1111

@@ -45,13 +45,13 @@
4545
<maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
4646
<build-date>${maven.build.timestamp}</build-date>
4747

48+
<activemq.version>6.0.0</activemq.version>
4849
<asciidoctor-maven-plugin.version>2.1.0</asciidoctor-maven-plugin.version>
4950
<bootstrap.version>3.1.1</bootstrap.version>
5051
<checkstyle.version>8.42</checkstyle.version>
5152
<jacoco-maven-plugin.version>0.8.7</jacoco-maven-plugin.version>
5253
<java.version>17</java.version>
5354
<jool.version>0.9.14</jool.version>
54-
<jooq.version>3.16.6</jooq.version>
5555
<joor.version>0.9.14</joor.version>
5656
<jqassistant.version>1.10.1</jqassistant.version>
5757
<jqassistant.plugin.version>1.10.1</jqassistant.plugin.version>
@@ -66,7 +66,7 @@
6666
<momentjs.version>2.10.6</momentjs.version>
6767
<sockjs-client.version>1.0.2</sockjs-client.version>
6868
<stomp-websocket.version>2.3.3</stomp-websocket.version>
69-
<wro4j-spring-boot-starter.version>0.11.1</wro4j-spring-boot-starter.version>
69+
<wro4j-spring-boot-starter.version>0.12.2</wro4j-spring-boot-starter.version>
7070

7171
<start-class>ac.simons.biking2.Application</start-class>
7272

@@ -79,39 +79,6 @@
7979
<db.username>sa</db.username>
8080
</properties>
8181

82-
<dependencyManagement>
83-
<dependencies>
84-
<!-- ActiveMQ seems to have this in different versions in provided scope and our enforcer rules fail... -->
85-
<dependency>
86-
<groupId>org.apache.zookeeper</groupId>
87-
<artifactId>zookeeper</artifactId>
88-
<version>3.4.14</version>
89-
</dependency>
90-
<!-- Zookeeper and Hibernate Java 8 issues -->
91-
<dependency>
92-
<groupId>log4j</groupId>
93-
<artifactId>log4j</artifactId>
94-
<version>1.2.17</version>
95-
</dependency>
96-
<!-- Again ActiveMQ -->
97-
<dependency>
98-
<groupId>org.linkedin</groupId>
99-
<artifactId>org.linkedin.util-core</artifactId>
100-
<version>1.7.1</version>
101-
</dependency>
102-
<dependency>
103-
<groupId>org.jboss.logging</groupId>
104-
<artifactId>jboss-logging-annotations</artifactId>
105-
<version>2.2.1.Final</version>
106-
</dependency>
107-
<dependency>
108-
<groupId>org.jboss.logging</groupId>
109-
<artifactId>jboss-logging-processor</artifactId>
110-
<version>2.2.1.Final</version>
111-
</dependency>
112-
</dependencies>
113-
</dependencyManagement>
114-
11582
<dependencies>
11683
<dependency>
11784
<groupId>org.projectlombok</groupId>
@@ -176,11 +143,6 @@
176143
<groupId>org.springframework.boot</groupId>
177144
<artifactId>spring-boot-starter-jooq</artifactId>
178145
</dependency>
179-
<dependency>
180-
<groupId>org.hibernate</groupId>
181-
<artifactId>hibernate-java8</artifactId>
182-
<version>${hibernate.version}</version>
183-
</dependency>
184146
<dependency>
185147
<groupId>org.springframework.boot</groupId>
186148
<artifactId>spring-boot-starter-actuator</artifactId>
@@ -196,16 +158,17 @@
196158
<optional>true</optional>
197159
</dependency>
198160
<dependency>
199-
<groupId>javax.xml.bind</groupId>
200-
<artifactId>jaxb-api</artifactId>
161+
<groupId>jakarta.xml.bind</groupId>
162+
<artifactId>jakarta.xml.bind-api</artifactId>
201163
</dependency>
202164
<dependency>
203-
<groupId>org.glassfish.jaxb</groupId>
204-
<artifactId>jaxb-runtime</artifactId>
165+
<groupId>com.sun.xml.bind</groupId>
166+
<artifactId>jaxb-impl</artifactId>
167+
<scope>runtime</scope>
205168
</dependency>
206169
<dependency>
207170
<groupId>com.fasterxml.jackson.module</groupId>
208-
<artifactId>jackson-module-jaxb-annotations</artifactId>
171+
<artifactId>jackson-module-jakarta-xmlbind-annotations</artifactId>
209172
</dependency>
210173
<dependency>
211174
<groupId>org.jooq</groupId>
@@ -612,7 +575,7 @@
612575
<goal>analyze</goal>
613576
</goals>
614577
<configuration>
615-
<failOnSeverity>MINOR</failOnSeverity>
578+
<failOnSeverity>MAJOR</failOnSeverity>
616579
</configuration>
617580
</execution>
618581
</executions>

‎src/jqassistant/concepts_spring-data.adoc‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,22 @@
11
==== Concepts related to Spring-Data
22

3+
Teaching old jQAssistant about Jakarta persistence
4+
5+
[[concept:jakartaPersistence]]
6+
[source,cypher,role="concept",requiresConcepts="dependency:Package"]
7+
.Labels all types annotated with @jakarta.persistence.Entity with "Jpa" and "Entity".
8+
----
9+
MATCH
10+
(t:Type)-[:ANNOTATED_BY]->()-[:OF_TYPE]->(a:Type)
11+
WHERE
12+
a.fqn="jakarta.persistence.Entity"
13+
SET
14+
t:Jpa:Entity
15+
RETURN
16+
t AS JpaEntity
17+
----
18+
19+
320
[[spring-data:Repository]]
421
[source,cypher,role="concept",requiresConcepts="spring-data:ImplementedRepository"]
522
.Returns all repositories.

‎src/main/java/ac/simons/biking2/banner/BannerController.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2016-2018 michael-simons.eu.
2+
* Copyright 2016-2023 michael-simons.eu.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
2121
import java.io.PrintStream;
2222
import java.nio.charset.StandardCharsets;
2323

24-
import javax.servlet.http.HttpServletResponse;
24+
import jakarta.servlet.http.HttpServletResponse;
2525
import lombok.AccessLevel;
2626
import lombok.RequiredArgsConstructor;
2727
import org.springframework.boot.Banner;

‎src/main/java/ac/simons/biking2/bikes/BikeCmd.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2014-2021 michael-simons.eu.
2+
* Copyright 2014-2023 michael-simons.eu.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -21,9 +21,9 @@
2121
import java.time.LocalDate;
2222
import java.time.ZoneId;
2323
import java.time.ZonedDateTime;
24-
import javax.validation.constraints.NotBlank;
25-
import javax.validation.constraints.NotNull;
26-
import javax.validation.constraints.Size;
24+
import jakarta.validation.constraints.NotBlank;
25+
import jakarta.validation.constraints.NotNull;
26+
import jakarta.validation.constraints.Size;
2727
import org.springframework.format.annotation.DateTimeFormat;
2828

2929
/**

‎src/main/java/ac/simons/biking2/bikes/BikeEntity.java‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2014-2021 michael-simons.eu.
2+
* Copyright 2014-2023 michael-simons.eu.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -22,20 +22,20 @@
2222
import java.util.ArrayList;
2323
import java.util.List;
2424

25-
import javax.persistence.CascadeType;
26-
import javax.persistence.Column;
27-
import javax.persistence.Embeddable;
28-
import javax.persistence.Embedded;
29-
import javax.persistence.Entity;
30-
import javax.persistence.GeneratedValue;
31-
import javax.persistence.GenerationType;
32-
import javax.persistence.Id;
33-
import javax.persistence.OneToMany;
34-
import javax.persistence.OrderBy;
35-
import javax.persistence.Table;
36-
import javax.validation.constraints.NotBlank;
37-
import javax.validation.constraints.NotNull;
38-
import javax.validation.constraints.Size;
25+
import jakarta.persistence.CascadeType;
26+
import jakarta.persistence.Column;
27+
import jakarta.persistence.Embeddable;
28+
import jakarta.persistence.Embedded;
29+
import jakarta.persistence.Entity;
30+
import jakarta.persistence.GeneratedValue;
31+
import jakarta.persistence.GenerationType;
32+
import jakarta.persistence.Id;
33+
import jakarta.persistence.OneToMany;
34+
import jakarta.persistence.OrderBy;
35+
import jakarta.persistence.Table;
36+
import jakarta.validation.constraints.NotBlank;
37+
import jakarta.validation.constraints.NotNull;
38+
import jakarta.validation.constraints.Size;
3939

4040
import org.hibernate.annotations.Formula;
4141
import org.hibernate.validator.constraints.URL;

‎src/main/java/ac/simons/biking2/bikes/BikesController.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2014-2022 michael-simons.eu.
2+
* Copyright 2014-2023 michael-simons.eu.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
2121
import java.util.List;
2222
import java.util.Locale;
2323

24-
import javax.validation.Valid;
24+
import jakarta.validation.Valid;
2525

2626
import org.springframework.context.MessageSource;
2727
import org.springframework.context.support.MessageSourceAccessor;

‎src/main/java/ac/simons/biking2/bikes/LentMilageEntity.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2021 michael-simons.eu.
2+
* Copyright 2021-2023 michael-simons.eu.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -20,17 +20,17 @@
2020
import java.time.LocalDate;
2121
import java.time.OffsetDateTime;
2222

23-
import javax.persistence.Column;
24-
import javax.persistence.Entity;
25-
import javax.persistence.FetchType;
26-
import javax.persistence.GeneratedValue;
27-
import javax.persistence.GenerationType;
28-
import javax.persistence.Id;
29-
import javax.persistence.JoinColumn;
30-
import javax.persistence.ManyToOne;
31-
import javax.persistence.Table;
32-
import javax.persistence.UniqueConstraint;
33-
import javax.validation.constraints.NotNull;
23+
import jakarta.persistence.Column;
24+
import jakarta.persistence.Entity;
25+
import jakarta.persistence.FetchType;
26+
import jakarta.persistence.GeneratedValue;
27+
import jakarta.persistence.GenerationType;
28+
import jakarta.persistence.Id;
29+
import jakarta.persistence.JoinColumn;
30+
import jakarta.persistence.ManyToOne;
31+
import jakarta.persistence.Table;
32+
import jakarta.persistence.UniqueConstraint;
33+
import jakarta.validation.constraints.NotNull;
3434

3535
import lombok.AccessLevel;
3636
import lombok.EqualsAndHashCode;

‎src/main/java/ac/simons/biking2/bikes/MilageEntity.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2014-2021 michael-simons.eu.
2+
* Copyright 2014-2023 michael-simons.eu.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -19,17 +19,17 @@
1919
import java.math.BigDecimal;
2020
import java.time.LocalDate;
2121
import java.time.OffsetDateTime;
22-
import javax.persistence.Column;
23-
import javax.persistence.Entity;
24-
import javax.persistence.FetchType;
25-
import javax.persistence.GeneratedValue;
26-
import javax.persistence.GenerationType;
27-
import javax.persistence.Id;
28-
import javax.persistence.JoinColumn;
29-
import javax.persistence.ManyToOne;
30-
import javax.persistence.Table;
31-
import javax.persistence.UniqueConstraint;
32-
import javax.validation.constraints.NotNull;
22+
import jakarta.persistence.Column;
23+
import jakarta.persistence.Entity;
24+
import jakarta.persistence.FetchType;
25+
import jakarta.persistence.GeneratedValue;
26+
import jakarta.persistence.GenerationType;
27+
import jakarta.persistence.Id;
28+
import jakarta.persistence.JoinColumn;
29+
import jakarta.persistence.ManyToOne;
30+
import jakarta.persistence.Table;
31+
import jakarta.persistence.UniqueConstraint;
32+
import jakarta.validation.constraints.NotNull;
3333
import lombok.AccessLevel;
3434
import lombok.EqualsAndHashCode;
3535
import lombok.Getter;

‎src/main/java/ac/simons/biking2/bikes/NewMilageCmd.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2014-2021 michael-simons.eu.
2+
* Copyright 2014-2023 michael-simons.eu.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -19,8 +19,8 @@
1919

2020
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
2121
import java.time.LocalDate;
22-
import javax.validation.constraints.NotNull;
23-
import javax.validation.constraints.Positive;
22+
import jakarta.validation.constraints.NotNull;
23+
import jakarta.validation.constraints.Positive;
2424

2525
import org.springframework.format.annotation.DateTimeFormat;
2626

‎src/main/java/ac/simons/biking2/bikes/StoryCmd.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2015-2021 michael-simons.eu.
2+
* Copyright 2015-2023 michael-simons.eu.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
1515
*/
1616
package ac.simons.biking2.bikes;
1717

18-
import javax.validation.constraints.NotBlank;
18+
import jakarta.validation.constraints.NotBlank;
1919
import org.hibernate.validator.constraints.URL;
2020

2121
/**

0 commit comments

Comments
 (0)