Upgrade to Spring Boot 3.2, including Javax -> Jakarta migration.

michael-simons · Nov 24, 2023 · 375794d · 375794d
1 parent a10fe3f
commit 375794d
Show file tree

Hide file tree

Showing 53 changed files with 257 additions and 273 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>2.7.13</version>
+    <version>3.2.0</version>
     <relativePath />
   </parent>
 
@@ -45,13 +45,13 @@
     <maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
     <build-date>${maven.build.timestamp}</build-date>
 
+    <activemq.version>6.0.0</activemq.version>
     <asciidoctor-maven-plugin.version>2.1.0</asciidoctor-maven-plugin.version>
     <bootstrap.version>3.1.1</bootstrap.version>
     <checkstyle.version>8.42</checkstyle.version>
     <jacoco-maven-plugin.version>0.8.7</jacoco-maven-plugin.version>
     <java.version>17</java.version>
     <jool.version>0.9.14</jool.version>
-    <jooq.version>3.16.6</jooq.version>
     <joor.version>0.9.14</joor.version>
     <jqassistant.version>1.10.1</jqassistant.version>
     <jqassistant.plugin.version>1.10.1</jqassistant.plugin.version>
@@ -66,7 +66,7 @@
     <momentjs.version>2.10.6</momentjs.version>
     <sockjs-client.version>1.0.2</sockjs-client.version>
     <stomp-websocket.version>2.3.3</stomp-websocket.version>
-    <wro4j-spring-boot-starter.version>0.11.1</wro4j-spring-boot-starter.version>
+    <wro4j-spring-boot-starter.version>0.12.2</wro4j-spring-boot-starter.version>
 
     <start-class>ac.simons.biking2.Application</start-class>
 
@@ -79,39 +79,6 @@
     <db.username>sa</db.username>
   </properties>
 
-  <dependencyManagement>
-    <dependencies>
-      <!-- ActiveMQ seems to have this in different versions in provided scope and our enforcer rules fail... -->
-      <dependency>
-        <groupId>org.apache.zookeeper</groupId>
-        <artifactId>zookeeper</artifactId>
-        <version>3.4.14</version>
-      </dependency>
-      <!-- Zookeeper and Hibernate Java 8 issues -->
-      <dependency>
-        <groupId>log4j</groupId>
-        <artifactId>log4j</artifactId>
-        <version>1.2.17</version>
-      </dependency>
-      <!-- Again ActiveMQ -->
-      <dependency>
-        <groupId>org.linkedin</groupId>
-        <artifactId>org.linkedin.util-core</artifactId>
-        <version>1.7.1</version>
-      </dependency>
-      <dependency>
-        <groupId>org.jboss.logging</groupId>
-        <artifactId>jboss-logging-annotations</artifactId>
-        <version>2.2.1.Final</version>
-      </dependency>
-      <dependency>
-        <groupId>org.jboss.logging</groupId>
-        <artifactId>jboss-logging-processor</artifactId>
-        <version>2.2.1.Final</version>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
   <dependencies>
     <dependency>
       <groupId>org.projectlombok</groupId>
