diff --git a/Jenkinsfile b/Jenkinsfile
index 072ea922d4..afa971f487 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -20,44 +20,6 @@ pipeline {
stages {
stage("Docker images") {
parallel {
- stage('Publish JDK (Java 17) + MongoDB 4.4') {
- when {
- anyOf {
- changeset "ci/openjdk17-mongodb-4.4/**"
- changeset "ci/pipeline.properties"
- }
- }
- agent { label 'data' }
- options { timeout(time: 30, unit: 'MINUTES') }
-
- steps {
- script {
- def image = docker.build("springci/spring-data-with-mongodb-4.4:${p['java.main.tag']}", "--build-arg BASE=${p['docker.java.main.image']} --build-arg MONGODB=${p['docker.mongodb.4.4.version']} ci/openjdk17-mongodb-4.4/")
- docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
- image.push()
- }
- }
- }
- }
- stage('Publish JDK (Java 17) + MongoDB 5.0') {
- when {
- anyOf {
- changeset "ci/openjdk17-mongodb-5.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-5.0:${p['java.main.tag']}", "--build-arg BASE=${p['docker.java.main.image']} --build-arg MONGODB=${p['docker.mongodb.5.0.version']} ci/openjdk17-mongodb-5.0/")
- docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
- image.push()
- }
- }
- }
- }
stage('Publish JDK (Java 17) + MongoDB 6.0') {
when {
anyOf {
@@ -137,8 +99,8 @@ pipeline {
steps {
script {
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
- docker.image("springci/spring-data-with-mongodb-4.4:${p['java.main.tag']}").inside(p['docker.java.inside.docker']) {
- sh 'ci/start-replica-4.x.sh'
+ docker.image("springci/spring-data-with-mongodb-6.0:${p['java.main.tag']}").inside(p['docker.java.inside.docker']) {
+ sh 'ci/start-replica.sh'
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
"./mvnw -s settings.xml -Ddevelocity.storage.directory=/tmp/jenkins-home/.develocity-root -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-mongodb clean dependency:list test -Dsort -U -B"
}
@@ -156,50 +118,6 @@ pipeline {
}
}
parallel {
- stage("test: MongoDB 5.0 (main)") {
- agent {
- label 'data'
- }
- options { timeout(time: 30, unit: 'MINUTES') }
- environment {
- ARTIFACTORY = credentials("${p['artifactory.credentials']}")
- DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
- }
- steps {
- script {
- docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
- docker.image("springci/spring-data-with-mongodb-5.0:${p['java.main.tag']}").inside(p['docker.java.inside.docker']) {
- sh 'ci/start-replica-4.x.sh'
- sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
- "./mvnw -s settings.xml -Ddevelocity.storage.directory=/tmp/jenkins-home/.develocity-root -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-mongodb clean dependency:list test -Dsort -U -B"
- }
- }
- }
- }
- }
-
- stage("test: MongoDB 6.0 (main)") {
- agent {
- label 'data'
- }
- options { timeout(time: 30, unit: 'MINUTES') }
- environment {
- ARTIFACTORY = credentials("${p['artifactory.credentials']}")
- DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
- }
- steps {
- script {
- docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
- docker.image("springci/spring-data-with-mongodb-6.0:${p['java.main.tag']}").inside(p['docker.java.inside.docker']) {
- sh 'ci/start-replica.sh'
- sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
- "./mvnw -s settings.xml -Ddevelocity.storage.directory=/tmp/jenkins-home/.develocity-root -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-mongodb clean dependency:list test -Dsort -U -B"
- }
- }
- }
- }
- }
-
stage("test: MongoDB 7.0 (driver-previous)") {
agent {
label 'data'
@@ -244,7 +162,7 @@ pipeline {
}
}
- stage("test: MongoDB 8.0 (next)") {
+ stage("test: MongoDB 8.0") {
agent {
label 'data'
}
diff --git a/ci/openjdk17-mongodb-4.4/Dockerfile b/ci/openjdk17-mongodb-4.4/Dockerfile
deleted file mode 100644
index 6768cad8bb..0000000000
--- a/ci/openjdk17-mongodb-4.4/Dockerfile
+++ /dev/null
@@ -1,23 +0,0 @@
-ARG BASE
-FROM ${BASE}
-# Any ARG statements before FROM are cleared.
-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 && \
- sed -i -e 's/security.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list && \
- sed -i -e 's/ports.ubuntu.com/mirrors.ocf.berkeley.edu/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 && \
- apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv 656408E390CFB1F5 && \
- echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu focal/mongodb-org/4.4 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.4.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/openjdk17-mongodb-5.0/Dockerfile b/ci/openjdk17-mongodb-5.0/Dockerfile
deleted file mode 100644
index a83fff1e0a..0000000000
--- a/ci/openjdk17-mongodb-5.0/Dockerfile
+++ /dev/null
@@ -1,25 +0,0 @@
-ARG BASE
-FROM ${BASE}
-# Any ARG statements before FROM are cleared.
-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 && \
- sed -i -e 's/security.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list && \
- sed -i -e 's/ports.ubuntu.com/mirrors.ocf.berkeley.edu/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 5.0 release signing key
- apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv B00A0BD1E2C63C11 && \
- # Needed when MongoDB creates a 5.0 folder.
- echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu focal/mongodb-org/5.0 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-5.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
index cd2fcf7fbe..dd8bb353c3 100644
--- a/ci/pipeline.properties
+++ b/ci/pipeline.properties
@@ -7,8 +7,6 @@ docker.java.main.image=library/eclipse-temurin:${java.main.tag}
docker.java.next.image=library/eclipse-temurin:${java.next.tag}
# Supported versions of MongoDB
-docker.mongodb.4.4.version=4.4.25
-docker.mongodb.5.0.version=5.0.21
docker.mongodb.6.0.version=6.0.10
docker.mongodb.7.0.version=7.0.2
docker.mongodb.8.0.version=8.0.0
diff --git a/ci/start-replica-4.x.sh b/ci/start-replica-4.x.sh
deleted file mode 100755
index f9bbc174e9..0000000000
--- a/ci/start-replica-4.x.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-mkdir -p /tmp/mongodb/db /tmp/mongodb/log
-mongod --setParameter transactionLifetimeLimitSeconds=90 --setParameter maxTransactionLockRequestTimeoutMillis=10000 --dbpath /tmp/mongodb/db --replSet rs0 --fork --logpath /tmp/mongodb/log/mongod.log &
-sleep 10
-mongo --eval "rs.initiate({_id: 'rs0', members:[{_id: 0, host: '127.0.0.1:27017'}]});"
-sleep 15
diff --git a/pom.xml b/pom.xml
index ded4d85d02..a1174871bd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
org.springframework.data
spring-data-mongodb-parent
- 4.5.0-SNAPSHOT
+ 4.5.x-GH-4529-SNAPSHOT
pom
Spring Data MongoDB
diff --git a/spring-data-mongodb-distribution/pom.xml b/spring-data-mongodb-distribution/pom.xml
index 58c63dfc97..e46ee2863b 100644
--- a/spring-data-mongodb-distribution/pom.xml
+++ b/spring-data-mongodb-distribution/pom.xml
@@ -15,7 +15,7 @@
org.springframework.data
spring-data-mongodb-parent
- 4.5.0-SNAPSHOT
+ 4.5.x-GH-4529-SNAPSHOT
../pom.xml
diff --git a/spring-data-mongodb/pom.xml b/spring-data-mongodb/pom.xml
index 37e68c6f78..42d40c330a 100644
--- a/spring-data-mongodb/pom.xml
+++ b/spring-data-mongodb/pom.xml
@@ -13,7 +13,7 @@
org.springframework.data
spring-data-mongodb-parent
- 4.5.0-SNAPSHOT
+ 4.5.x-GH-4529-SNAPSHOT
../pom.xml
diff --git a/src/main/antora/modules/ROOT/pages/preface.adoc b/src/main/antora/modules/ROOT/pages/preface.adoc
index 6102974e0c..d52509c81e 100644
--- a/src/main/antora/modules/ROOT/pages/preface.adoc
+++ b/src/main/antora/modules/ROOT/pages/preface.adoc
@@ -22,6 +22,11 @@ See also the https://www.mongodb.com/docs/drivers/java/sync/current/compatibilit
|Driver Version
|Database Versions
+|2025.0
+|4.5.x
+|5.3.x
+|6.x to 8.x
+
|2024.1
|4.4.x
|5.2.x