Test against Java 21 on CI.

Jenkinsfile

@@ -48,7 +48,7 @@ pipeline {
 			when {
 				beforeAgent(true)
 				allOf {
-					branch(pattern: "main|(\\d\\.\\d\\.x)", comparator: "REGEXP")
+					branch(pattern: "issue/gh-java21|main|(\\d\\.\\d\\.x)", comparator: "REGEXP")
 					not { triggeredBy 'UpstreamCause' }
 				}
 			}

ci/pipeline.properties

@@ -1,10 +1,10 @@
 # Java versions
 java.main.tag=17.0.6_10-jdk-focal
-java.next.tag=20-jdk-jammy
+java.next.tag=21-jdk-bullseye
 
 # Docker container images - standard
 docker.java.main.image=harbor-repo.vmware.com/dockerhub-proxy-cache/library/eclipse-temurin:${java.main.tag}
-docker.java.next.image=harbor-repo.vmware.com/dockerhub-proxy-cache/library/eclipse-temurin:${java.next.tag}
+docker.java.next.image=harbor-repo.vmware.com/dockerhub-proxy-cache/library/openjdk:${java.next.tag}
 
 # Supported versions of MongoDB
 docker.mongodb.4.4.version=4.4.18

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-jpa-parent</artifactId>
-	<version>3.2.0-SNAPSHOT</version>
+	<version>3.2.0-gh-java21-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>Spring Data JPA Parent</name>

spring-data-envers/pom.xml

@@ -5,12 +5,12 @@
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-envers</artifactId>
-	<version>3.2.0-SNAPSHOT</version>
+	<version>3.2.0-gh-java21-SNAPSHOT</version>
 
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-jpa-parent</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0-gh-java21-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

spring-data-envers/src/test/java/org/springframework/data/envers/sample/AbstractEntity.java

@@ -15,15 +15,13 @@
  */
 package org.springframework.data.envers.sample;
 
-import lombok.EqualsAndHashCode;
-
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
 import jakarta.persistence.MappedSuperclass;
 
 @MappedSuperclass
-@EqualsAndHashCode
 abstract class AbstractEntity {
 
 	public @Id @GeneratedValue Long id;
+
 }

spring-data-envers/src/test/java/org/springframework/data/envers/sample/Country.java

@@ -17,11 +17,10 @@
 
 import jakarta.persistence.Entity;
 
-import lombok.ToString;
-import org.hibernate.envers.Audited;
-
 import java.time.Instant;
 
+import org.hibernate.envers.Audited;
+
 /**
  * Sample domain class.
  *
@@ -31,12 +30,15 @@
  */
 @Audited
 @Entity
-@ToString
 public class Country extends AbstractEntity {
 
 	public String code;
 
 	public Instant timestamp;
 
 	public String name;
+
+	public String toString() {
+		return "Country(code=" + this.code + ", timestamp=" + this.timestamp + ", name=" + this.name + ")";
+	}
 }

spring-data-envers/src/test/java/org/springframework/data/envers/sample/License.java

@@ -15,12 +15,13 @@
  */
 package org.springframework.data.envers.sample;
 
-import java.util.Set;
-
 import jakarta.persistence.Entity;
 import jakarta.persistence.ManyToMany;
 import jakarta.persistence.Version;
 
+import java.util.Objects;
+import java.util.Set;
+
 import org.hibernate.envers.Audited;
 
 /**
@@ -32,10 +33,24 @@
 @Entity
 public class License extends AbstractEntity {
 
-	@Version
-	public Integer version;
+	@Version public Integer version;
 
 	public String name;
-	@ManyToMany
-	public Set<Country> laender;
+	@ManyToMany public Set<Country> laender;
+
+	@Override
+	public boolean equals(Object o) {
+
+		if (this == o)
+			return true;
+		if (o == null || getClass() != o.getClass())
+			return false;
+		License license = (License) o;
+		return Objects.equals(version, license.version) && Objects.equals(name, license.name);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(version, name);
+	}
 }

spring-data-jpa-distribution/pom.xml

@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-jpa-parent</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0-gh-java21-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

spring-data-jpa/pom.xml

@@ -6,7 +6,7 @@
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-jpa</artifactId>
-	<version>3.2.0-SNAPSHOT</version>
+	<version>3.2.0-gh-java21-SNAPSHOT</version>
 
 	<name>Spring Data JPA</name>
 	<description>Spring Data module for JPA repositories.</description>
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-jpa-parent</artifactId>
-		<version>3.2.0-SNAPSHOT</version>
+		<version>3.2.0-gh-java21-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

spring-data-jpa/src/test/java/org/springframework/data/jpa/domain/sample/AbstractMappedType.java

@@ -15,8 +15,6 @@
  */
 package org.springframework.data.jpa.domain.sample;
 
-import lombok.Getter;
-
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
 import jakarta.persistence.MappedSuperclass;
@@ -29,7 +27,8 @@
 @MappedSuperclass
 public abstract class AbstractMappedType {
 
-	@Id @GeneratedValue @Getter Long id;
+	@Id
+	@GeneratedValue Long id;
 	@Version Long version;
 	private String attribute1;
 
@@ -38,4 +37,8 @@ public abstract class AbstractMappedType {
 	AbstractMappedType(String attribute1) {
 		this.attribute1 = attribute1;
 	}
+
+	public Long getId() {
+		return this.id;
+	}
 }

spring-data-jpa/src/test/java/org/springframework/data/jpa/domain/sample/EmployeeWithName.java

@@ -18,25 +18,43 @@
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
-import lombok.AccessLevel;
-import lombok.Data;
-import lombok.NoArgsConstructor;
 
 /**
  * @author Greg Turnquist
  */
 @Entity
-@NoArgsConstructor(access = AccessLevel.PROTECTED)
-@Data
 public class EmployeeWithName {
 
 	@Id
-	@GeneratedValue private Integer id;
+	@GeneratedValue //
+	private Integer id;
 	private String name;
 
 	public EmployeeWithName(String name) {
 
 		this();
 		this.name = name;
 	}
+
+	protected EmployeeWithName() {}
+
+	public Integer getId() {
+		return this.id;
+	}
+
+	public String getName() {
+		return this.name;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String toString() {
+		return "EmployeeWithName(id=" + this.getId() + ", name=" + this.getName() + ")";
+	}
 }

spring-data-jpa/src/test/java/org/springframework/data/jpa/domain/sample/Item.java

@@ -21,8 +21,8 @@
 import jakarta.persistence.IdClass;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.Table;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
+
+import java.util.Objects;
 
 /**
  * @author Mark Paluch
@@ -32,13 +32,13 @@
 @Entity
 @Table
 @IdClass(ItemId.class)
-@EqualsAndHashCode
-@ToString
 public class Item {
 
-	@Id @Column(columnDefinition = "INT") private Integer id;
+	@Id
+	@Column(columnDefinition = "INT") private Integer id;
 
-	@Id @JoinColumn(name = "manufacturer_id", columnDefinition = "INT") private Integer manufacturerId;
+	@Id
+	@JoinColumn(name = "manufacturer_id", columnDefinition = "INT") private Integer manufacturerId;
 
 	private String name;
 
@@ -72,4 +72,25 @@ public void setName(String name) {
 		this.name = name;
 	}
 
+	@Override
+	public boolean equals(Object o) {
+
+		if (this == o)
+			return true;
+		if (o == null || getClass() != o.getClass())
+			return false;
+		Item item = (Item) o;
+		return Objects.equals(id, item.id) && Objects.equals(manufacturerId, item.manufacturerId)
+				&& Objects.equals(name, item.name);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(id, manufacturerId, name);
+	}
+
+	public String toString() {
+		return "Item(id=" + this.getId() + ", manufacturerId=" + this.getManufacturerId() + ", name=" + this.getName()
+				+ ")";
+	}
 }