From 3312cab8da0fbbb2f1d7663894fc5405bebfc0b1 Mon Sep 17 00:00:00 2001
From: Christoph Strobl <christoph.strobl@broadcom.com>
Date: Wed, 7 Feb 2024 08:42:22 +0100
Subject: [PATCH 1/2] Prepare issue branch.

---
 pom.xml                                  | 2 +-
 spring-data-mongodb-benchmarks/pom.xml   | 2 +-
 spring-data-mongodb-distribution/pom.xml | 2 +-
 spring-data-mongodb/pom.xml              | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index a67ad87168..dfa506b822 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-mongodb-parent</artifactId>
-	<version>4.3.0-SNAPSHOT</version>
+	<version>4.2.x-4631-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>Spring Data MongoDB</name>
diff --git a/spring-data-mongodb-benchmarks/pom.xml b/spring-data-mongodb-benchmarks/pom.xml
index 34d95eb205..c25c62d909 100644
--- a/spring-data-mongodb-benchmarks/pom.xml
+++ b/spring-data-mongodb-benchmarks/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>4.3.0-SNAPSHOT</version>
+		<version>4.2.x-4631-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/spring-data-mongodb-distribution/pom.xml b/spring-data-mongodb-distribution/pom.xml
index 124a6bf5ad..152c6eb707 100644
--- a/spring-data-mongodb-distribution/pom.xml
+++ b/spring-data-mongodb-distribution/pom.xml
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>4.3.0-SNAPSHOT</version>
+		<version>4.2.x-4631-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/spring-data-mongodb/pom.xml b/spring-data-mongodb/pom.xml
index d319e29e8a..b7797737c1 100644
--- a/spring-data-mongodb/pom.xml
+++ b/spring-data-mongodb/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>4.3.0-SNAPSHOT</version>
+		<version>4.2.x-4631-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

From 22a0dfe1f8784435fe13e540f85f5e0fc008b82b Mon Sep 17 00:00:00 2001
From: Christoph Strobl <christoph.strobl@broadcom.com>
Date: Wed, 7 Feb 2024 09:07:43 +0100
Subject: [PATCH 2/2] Expose server version to build cache.

---
 ci/openjdk17-mongodb-4.4/Dockerfile | 1 +
 ci/openjdk17-mongodb-5.0/Dockerfile | 1 +
 ci/openjdk17-mongodb-6.0/Dockerfile | 1 +
 ci/openjdk17-mongodb-7.0/Dockerfile | 1 +
 ci/openjdk21-mongodb-6.0/Dockerfile | 1 +
 ci/openjdk21-mongodb-7.0/Dockerfile | 1 +
 spring-data-mongodb/pom.xml         | 2 ++
 7 files changed, 8 insertions(+)

diff --git a/ci/openjdk17-mongodb-4.4/Dockerfile b/ci/openjdk17-mongodb-4.4/Dockerfile
index 9cda8dd330..6768cad8bb 100644
--- a/ci/openjdk17-mongodb-4.4/Dockerfile
+++ b/ci/openjdk17-mongodb-4.4/Dockerfile
@@ -5,6 +5,7 @@ ARG MONGODB
 
 ENV TZ=Etc/UTC
 ENV DEBIAN_FRONTEND=noninteractive
+ENV MONGO_VERSION=${MONGODB}
 
 RUN set -eux; \
 	sed -i -e 's/archive.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list && \
diff --git a/ci/openjdk17-mongodb-5.0/Dockerfile b/ci/openjdk17-mongodb-5.0/Dockerfile
index dc949db948..a83fff1e0a 100644
--- a/ci/openjdk17-mongodb-5.0/Dockerfile
+++ b/ci/openjdk17-mongodb-5.0/Dockerfile
@@ -5,6 +5,7 @@ ARG MONGODB
 
 ENV TZ=Etc/UTC
 ENV DEBIAN_FRONTEND=noninteractive
+ENV MONGO_VERSION=${MONGODB}
 
 RUN set -eux; \
 	sed -i -e 's/archive.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list && \
diff --git a/ci/openjdk17-mongodb-6.0/Dockerfile b/ci/openjdk17-mongodb-6.0/Dockerfile
index ca838e4c04..fd2580e23a 100644
--- a/ci/openjdk17-mongodb-6.0/Dockerfile
+++ b/ci/openjdk17-mongodb-6.0/Dockerfile
@@ -5,6 +5,7 @@ ARG MONGODB
 
 ENV TZ=Etc/UTC
 ENV DEBIAN_FRONTEND=noninteractive
+ENV MONGO_VERSION=${MONGODB}
 
 RUN set -eux; \
 	sed -i -e 's/archive.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list && \
diff --git a/ci/openjdk17-mongodb-7.0/Dockerfile b/ci/openjdk17-mongodb-7.0/Dockerfile
index 0157cb0c49..5701ab9fbc 100644
--- a/ci/openjdk17-mongodb-7.0/Dockerfile
+++ b/ci/openjdk17-mongodb-7.0/Dockerfile
@@ -5,6 +5,7 @@ ARG MONGODB
 
 ENV TZ=Etc/UTC
 ENV DEBIAN_FRONTEND=noninteractive
+ENV MONGO_VERSION=${MONGODB}
 
 RUN set -eux; \
 	sed -i -e 's/archive.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list && \
diff --git a/ci/openjdk21-mongodb-6.0/Dockerfile b/ci/openjdk21-mongodb-6.0/Dockerfile
index 4e8dd53035..1e65983430 100644
--- a/ci/openjdk21-mongodb-6.0/Dockerfile
+++ b/ci/openjdk21-mongodb-6.0/Dockerfile
@@ -5,6 +5,7 @@ ARG MONGODB
 
 ENV TZ=Etc/UTC
 ENV DEBIAN_FRONTEND=noninteractive
+ENV MONGO_VERSION=${MONGODB}
 
 RUN set -eux; \
 	sed -i -e 's/archive.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list && \
diff --git a/ci/openjdk21-mongodb-7.0/Dockerfile b/ci/openjdk21-mongodb-7.0/Dockerfile
index 029eee3628..0b803215bf 100644
--- a/ci/openjdk21-mongodb-7.0/Dockerfile
+++ b/ci/openjdk21-mongodb-7.0/Dockerfile
@@ -5,6 +5,7 @@ ARG MONGODB
 
 ENV TZ=Etc/UTC
 ENV DEBIAN_FRONTEND=noninteractive
+ENV MONGO_VERSION=${MONGODB}
 
 RUN set -eux; \
 	sed -i -e 's/archive.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list && \
diff --git a/spring-data-mongodb/pom.xml b/spring-data-mongodb/pom.xml
index b7797737c1..7b1a89ed0f 100644
--- a/spring-data-mongodb/pom.xml
+++ b/spring-data-mongodb/pom.xml
@@ -385,6 +385,8 @@
 						<exclude>**/ReactivePerformanceTests.java</exclude>
 					</excludes>
 					<systemPropertyVariables>
+						<mongo.client>${mongo}</mongo.client>
+						<mongo.server>${env.MONGO_VERSION}</mongo.server>
 						<java.util.logging.config.file>
 							src/test/resources/logging.properties
 						</java.util.logging.config.file>