From 9e2aecf4ae3ae552e38d7cf0b8f65cb7f088b3d3 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@vmware.com>
Date: Wed, 17 Aug 2022 10:51:33 +0200
Subject: [PATCH] Polishing.

Fix required Java version.

See #4140
---
 README.adoc                         | 6 +++---
 ci/openjdk17-mongodb-4.4/Dockerfile | 2 +-
 ci/openjdk17-mongodb-5.0/Dockerfile | 2 +-
 ci/openjdk17-mongodb-6.0/Dockerfile | 2 +-
 src/main/asciidoc/preface.adoc      | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/README.adoc b/README.adoc
index f01ce2508..39d5ff0cf 100644
--- a/README.adoc
+++ b/README.adoc
@@ -277,8 +277,8 @@ and accessible from Maven using the Maven configuration noted <<maven-configurat
 NOTE: Configuration for Gradle is similar to Maven.
 
 The best way to get started is by creating a Spring Boot project using MongoDB on https://start.spring.io[start.spring.io].
-Follow this https://start.spring.io/#type=maven-project&language=java&platformVersion=2.5.4&packaging=jar&jvmVersion=1.8&groupId=com.example&artifactId=demo&name=demo&description=Demo%20project%20for%20Spring%20Boot&packageName=com.example.demo&dependencies=data-mongodb[link]
-to build an imperative application and this https://start.spring.io/#type=maven-project&language=java&platformVersion=2.5.4&packaging=jar&jvmVersion=1.8&groupId=com.example&artifactId=demo&name=demo&description=Demo%20project%20for%20Spring%20Boot&packageName=com.example.demo&dependencies=data-mongodb-reactive[link]
+Follow this https://start.spring.io/#type=maven-project&language=java&platformVersion=3.0.0&packaging=jar&jvmVersion=17&groupId=com.example&artifactId=demo&name=demo&description=Demo%20project%20for%20Spring%20Boot&packageName=com.example.demo&dependencies=data-mongodb[link]
+to build an imperative application and this https://start.spring.io/#type=maven-project&language=java&platformVersion=3.0.0&packaging=jar&jvmVersion=17&groupId=com.example&artifactId=demo&name=demo&description=Demo%20project%20for%20Spring%20Boot&packageName=com.example.demo&dependencies=data-mongodb-reactive[link]
 to build a reactive one.
 
 However, if you want to try out the latest and greatest, Spring Data MongoDB can be easily built with the https://github.com/takari/maven-wrapper[Maven wrapper]
@@ -341,7 +341,7 @@ Now you are ready to build Spring Data MongoDB. Simply enter the following `mvnw
  $ ./mvnw clean install
 ----
 
-If you want to build with the regular `mvn` command, you will need https://maven.apache.org/run-maven/index.html[Maven v3.5.0 or above].
+If you want to build with the regular `mvn` command, you will need https://maven.apache.org/run-maven/index.html[Maven v3.8.0 or above].
 
 _Also see link:CONTRIBUTING.adoc[CONTRIBUTING.adoc] if you wish to submit pull requests, and in particular, please sign
 the https://cla.pivotal.io/sign/spring[Contributor’s Agreement] before your first non-trivial change._
diff --git a/ci/openjdk17-mongodb-4.4/Dockerfile b/ci/openjdk17-mongodb-4.4/Dockerfile
index 5778f368b..e62c7b20c 100644
--- a/ci/openjdk17-mongodb-4.4/Dockerfile
+++ b/ci/openjdk17-mongodb-4.4/Dockerfile
@@ -6,7 +6,7 @@ ARG MONGODB
 ENV TZ=Etc/UTC
 ENV DEBIAN_FRONTEND=noninteractive
 
-RUN set -eux && \
+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 && \
diff --git a/ci/openjdk17-mongodb-5.0/Dockerfile b/ci/openjdk17-mongodb-5.0/Dockerfile
index fb6dc1f04..6e5f75761 100644
--- a/ci/openjdk17-mongodb-5.0/Dockerfile
+++ b/ci/openjdk17-mongodb-5.0/Dockerfile
@@ -6,7 +6,7 @@ ARG MONGODB
 ENV TZ=Etc/UTC
 ENV DEBIAN_FRONTEND=noninteractive
 
-RUN set -eux && \
+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 && \
diff --git a/ci/openjdk17-mongodb-6.0/Dockerfile b/ci/openjdk17-mongodb-6.0/Dockerfile
index a39db2d17..a4381ea65 100644
--- a/ci/openjdk17-mongodb-6.0/Dockerfile
+++ b/ci/openjdk17-mongodb-6.0/Dockerfile
@@ -6,7 +6,7 @@ ARG MONGODB
 ENV TZ=Etc/UTC
 ENV DEBIAN_FRONTEND=noninteractive
 
-RUN set -eux && \
+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 && \
diff --git a/src/main/asciidoc/preface.adoc b/src/main/asciidoc/preface.adoc
index 622216289..3bd80cc5f 100644
--- a/src/main/asciidoc/preface.adoc
+++ b/src/main/asciidoc/preface.adoc
@@ -39,7 +39,7 @@ The starting point for learning about MongoDB is https://www.mongodb.org/[www.mo
 [[requirements]]
 == Requirements
 
-The Spring Data MongoDB 3.x binaries require JDK level 8.0 and above and https://spring.io/docs[Spring Framework] {springVersion} and above.
+The Spring Data MongoDB 4.x binaries require JDK level 17 and above and https://spring.io/docs[Spring Framework] {springVersion} and above.
 
 In terms of document stores, you need at least version 3.6 of https://www.mongodb.org/[MongoDB], though we recommend a more recent version.