Assert compatibility with MongoDB 6.0.

mp911de · mp911de · commit 5f16aecd1347 · 2022-08-17T10:42:57.000+02:00
Closes #4138
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -58,6 +58,25 @@ pipeline {
 						}
 					}
 				}
+				stage('Publish JDK (Java 17) + MongoDB 6.0') {
+					when {
+						anyOf {
+							changeset "ci/openjdk17-mongodb-6.0/**"
+							changeset "ci/pipeline.properties"
+						}
+					}
+					agent { label 'data' }
+					options { timeout(time: 30, unit: 'MINUTES') }
+
+					steps {
+						script {
+							def image = docker.build("springci/spring-data-with-mongodb-6.0:${p['java.main.tag']}", "--build-arg BASE=${p['docker.java.main.image']} --build-arg MONGODB=${p['docker.mongodb.6.0.version']} ci/openjdk17-mongodb-6.0/")
+							docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
+								image.push()
+							}
+						}
+					}
+				}
 			}
 		}
 
@@ -100,7 +119,7 @@ pipeline {
 			}
 			parallel {
 
-				stage("test: mongodb 5.0 (Java 17)") {
+				stage("test: MongoDB 5.0 (Java 17)") {
 					agent {
 						label 'data'
 					}
@@ -121,6 +140,28 @@ pipeline {
 						}
 					}
 				}
+
+				stage("test: MongoDB 6.0 (Java 17)") {
+					agent {
+						label 'data'
+					}
+					options { timeout(time: 30, unit: 'MINUTES') }
+					environment {
+						ARTIFACTORY = credentials("${p['artifactory.credentials']}")
+					}
+					steps {
+						script {
+							docker.image("harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-mongodb-6.0:${p['java.main.tag']}").inside(p['docker.java.inside.basic']) {
+								sh 'mkdir -p /tmp/mongodb/db /tmp/mongodb/log'
+								sh 'mongod --setParameter transactionLifetimeLimitSeconds=90 --setParameter maxTransactionLockRequestTimeoutMillis=10000 --dbpath /tmp/mongodb/db --replSet rs0 --fork --logpath /tmp/mongodb/log/mongod.log &'
+								sh 'sleep 10'
+								sh 'mongo --eval "rs.initiate({_id: \'rs0\', members:[{_id: 0, host: \'127.0.0.1:27017\'}]});"'
+								sh 'sleep 15'
+								sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list test -Duser.name=jenkins -Dsort -U -B'
+							}
+						}
+					}
+				}
 			}
 		}
 
