diff --git a/README.adoc b/README.adoc
index 286d881..bc3c451 100644
--- a/README.adoc
+++ b/README.adoc
@@ -16,7 +16,7 @@ as possible.
 
 Check the matrix below to see the status of supported versions:
 
-.`master` branch
+.Spring Session for MongoDB Status
 [cols=3]
 |===
 | Job | `master` branch (`2.1`) | `2.0.x` branch (`2.0.x`)
@@ -53,11 +53,32 @@ Check the matrix below to see the status of supported versions:
 | image:https://ci.spring.io/api/v1/teams/spring-team/pipelines/spring-session-data-mongodb/jobs/Test%20-%20JDK%2011%20and%20Spring%20Data.NEXT/badge[link="https://ci.spring.io/teams/spring-team/pipelines/spring-session-data-mongodb"]
 | image:https://ci.spring.io/api/v1/teams/spring-team/pipelines/spring-session-data-mongodb-2.0.x/jobs/Test%20-%20JDK%2011%20and%20Spring%20Data.NEXT/badge[link="https://ci.spring.io/teams/spring-team/pipelines/spring-session-data-mongodb-2.0.x"]
 
+| Test - JDK 12*
+| image:https://ci.spring.io/api/v1/teams/spring-team/pipelines/spring-session-data-mongodb/jobs/Test%20-%20JDK%2012/badge[link="https://ci.spring.io/teams/spring-team/pipelines/spring-session-data-mongodb"]
+| image:https://ci.spring.io/api/v1/teams/spring-team/pipelines/spring-session-data-mongodb-2.0.x/jobs/Test%20-%20JDK%2012/badge[link="https://ci.spring.io/teams/spring-team/pipelines/spring-session-data-mongodb-2.0.x"]
+
+| Test - JDK 12* and Spring.NEXT
+| image:https://ci.spring.io/api/v1/teams/spring-team/pipelines/spring-session-data-mongodb/jobs/Test%20-%20JDK%2012%20and%20Spring.NEXT/badge[link="https://ci.spring.io/teams/spring-team/pipelines/spring-session-data-mongodb"]
+| image:https://ci.spring.io/api/v1/teams/spring-team/pipelines/spring-session-data-mongodb-2.0.x/jobs/Test%20-%20JDK%2012%20and%20Spring.NEXT/badge[link="https://ci.spring.io/teams/spring-team/pipelines/spring-session-data-mongodb-2.0.x"]
+
+| Test - JDK 12* and Spring.NEXT 5.1
+| image:https://ci.spring.io/api/v1/teams/spring-team/pipelines/spring-session-data-mongodb/jobs/Test%20-%20JDK%2012%20and%20Spring.NEXT%205.1/badge[link="https://ci.spring.io/teams/spring-team/pipelines/spring-session-data-mongodb"]
+| image:https://ci.spring.io/api/v1/teams/spring-team/pipelines/spring-session-data-mongodb-2.0.x/jobs/Test%20-%20JDK%2012%20and%20Spring.NEXT%205.1/badge[link="https://ci.spring.io/teams/spring-team/pipelines/spring-session-data-mongodb-2.0.x"]
+
+| Test - JDK 12* and Spring Data.NEXT
+| image:https://ci.spring.io/api/v1/teams/spring-team/pipelines/spring-session-data-mongodb/jobs/Test%20-%20JDK%2012%20and%20Spring%20Data.NEXT/badge[link="https://ci.spring.io/teams/spring-team/pipelines/spring-session-data-mongodb"]
+| image:https://ci.spring.io/api/v1/teams/spring-team/pipelines/spring-session-data-mongodb-2.0.x/jobs/Test%20-%20JDK%2012%20and%20Spring%20Data.NEXT/badge[link="https://ci.spring.io/teams/spring-team/pipelines/spring-session-data-mongodb-2.0.x"]
+
 | Build - Release to repo.spring.io
 | image:https://ci.spring.io/api/v1/teams/spring-team/pipelines/spring-session-data-mongodb/jobs/Build/badge[link="https://ci.spring.io/teams/spring-team/pipelines/spring-session-data-mongodb"]
 | image:https://ci.spring.io/api/v1/teams/spring-team/pipelines/spring-session-data-mongodb-2.0.x/jobs/Build/badge[link="https://ci.spring.io/teams/spring-team/pipelines/spring-session-data-mongodb-2.0.x"]
 |===
 
+IMPORTANT: Spring Session for MongoDB 2.1 runs on Spring Framework 5.1, which has support for *JDK 11*. Spring Session for MongoDB 2.0.x runs on Spring Framework 5.0 and is NOT supported on *JDK 11* despite our pipelines testing against it. The extra
+tests are designed to give you a smooth upgrade path. If you are going into production on JDK 11, should need to be using Spring Session for MongoDB 2.1.
+
+IMPORTANT: *JDK 12* is Java's latest version and is unstable. We are testing against it to catch issues early on, but don't support it directly on any version of Spring Session for MongoDB.
+
 == Building Spring Session MongoDB
 
 . Run `mvn clean package`