@@ -176,11 +143,6 @@
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-jooq</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.hibernate</groupId>
-      <artifactId>hibernate-java8</artifactId>
-      <version>${hibernate.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-actuator</artifactId>
@@ -196,16 +158,17 @@
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>javax.xml.bind</groupId>
-      <artifactId>jaxb-api</artifactId>
+      <groupId>jakarta.xml.bind</groupId>
+      <artifactId>jakarta.xml.bind-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.glassfish.jaxb</groupId>
-      <artifactId>jaxb-runtime</artifactId>
+      <groupId>com.sun.xml.bind</groupId>
+      <artifactId>jaxb-impl</artifactId>
+      <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.module</groupId>
-      <artifactId>jackson-module-jaxb-annotations</artifactId>
+      <artifactId>jackson-module-jakarta-xmlbind-annotations</artifactId>
     </dependency>
     <dependency>
       <groupId>org.jooq</groupId>
@@ -612,7 +575,7 @@
               <goal>analyze</goal>
             </goals>
             <configuration>
-              <failOnSeverity>MINOR</failOnSeverity>
+              <failOnSeverity>MAJOR</failOnSeverity>
             </configuration>
           </execution>
         </executions>

diff --git a/src/jqassistant/concepts_spring-data.adoc b/src/jqassistant/concepts_spring-data.adoc
@@ -1,5 +1,22 @@
 ==== Concepts related to Spring-Data
 
+Teaching old jQAssistant about Jakarta persistence
+
+[[concept:jakartaPersistence]]
+[source,cypher,role="concept",requiresConcepts="dependency:Package"]
+.Labels all types annotated with @jakarta.persistence.Entity with "Jpa" and "Entity".
+----
+MATCH
+  (t:Type)-[:ANNOTATED_BY]->()-[:OF_TYPE]->(a:Type)
+WHERE
+  a.fqn="jakarta.persistence.Entity"
+SET
+  t:Jpa:Entity
+RETURN
+  t AS JpaEntity
+----
+
+
 [[spring-data:Repository]]
 [source,cypher,role="concept",requiresConcepts="spring-data:ImplementedRepository"]
 .Returns all repositories.

diff --git a/src/main/java/ac/simons/biking2/banner/BannerController.java b/src/main/java/ac/simons/biking2/banner/BannerController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 michael-simons.eu.
+ * Copyright 2016-2023 michael-simons.eu.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
 import java.io.PrintStream;
 import java.nio.charset.StandardCharsets;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.AccessLevel;
 import lombok.RequiredArgsConstructor;
 import org.springframework.boot.Banner;

diff --git a/src/main/java/ac/simons/biking2/bikes/BikeCmd.java b/src/main/java/ac/simons/biking2/bikes/BikeCmd.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2021 michael-simons.eu.
+ * Copyright 2014-2023 michael-simons.eu.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,9 +21,9 @@
 import java.time.LocalDate;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import org.springframework.format.annotation.DateTimeFormat;
 
 /**

diff --git a/src/main/java/ac/simons/biking2/bikes/BikeEntity.java b/src/main/java/ac/simons/biking2/bikes/BikeEntity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2021 michael-simons.eu.
+ * Copyright 2014-2023 michael-simons.eu.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,20 +22,20 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Embeddable;
-import javax.persistence.Embedded;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderBy;
-import javax.persistence.Table;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.Embedded;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OrderBy;
+import jakarta.persistence.Table;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 
 import org.hibernate.annotations.Formula;
 import org.hibernate.validator.constraints.URL;

diff --git a/src/main/java/ac/simons/biking2/bikes/BikesController.java b/src/main/java/ac/simons/biking2/bikes/BikesController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2022 michael-simons.eu.
+ * Copyright 2014-2023 michael-simons.eu.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
 import java.util.List;
 import java.util.Locale;
 
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 
 import org.springframework.context.MessageSource;
 import org.springframework.context.support.MessageSourceAccessor;

diff --git a/src/main/java/ac/simons/biking2/bikes/LentMilageEntity.java b/src/main/java/ac/simons/biking2/bikes/LentMilageEntity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 michael-simons.eu.
+ * Copyright 2021-2023 michael-simons.eu.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,17 +20,17 @@
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
-import javax.validation.constraints.NotNull;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import jakarta.persistence.UniqueConstraint;
+import jakarta.validation.constraints.NotNull;
 
 import lombok.AccessLevel;
 import lombok.EqualsAndHashCode;

diff --git a/src/main/java/ac/simons/biking2/bikes/MilageEntity.java b/src/main/java/ac/simons/biking2/bikes/MilageEntity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2021 michael-simons.eu.
+ * Copyright 2014-2023 michael-simons.eu.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,17 +19,17 @@
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
-import javax.validation.constraints.NotNull;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import jakarta.persistence.UniqueConstraint;
+import jakarta.validation.constraints.NotNull;
 import lombok.AccessLevel;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;

diff --git a/src/main/java/ac/simons/biking2/bikes/NewMilageCmd.java b/src/main/java/ac/simons/biking2/bikes/NewMilageCmd.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2021 michael-simons.eu.
+ * Copyright 2014-2023 michael-simons.eu.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,8 +19,8 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import java.time.LocalDate;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Positive;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Positive;
 
 import org.springframework.format.annotation.DateTimeFormat;
 

diff --git a/src/main/java/ac/simons/biking2/bikes/StoryCmd.java b/src/main/java/ac/simons/biking2/bikes/StoryCmd.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 michael-simons.eu.
+ * Copyright 2015-2023 michael-simons.eu.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  */
 package ac.simons.biking2.bikes;
 
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
 import org.hibernate.validator.constraints.URL;
 
 /**

diff --git a/src/main/java/ac/simons/biking2/bikingpictures/BikingPictureEntity.java b/src/main/java/ac/simons/biking2/bikingpictures/BikingPictureEntity.java
@@ -20,14 +20,14 @@
 import java.time.ZonedDateTime;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import lombok.AccessLevel;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;

diff --git a/src/main/java/ac/simons/biking2/bikingpictures/BikingPicturesController.java b/src/main/java/ac/simons/biking2/bikingpictures/BikingPicturesController.java
@@ -20,8 +20,8 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.AccessLevel;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Sort;

diff --git a/src/main/java/ac/simons/biking2/bikingpictures/FetchBikingPicturesJob.java b/src/main/java/ac/simons/biking2/bikingpictures/FetchBikingPicturesJob.java
@@ -27,10 +27,10 @@
 import java.time.ZonedDateTime;
 import java.util.ArrayList;
 import java.util.List;
-import javax.annotation.PostConstruct;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
+import jakarta.annotation.PostConstruct;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Unmarshaller;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.context.annotation.Profile;
 import org.springframework.scheduling.annotation.Scheduled;