From a8e22616d56722fb515d4ed6818342ad731c9c3a Mon Sep 17 00:00:00 2001
From: Oliver Drotbohm <odrotbohm@vmware.com>
Date: Mon, 20 Sep 2021 23:13:21 +0200
Subject: [PATCH] Upgrade to 3.0 build parent and Spring Data Commons.

Remove JodaTime dependency as it's not supported anymore.
---
 pom.xml                                                    | 4 ++--
 .../spring-data-rest-tests-mongodb/pom.xml                 | 7 -------
 .../org/springframework/data/rest/tests/mongodb/User.java  | 1 -
 .../PersistentEntityToJsonSchemaConverterUnitTests.java    | 2 --
 4 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0266d62f7..bf95c34fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.data.build</groupId>
 		<artifactId>spring-data-parent</artifactId>
-		<version>2.6.0-SNAPSHOT</version>
+		<version>3.0.0-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 
@@ -28,7 +28,7 @@
 		<project.type>multi</project.type>
 		<dist.id>spring-data-rest</dist.id>
 
-		<springdata.commons>2.6.0-SNAPSHOT</springdata.commons>
+		<springdata.commons>3.0.0-SNAPSHOT</springdata.commons>
 		<springdata.jpa>2.6.0-SNAPSHOT</springdata.jpa>
 		<springdata.mongodb>3.3.0-SNAPSHOT</springdata.mongodb>
 		<springdata.geode>2.6.0-SNAPSHOT</springdata.geode>
diff --git a/spring-data-rest-tests/spring-data-rest-tests-mongodb/pom.xml b/spring-data-rest-tests/spring-data-rest-tests-mongodb/pom.xml
index c04756433..93a7c2032 100644
--- a/spring-data-rest-tests/spring-data-rest-tests-mongodb/pom.xml
+++ b/spring-data-rest-tests/spring-data-rest-tests-mongodb/pom.xml
@@ -59,13 +59,6 @@
 			<version>${querydsl}</version>
 		</dependency>
 
-		<dependency>
-			<groupId>joda-time</groupId>
-			<artifactId>joda-time</artifactId>
-			<version>${jodatime}</version>
-			<optional>true</optional>
-		</dependency>
-
 	</dependencies>
 
 	<build>
diff --git a/spring-data-rest-tests/spring-data-rest-tests-mongodb/src/main/java/org/springframework/data/rest/tests/mongodb/User.java b/spring-data-rest-tests/spring-data-rest-tests-mongodb/src/main/java/org/springframework/data/rest/tests/mongodb/User.java
index cf2f0bf4a..86a5a02df 100644
--- a/spring-data-rest-tests/spring-data-rest-tests-mongodb/src/main/java/org/springframework/data/rest/tests/mongodb/User.java
+++ b/spring-data-rest-tests/spring-data-rest-tests-mongodb/src/main/java/org/springframework/data/rest/tests/mongodb/User.java
@@ -48,7 +48,6 @@ public class User {
 	public Gender gender;
 	public @ReadOnlyProperty EmailAddress email;
 	public LocalDateTime java8DateTime;
-	public org.joda.time.LocalDateTime jodaDateTime;
 	public TypeWithPattern pattern;
 	public @DBRef(lazy = true) List<User> colleagues;
 	public @DBRef(lazy = true) User manager;
diff --git a/spring-data-rest-tests/spring-data-rest-tests-mongodb/src/test/java/org/springframework/data/rest/webmvc/json/PersistentEntityToJsonSchemaConverterUnitTests.java b/spring-data-rest-tests/spring-data-rest-tests-mongodb/src/test/java/org/springframework/data/rest/webmvc/json/PersistentEntityToJsonSchemaConverterUnitTests.java
index 93eaef24d..f66c8fc2f 100755
--- a/spring-data-rest-tests/spring-data-rest-tests-mongodb/src/test/java/org/springframework/data/rest/webmvc/json/PersistentEntityToJsonSchemaConverterUnitTests.java
+++ b/spring-data-rest-tests/spring-data-rest-tests-mongodb/src/test/java/org/springframework/data/rest/webmvc/json/PersistentEntityToJsonSchemaConverterUnitTests.java
@@ -128,8 +128,6 @@ class PersistentEntityToJsonSchemaConverterUnitTests {
 				new Constraint("$.definitions.address.requiredProperties[0]", is("zipCode"), "Lists nested required property"));
 		constraints.add(new Constraint("$.properties.gender.type", is("string"), "Enums are strings."));
 		constraints.add(new Constraint("$.properties.gender.enum", is(notNullValue()), "Exposes enum values."));
-		constraints
-				.add(new Constraint("$.properties.jodaDateTime.format", is("date-time"), "Exposes JodaTime dates in format."));
 		constraints
 				.add(new Constraint("$.properties.java8DateTime.format", is("date-time"), "Exposes Java 8 dates in format."));
 		constraints.add(new Constraint("$.properties.nicknames.type", is("array"), "Exposes collection of simple types."));