From 1ca64d90526bf2d4855f52d6ae4b61caa8617d83 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] Expose server version to build cache.

Original pull request: #4633
Closes: #4631
---
 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 9cda8dd33..6768cad8b 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 dc949db94..a83fff1e0 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 ca838e4c0..fd2580e23 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 0157cb0c4..5701ab9fb 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 4e8dd5303..1e6598343 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 029eee362..0b803215b 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 4e070e04d..c437b752e 100644
--- a/spring-data-mongodb/pom.xml
+++ b/spring-data-mongodb/pom.xml
@@ -379,6 +379,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>