Upgrade to Spring Boot 3.0 snapshots.

Upgrade to Jakarta Persistence 3.0 for all direct implementations. Upgrade to the latest jMolecules snapshots as they have got Jakarta Persistence 3.0 compatibility added.

Author: odrotbohm

server/pom.xml

@@ -12,7 +12,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.7.0</version>
+		<version>3.0.0-SNAPSHOT</version>
 	</parent>
 
 	<properties>

server/src/main/java/org/springsource/restbucks/core/MonetaryAmountAttributeConverter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,13 +15,14 @@
  */
 package org.springsource.restbucks.core;
 
+import jakarta.persistence.AttributeConverter;
+import jakarta.persistence.Converter;
+
 import java.util.Locale;
 
 import javax.money.MonetaryAmount;
 import javax.money.format.MonetaryAmountFormat;
 import javax.money.format.MonetaryFormats;
-import javax.persistence.AttributeConverter;
-import javax.persistence.Converter;
 
 import org.javamoney.moneta.Money;
 

server/src/main/java/org/springsource/restbucks/core/YearAttributeConverter.java

@@ -15,10 +15,10 @@
  */
 package org.springsource.restbucks.core;
 
-import java.time.Year;
+import jakarta.persistence.AttributeConverter;
+import jakarta.persistence.Converter;
 
-import javax.persistence.AttributeConverter;
-import javax.persistence.Converter;
+import java.time.Year;
 
 import org.hibernate.annotations.Immutable;
 

server/src/main/java/org/springsource/restbucks/order/Order.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,10 @@
  */
 package org.springsource.restbucks.order;
 
+import jakarta.persistence.Column;
+import jakarta.persistence.OrderColumn;
+import jakarta.persistence.Table;
+import jakarta.persistence.Version;
 import lombok.Getter;
 import lombok.ToString;
 import lombok.Value;
@@ -26,10 +30,6 @@
 import java.util.UUID;
 
 import javax.money.MonetaryAmount;
-import javax.persistence.Column;
-import javax.persistence.OrderColumn;
-import javax.persistence.Table;
-import javax.persistence.Version;
 
 import org.javamoney.moneta.Money;
 import org.jmolecules.ddd.types.AggregateRoot;

server/src/main/java/org/springsource/restbucks/order/web/LocationAndDrinks.java

@@ -15,13 +15,12 @@
  */
 package org.springsource.restbucks.order.web;
 
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
 import java.util.Collections;
 import java.util.List;
 
-import javax.validation.constraints.NotNull;
-
 import org.springsource.restbucks.drinks.Drink;
 import org.springsource.restbucks.order.Location;
 import org.springsource.restbucks.order.Order;

server/src/main/java/org/springsource/restbucks/payment/CreditCardNumber.java

@@ -15,12 +15,11 @@
  */
 package org.springsource.restbucks.payment;
 
+import jakarta.persistence.Column;
 import lombok.Value;
 
 import java.util.regex.Pattern;
 
-import javax.persistence.Column;
-
 import org.jmolecules.ddd.annotation.ValueObject;
 import org.jmolecules.ddd.types.Identifier;
 

server/src/main/java/org/springsource/restbucks/payment/CreditCardPayment.java

@@ -15,10 +15,9 @@
  */
 package org.springsource.restbucks.payment;
 
+import jakarta.persistence.ManyToOne;
 import lombok.Getter;
 
-import javax.persistence.ManyToOne;
-
 import org.springframework.util.Assert;
 import org.springsource.restbucks.order.Order;
 

server/src/main/java/org/springsource/restbucks/payment/Payment.java

@@ -15,6 +15,9 @@
  */
 package org.springsource.restbucks.payment;
 
+import jakarta.persistence.Column;
+import jakarta.persistence.Inheritance;
+import jakarta.persistence.InheritanceType;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
@@ -23,10 +26,6 @@
 import java.time.LocalDateTime;
 import java.util.UUID;
 
-import javax.persistence.Column;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
-
 import org.jmolecules.ddd.types.AggregateRoot;
 import org.jmolecules.ddd.types.Association;
 import org.jmolecules.ddd.types.Identifier;

server/src/main/java/org/springsource/restbucks/payment/web/PaymentLinks.java

@@ -15,6 +15,8 @@
  */
 package org.springsource.restbucks.payment.web;
 
+import lombok.Getter;
+
 import org.springframework.hateoas.Link;
 import org.springframework.hateoas.LinkRelation;
 import org.springframework.hateoas.mediatype.hal.HalLinkRelation;
@@ -27,8 +29,6 @@
 import org.springsource.restbucks.payment.Payment;
 import org.springsource.restbucks.payment.Payment.Receipt;
 
-import lombok.Getter;
-
 /**
  * Helper component to create links to the {@link Payment} and {@link Receipt}.
  *

server/src/test/java/org/springsource/restbucks/order/OrdersIntegrationTest.java

@@ -15,9 +15,9 @@
  */
 package org.springsource.restbucks.order;
 
-import static org.springsource.restbucks.order.OrderTestUtils.*;
 import static org.assertj.core.api.Assertions.*;
 import static org.springsource.restbucks.order.Order.Status.*;
+import static org.springsource.restbucks.order.OrderTestUtils.*;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;

server/src/test/java/org/springsource/restbucks/payment/web/PaymentOrderModelProcessorUnitTest.java

@@ -19,7 +19,7 @@
 import static org.mockito.Mockito.*;
 import static org.springsource.restbucks.order.Order.Status.*;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;