diff --git a/ci/pipeline-template.yml b/ci/pipeline-template.yml
index 9fe468b..b27f649 100644
--- a/ci/pipeline-template.yml
+++ b/ci/pipeline-template.yml
@@ -36,6 +36,12 @@ resources:
     repository: openjdk
     tag:        11-jdk
 
+- name: openjdk:12-jdk
+  type: docker-image
+  source:
+    repository: openjdk
+    tag:        12-jdk
+
 - name: spring-session-data-mongodb-github
   type: git
   source:
@@ -80,6 +86,10 @@ groups:
   - Test - JDK 11 and Spring.NEXT
   - Test - JDK 11 and Spring.NEXT 5.1
   - Test - JDK 11 and Spring Data.NEXT
+  - Test - JDK 12
+  - Test - JDK 12 and Spring.NEXT
+  - Test - JDK 12 and Spring.NEXT 5.1
+  - Test - JDK 12 and Spring Data.NEXT
   - Build
 - name: pull-requests
   jobs:
@@ -331,6 +341,130 @@ jobs:
           title: "$BUILD_PIPELINE_NAME/$BUILD_JOB_NAME #$BUILD_NAME"
           title_link: $ATC_EXTERNAL_URL/teams/$BUILD_TEAM_NAME/pipelines/$BUILD_PIPELINE_NAME/jobs/$BUILD_JOB_NAME/builds/$BUILD_NAME
 
+- name: Test - JDK 12
+  serial: true
+  public: true
+  plan:
+  - get: spring-session-data-mongodb-github
+    trigger: true
+  - get: openjdk:12-jdk
+    trigger: true
+  - task: test
+    image: openjdk:12-jdk
+    file: spring-session-data-mongodb-github/ci/test.yml
+    params: { PROFILE: "convergence" }
+  on_failure:
+    put: slack
+    params:
+      attachments:
+        - color: danger
+          fallback: "$BUILD_PIPELINE_NAME/$BUILD_JOB_NAME #$BUILD_NAME <FAILURE>"
+          text: "Build has failed"
+          title: "$BUILD_PIPELINE_NAME/$BUILD_JOB_NAME #$BUILD_NAME"
+          title_link: $ATC_EXTERNAL_URL/teams/$BUILD_TEAM_NAME/pipelines/$BUILD_PIPELINE_NAME/jobs/$BUILD_JOB_NAME/builds/$BUILD_NAME
+  on_success:
+    put: slack
+    params:
+      attachments:
+        - color: good
+          fallback: "$BUILD_PIPELINE_NAME/$BUILD_JOB_NAME #$BUILD_NAME <SUCCESS>"
+          text: "Build has succeeded!"
+          title: "$BUILD_PIPELINE_NAME/$BUILD_JOB_NAME #$BUILD_NAME"
+          title_link: $ATC_EXTERNAL_URL/teams/$BUILD_TEAM_NAME/pipelines/$BUILD_PIPELINE_NAME/jobs/$BUILD_JOB_NAME/builds/$BUILD_NAME
+
+- name: Test - JDK 12 and Spring.NEXT
+  serial: true
+  public: true
+  plan:
+  - get: spring-session-data-mongodb-github
+    trigger: true
+  - get: openjdk:12-jdk
+    trigger: true
+  - task: test
+    image: openjdk:12-jdk
+    file: spring-session-data-mongodb-github/ci/test.yml
+    params: { PROFILE: "spring5-next,convergence" }
+  on_failure:
+    put: slack
+    params:
+      attachments:
+        - color: danger
+          fallback: "$BUILD_PIPELINE_NAME/$BUILD_JOB_NAME #$BUILD_NAME <FAILURE>"
+          text: "Build has failed"
+          title: "$BUILD_PIPELINE_NAME/$BUILD_JOB_NAME #$BUILD_NAME"
+          title_link: $ATC_EXTERNAL_URL/teams/$BUILD_TEAM_NAME/pipelines/$BUILD_PIPELINE_NAME/jobs/$BUILD_JOB_NAME/builds/$BUILD_NAME
+  on_success:
+    put: slack
+    params:
+      attachments:
+        - color: good
+          fallback: "$BUILD_PIPELINE_NAME/$BUILD_JOB_NAME #$BUILD_NAME <SUCCESS>"
+          text: "Build has succeeded!"
+          title: "$BUILD_PIPELINE_NAME/$BUILD_JOB_NAME #$BUILD_NAME"
+          title_link: $ATC_EXTERNAL_URL/teams/$BUILD_TEAM_NAME/pipelines/$BUILD_PIPELINE_NAME/jobs/$BUILD_JOB_NAME/builds/$BUILD_NAME
+
+- name: Test - JDK 12 and Spring.NEXT 5.1
+  serial: true
+  public: true
+  plan:
+  - get: spring-session-data-mongodb-github
+    trigger: true
+  - get: openjdk:12-jdk
+    trigger: true
+  - task: test
+    image: openjdk:12-jdk
+    file: spring-session-data-mongodb-github/ci/test.yml
+    params: { PROFILE: "spring51-next,convergence" }
+  on_failure:
+    put: slack
+    params:
+      attachments:
+        - color: danger
+          fallback: "$BUILD_PIPELINE_NAME/$BUILD_JOB_NAME #$BUILD_NAME <FAILURE>"
+          text: "Build has failed"
+          title: "$BUILD_PIPELINE_NAME/$BUILD_JOB_NAME #$BUILD_NAME"
+          title_link: $ATC_EXTERNAL_URL/teams/$BUILD_TEAM_NAME/pipelines/$BUILD_PIPELINE_NAME/jobs/$BUILD_JOB_NAME/builds/$BUILD_NAME
+  on_success:
+    put: slack
+    params:
+      attachments:
+        - color: good
+          fallback: "$BUILD_PIPELINE_NAME/$BUILD_JOB_NAME #$BUILD_NAME <SUCCESS>"
+          text: "Build has succeeded!"
+          title: "$BUILD_PIPELINE_NAME/$BUILD_JOB_NAME #$BUILD_NAME"
+          title_link: $ATC_EXTERNAL_URL/teams/$BUILD_TEAM_NAME/pipelines/$BUILD_PIPELINE_NAME/jobs/$BUILD_JOB_NAME/builds/$BUILD_NAME
+
+- name: Test - JDK 12 and Spring Data.NEXT
+  serial: true
+  public: true
+  plan:
+  - get: spring-session-data-mongodb-github
+    trigger: true
+  - get: openjdk:12-jdk
+    trigger: true
+  - task: test
+    image: openjdk:12-jdk
+    file: spring-session-data-mongodb-github/ci/test.yml
+    params: { PROFILE: "springdata-next,convergence" }
+  on_failure:
+    put: slack
+    params:
+      attachments:
+        - color: danger
+          fallback: "$BUILD_PIPELINE_NAME/$BUILD_JOB_NAME #$BUILD_NAME <FAILURE>"
+          text: "Build has failed"
+          title: "$BUILD_PIPELINE_NAME/$BUILD_JOB_NAME #$BUILD_NAME"
+          title_link: $ATC_EXTERNAL_URL/teams/$BUILD_TEAM_NAME/pipelines/$BUILD_PIPELINE_NAME/jobs/$BUILD_JOB_NAME/builds/$BUILD_NAME
+  on_success:
+    put: slack
+    params:
+      attachments:
+        - color: good
+          fallback: "$BUILD_PIPELINE_NAME/$BUILD_JOB_NAME #$BUILD_NAME <SUCCESS>"
+          text: "Build has succeeded!"
+          title: "$BUILD_PIPELINE_NAME/$BUILD_JOB_NAME #$BUILD_NAME"
+          title_link: $ATC_EXTERNAL_URL/teams/$BUILD_TEAM_NAME/pipelines/$BUILD_PIPELINE_NAME/jobs/$BUILD_JOB_NAME/builds/$BUILD_NAME
+
 - name: Build
   serial: true
   public: true
