From 1065f4d5eda79c6a35c66ef3b00c1690aaea8c69 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@vmware.com>
Date: Mon, 12 Dec 2022 10:58:42 +0100
Subject: [PATCH] Upgrade to Spring Boot 3.0 GA.

Closes #654
---
 bom/pom.xml                |  4 ++--
 jpa/graalvm-native/pom.xml |  7 +------
 jpa/multitenant/pom.xml    | 33 +++++----------------------------
 pom.xml                    |  2 +-
 4 files changed, 9 insertions(+), 37 deletions(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index e7f169e3..73e301f9 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -9,8 +9,8 @@
 	<name>Spring Data - Using the BOM for dependency management</name>
 
 	<properties>
-		<spring.version>6.0.0-SNAPSHOT</spring.version>
-		<spring-data.version>2022.0.0-SNAPSHOT</spring-data.version>
+		<spring.version>6.0.0</spring.version>
+		<spring-data.version>2022.0.0</spring-data.version>
 	</properties>
 
 	<dependencyManagement>
diff --git a/jpa/graalvm-native/pom.xml b/jpa/graalvm-native/pom.xml
index 0b561899..a91305c6 100644
--- a/jpa/graalvm-native/pom.xml
+++ b/jpa/graalvm-native/pom.xml
@@ -9,6 +9,7 @@
 		<groupId>org.springframework.data.examples</groupId>
 		<artifactId>spring-data-examples</artifactId>
 		<version>2.0.0.BUILD-SNAPSHOT</version>
+		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
 	<name>Spring Data JPA - GraalVM Native Image</name>
@@ -24,12 +25,6 @@
 			<artifactId>h2</artifactId>
 			<scope>runtime</scope>
 		</dependency>
-
-		<dependency>
-			<groupId>jakarta.persistence</groupId>
-			<artifactId>jakarta.persistence-api</artifactId>
-			<version>3.0.0</version>
-		</dependency>
 	</dependencies>
 
 	<build>
diff --git a/jpa/multitenant/pom.xml b/jpa/multitenant/pom.xml
index 47ccf75b..b086e3d1 100644
--- a/jpa/multitenant/pom.xml
+++ b/jpa/multitenant/pom.xml
@@ -3,21 +3,20 @@
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<groupId>org.springframework.data.examples</groupId>
 	<artifactId>spring-data-jpa-hibernate-multitenant-examples</artifactId>
 	<version>2.0.0.BUILD-SNAPSHOT</version>
-
 	<packaging>pom</packaging>
 
 	<parent>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<groupId>org.springframework.data.examples</groupId>
+		<artifactId>spring-data-examples</artifactId>
+		<version>2.0.0.BUILD-SNAPSHOT</version>
+		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
 	<name>Hibernate Multitenant Examples</name>
 	<description>
-		A set of projects demonstrating how Hibernates Multitenant feature can be integrated with Spring Boot and Spring Data JPA.
+		A set of projects demonstrating how Hibernates Multitenant features can be integrated with Spring Boot and Spring Data JPA.
 	</description>
 
 	<modules>
@@ -26,26 +25,4 @@
 		<module>db</module>
 	</modules>
 
-
-	<repositories>
-		<repository>
-			<id>spring-milestones</id>
-			<name>Spring Milestones</name>
-			<url>https://repo.spring.io/milestone</url>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
-	</repositories>
-	<pluginRepositories>
-		<pluginRepository>
-			<id>spring-milestones</id>
-			<name>Spring Milestones</name>
-			<url>https://repo.spring.io/milestone</url>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</pluginRepository>
-	</pluginRepositories>
-
 </project>
diff --git a/pom.xml b/pom.xml
index d0ab3a73..a5bf543b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<version>3.0.0</version>
 	</parent>
 
 	<modules>