diff --git a/ci/openjdk17-mongodb-6.0/Dockerfile b/ci/openjdk17-mongodb-6.0/Dockerfile
@@ -0,0 +1,23 @@
+ARG BASE
+FROM ${BASE}
+# Any ARG statements before FROM are cleared.
+ARG MONGODB
+
+ENV TZ=Etc/UTC
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN set -eux && \
+	sed -i -e 's/archive.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list && \
+	sed -i -e 's/security.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list && \
+	sed -i -e 's/http/https/g' /etc/apt/sources.list && \
+	apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2 wget && \
+	# MongoDB 6.0 release signing key
+	wget -qO - https://www.mongodb.org/static/pgp/server-6.0.asc | apt-key add - && \
+	# Needed when MongoDB creates a 6.0 folder.
+	echo "deb [ arch=amd64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/6.0 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-6.0.list && \
+	echo ${TZ} > /etc/timezone
+
+RUN apt-get update && \
+	apt-get install -y mongodb-org=${MONGODB} mongodb-org-server=${MONGODB} mongodb-org-shell=${MONGODB} mongodb-org-mongos=${MONGODB} mongodb-org-tools=${MONGODB} && \
+	apt-get clean && \
+	rm -rf /var/lib/apt/lists/*
diff --git a/ci/pipeline.properties b/ci/pipeline.properties
@@ -7,6 +7,7 @@ docker.java.main.image=harbor-repo.vmware.com/dockerhub-proxy-cache/library/ecli
 # Supported versions of MongoDB
 docker.mongodb.4.4.version=4.4.12
 docker.mongodb.5.0.version=5.0.6
+docker.mongodb.6.0.version=6.0.0
 
 # Supported versions of Redis
 docker.redis.6.version=6.2.6
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/AggregationTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/AggregationTests.java
@@ -17,7 +17,6 @@
 
 import static org.springframework.data.domain.Sort.Direction.*;
 import static org.springframework.data.mongodb.core.aggregation.Aggregation.*;
-import static org.springframework.data.mongodb.core.aggregation.Fields.*;
 import static org.springframework.data.mongodb.core.query.Criteria.*;
 import static org.springframework.data.mongodb.test.util.Assertions.*;
 
@@ -42,8 +41,6 @@
 import java.util.Scanner;
 import java.util.stream.Stream;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.assertj.core.data.Offset;
 import org.bson.Document;
 import org.junit.jupiter.api.AfterEach;
@@ -73,6 +70,7 @@
 import org.springframework.data.mongodb.core.query.NearQuery;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.repository.Person;
+import org.springframework.data.mongodb.test.util.EnableIfMongoServerVersion;
 import org.springframework.data.mongodb.test.util.MongoTemplateExtension;
 import org.springframework.data.mongodb.test.util.MongoTestTemplate;
 import org.springframework.data.mongodb.test.util.MongoVersion;
@@ -100,7 +98,6 @@
 public class AggregationTests {
 
 	private static final String INPUT_COLLECTION = "aggregation_test_collection";
-	private static final Log LOGGER = LogFactory.getLog(AggregationTests.class);
 
 	private static boolean initialized = false;
 
@@ -318,6 +315,7 @@ void shouldUnwindWithIndex() {
 	}
 
 	@Test // DATAMONGO-1391
+	@EnableIfMongoServerVersion(isLessThan = "6.0") // $sort does not seem to have an effect on $unwind
 	void shouldUnwindPreserveEmpty() {
 
 		MongoCollection<Document> coll = mongoTemplate.getCollection(INPUT_COLLECTION);
@@ -1375,7 +1373,8 @@ void shouldRetrieveDateTimeFragementsCorrectly() throws Exception {
 
 		mongoTemplate.dropCollection(ObjectWithDate.class);
 
-		ZonedDateTime dateTime = ZonedDateTime.of(LocalDateTime.of(LocalDate.of(2014, 2, 7), LocalTime.of(3, 4, 5, 6)), ZoneId.of("UTC"));
+		ZonedDateTime dateTime = ZonedDateTime.of(LocalDateTime.of(LocalDate.of(2014, 2, 7), LocalTime.of(3, 4, 5, 6)),
+				ZoneId.of("UTC"));
 
 		ObjectWithDate owd = new ObjectWithDate(Date.from(dateTime.toInstant()));
 		mongoTemplate.insert(owd);
@@ -1706,10 +1705,8 @@ void letShouldBeAppliedCorrectly() {
 				.forExpression(ConditionalOperators.Cond.when("applyDiscount").then(0.9D).otherwise(1.0D));
 
 		TypedAggregation<Sales2> agg = Aggregation.newAggregation(Sales2.class,
-				Aggregation.project()
-						.and(VariableOperators.Let.define(total, discounted).andApply(
-								ArithmeticOperators.valueOf("total").multiplyBy("discounted")))
-						.as("finalTotal"));
+				Aggregation.project().and(VariableOperators.Let.define(total, discounted)
+						.andApply(ArithmeticOperators.valueOf("total").multiplyBy("discounted"))).as("finalTotal"));
 
 		AggregationResults<Document> result = mongoTemplate.aggregate(agg, Document.class);
 		assertThat(result.getMappedResults()).contains(new Document("_id", "1").append("finalTotal", 9.450000000000001D),
diff --git a/src/main/asciidoc/preface.adoc b/src/main/asciidoc/preface.adoc
@@ -61,8 +61,8 @@ See also the https://www.mongodb.com/docs/drivers/java/sync/current/compatibilit
 
 |2022.0
 |4.0.x
-|4.6.x
-|5.0.x
+|4.7.x
+|6.0.x
 
 |2021.2
 |3.4.x

Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,25 @@ pipeline {`
`58`	`58`	`}`
`59`	`59`	`}`
`60`	`60`	`}`
	`61`	`+ stage('Publish JDK (Java 17) + MongoDB 6.0') {`
	`62`	`+ when {`
	`63`	`+ anyOf {`
	`64`	`+ changeset "ci/openjdk17-mongodb-6.0/**"`
	`65`	`+ changeset "ci/pipeline.properties"`
	`66`	`+ }`
	`67`	`+ }`
	`68`	`+ agent { label 'data' }`
	`69`	`+ options { timeout(time: 30, unit: 'MINUTES') }`
	`70`	`+`
	`71`	`+ steps {`
	`72`	`+ script {`
	`73`	`+ def image = docker.build("springci/spring-data-with-mongodb-6.0:${p['java.main.tag']}", "--build-arg BASE=${p['docker.java.main.image']} --build-arg MONGODB=${p['docker.mongodb.6.0.version']} ci/openjdk17-mongodb-6.0/")`
	`74`	`+ docker.withRegistry(p['docker.registry'], p['docker.credentials']) {`
	`75`	`+ image.push()`
	`76`	`+ }`
	`77`	`+ }`
	`78`	`+ }`
	`79`	`+ }`
`61`	`80`	`}`
`62`	`81`	`}`
`63`	`82`
`@@ -100,7 +119,7 @@ pipeline {`
`100`	`119`	`}`
`101`	`120`	`parallel {`
`102`	`121`
`103`		`- stage("test: mongodb 5.0 (Java 17)") {`
	`122`	`+ stage("test: MongoDB 5.0 (Java 17)") {`
`104`	`123`	`agent {`
`105`	`124`	`label 'data'`
`106`	`125`	`}`
`@@ -121,6 +140,28 @@ pipeline {`
`121`	`140`	`}`
`122`	`141`	`}`
`123`	`142`	`}`
	`143`	`+`
	`144`	`+ stage("test: MongoDB 6.0 (Java 17)") {`
	`145`	`+ agent {`
	`146`	`+ label 'data'`
	`147`	`+ }`
	`148`	`+ options { timeout(time: 30, unit: 'MINUTES') }`
	`149`	`+ environment {`
	`150`	`+ ARTIFACTORY = credentials("${p['artifactory.credentials']}")`
	`151`	`+ }`
	`152`	`+ steps {`
	`153`	`+ script {`
	`154`	`+ docker.image("harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-mongodb-6.0:${p['java.main.tag']}").inside(p['docker.java.inside.basic']) {`
	`155`	`+ sh 'mkdir -p /tmp/mongodb/db /tmp/mongodb/log'`
	`156`	`+ sh 'mongod --setParameter transactionLifetimeLimitSeconds=90 --setParameter maxTransactionLockRequestTimeoutMillis=10000 --dbpath /tmp/mongodb/db --replSet rs0 --fork --logpath /tmp/mongodb/log/mongod.log &'`
	`157`	`+ sh 'sleep 10'`
	`158`	`+ sh 'mongo --eval "rs.initiate({_id: \'rs0\', members:[{_id: 0, host: \'127.0.0.1:27017\'}]});"'`
	`159`	`+ sh 'sleep 15'`
	`160`	`+ sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list test -Duser.name=jenkins -Dsort -U -B'`
	`161`	`+ }`
	`162`	`+ }`
	`163`	`+ }`
	`164`	`+ }`
`124`	`165`	`}`
`125`	`166`	`}`
`126`	`167`
-Original file line number
+Diff line change
 |2022.0
 |4.0.x
 -|4.6.x
 -|5.0.x
 +|4.7.x
 +|6.0.x
 |2021.2
 |3.4.x