@@ -345,7 +479,11 @@ jobs:
       Test - JDK 11,
       Test - JDK 11 and Spring.NEXT,
       Test - JDK 11 and Spring.NEXT 5.1,
-      Test - JDK 11 and Spring Data.NEXT
+      Test - JDK 11 and Spring Data.NEXT,
+      Test - JDK 12,
+      Test - JDK 12 and Spring.NEXT,
+      Test - JDK 12 and Spring.NEXT 5.1,
+      Test - JDK 12 and Spring Data.NEXT
     ]
   - put: spring-session-data-mongodb-status
     params:
@@ -434,6 +572,22 @@ jobs:
       image: openjdk:11-jdk
       file: spring-session-data-mongodb-github/ci/test.yml
       params: { PROFILE: "springdata-next,java11,convergence" }
+    - task: test (JDK 12)
+      image: openjdk:12-jdk
+      file: spring-session-data-mongodb-github/ci/test.yml
+      params: { PROFILE: "convergence" }
+    - task: test (JDK 12 and Spring.NEXT)
+      image: openjdk:12-jdk
+      file: spring-session-data-mongodb-github/ci/test.yml
+      params: { PROFILE: "spring5-next,convergence" }
+    - task: test (JDK 12 and Spring.NEXT 5.1)
+      image: openjdk:12-jdk
+      file: spring-session-data-mongodb-github/ci/test.yml
+      params: { PROFILE: "spring51-next,convergence" }
+    - task: test (JDK 12 and Spring Data.NEXT)
+      image: openjdk:12-jdk
+      file: spring-session-data-mongodb-github/ci/test.yml
+      params: { PROFILE: "springdata-next,java11,convergence" }
   on_failure:
     aggregate:
     - put: spring-session-data-mongodb-pull-requests