diff --git a/README.adoc b/README.adoc
index befae94a..65674eac 100644
--- a/README.adoc
+++ b/README.adoc
@@ -5,6 +5,81 @@ document-driven Web services. Spring Web Services aims to facilitate
 contract-first SOAP service development, allowing for the creation of flexible
 web services using one of the many ways to manipulate XML payloads.
 
+== Project Status
+
+We go to great lengths to ensure smooth upgrades. We also seek to make your upgrade on major versions of Java can be as smooth
+as possible.
+
+Check the matrix below to see the status of supported versions:
+
+.`master` branch
+[cols=2]
+|===
+| Job | Status
+
+| Test - JDK 8
+| image:https://ci.spring.io/api/v1/teams/spring-team/pipelines/spring-ws/jobs/Test%20-%20JDK%208/badge[link="https://ci.spring.io/teams/spring-team/pipelines/spring-ws"]
+
+| Test - JDK 8 and Spring.NEXT
+| image:https://ci.spring.io/api/v1/teams/spring-team/pipelines/spring-ws/jobs/Test%20-%20JDK%208%20and%20Spring.NEXT/badge[link="https://ci.spring.io/teams/spring-team/pipelines/spring-ws"]
+
+| Test - JDK 8 and Spring snapshots
+| image:https://ci.spring.io/api/v1/teams/spring-team/pipelines/spring-ws/jobs/Test%20-%20JDK%208%20and%20Spring%20(snapshots)/badge[link="https://ci.spring.io/teams/spring-team/pipelines/spring-ws"]
+
+| Test - JDK 8 and Spring.NEXT snapshots
+| image:https://ci.spring.io/api/v1/teams/spring-team/pipelines/spring-ws/jobs/Test%20-%20JDK%208%20and%20Spring.NEXT%20(snapshots)/badge[link="https://ci.spring.io/teams/spring-team/pipelines/spring-ws"]
+
+| Test - JDK 11
+| image:https://ci.spring.io/api/v1/teams/spring-team/pipelines/spring-ws/jobs/Test%20-%20JDK%2011/badge[link="https://ci.spring.io/teams/spring-team/pipelines/spring-ws"]
+
+| Test - JDK 11 and Spring.NEXT
+| image:https://ci.spring.io/api/v1/teams/spring-team/pipelines/spring-ws/jobs/Test%20-%20JDK%2011%20and%20Spring.NEXT/badge[link="https://ci.spring.io/teams/spring-team/pipelines/spring-ws"]
+
+| Test - JDK 11 and Spring snapshots
+| image:https://ci.spring.io/api/v1/teams/spring-team/pipelines/spring-ws/jobs/Test%20-%20JDK%2011%20and%20Spring%20(snapshots)/badge[link="https://ci.spring.io/teams/spring-team/pipelines/spring-ws"]
+
+| Test - JDK 11 and Spring.NEXT snapshots
+| image:https://ci.spring.io/api/v1/teams/spring-team/pipelines/spring-ws/jobs/Test%20-%20JDK%2011%20and%20Spring.NEXT%20(snapshots)/badge[link="https://ci.spring.io/teams/spring-team/pipelines/spring-ws"]
+
+| Build - Release to repo.spring.io
+| image:https://ci.spring.io/api/v1/teams/spring-team/pipelines/spring-ws/jobs/Build/badge[link="https://ci.spring.io/teams/spring-team/pipelines/spring-ws"]
+|===
+
+.`2.x` branch
+[cols=2]
+|===
+| Job | Status
+
+| Test - JDK 8
+| image:https://ci.spring.io/api/v1/teams/spring-team/pipelines/spring-ws-2.x/jobs/Test%20-%20JDK%208/badge[link="https://ci.spring.io/teams/spring-team/pipelines/spring-ws-2.x"]
+
+| Test - JDK 8 and Spring.NEXT
+| image:https://ci.spring.io/api/v1/teams/spring-team/pipelines/spring-ws-2.x/jobs/Test%20-%20JDK%208%20and%20Spring.NEXT/badge[link="https://ci.spring.io/teams/spring-team/pipelines/spring-ws-2.x"]
+
+| Test - JDK 8 and Spring snapshots
+| image:https://ci.spring.io/api/v1/teams/spring-team/pipelines/spring-ws-2.x/jobs/Test%20-%20JDK%208%20and%20Spring%20(snapshots)/badge[link="https://ci.spring.io/teams/spring-team/pipelines/spring-ws-2.x"]
+
+| Test - JDK 8 and Spring.NEXT snapshots
+| image:https://ci.spring.io/api/v1/teams/spring-team/pipelines/spring-ws-2.x/jobs/Test%20-%20JDK%208%20and%20Spring.NEXT%20(snapshots)/badge[link="https://ci.spring.io/teams/spring-team/pipelines/spring-ws-2.x"]
+
+| Test - JDK 11
+| image:https://ci.spring.io/api/v1/teams/spring-team/pipelines/spring-ws-2.x/jobs/Test%20-%20JDK%2011/badge[link="https://ci.spring.io/teams/spring-team/pipelines/spring-ws-2.x"]
+
+| Test - JDK 11 and Spring.NEXT
+| image:https://ci.spring.io/api/v1/teams/spring-team/pipelines/spring-ws-2.x/jobs/Test%20-%20JDK%2011%20and%20Spring.NEXT/badge[link="https://ci.spring.io/teams/spring-team/pipelines/spring-ws-2.x"]
+
+| Test - JDK 11 and Spring snapshots
+| image:https://ci.spring.io/api/v1/teams/spring-team/pipelines/spring-ws-2.x/jobs/Test%20-%20JDK%2011%20and%20Spring%20(snapshots)/badge[link="https://ci.spring.io/teams/spring-team/pipelines/spring-ws-2.x"]
+
+| Test - JDK 11 and Spring.NEXT snapshots
+| image:https://ci.spring.io/api/v1/teams/spring-team/pipelines/spring-ws-2.x/jobs/Test%20-%20JDK%2011%20and%20Spring.NEXT%20(snapshots)/badge[link="https://ci.spring.io/teams/spring-team/pipelines/spring-ws-2.x"]
+
+| Build - Release to repo.spring.io
+| image:https://ci.spring.io/api/v1/teams/spring-team/pipelines/spring-ws-2.x/jobs/Build/badge[link="https://ci.spring.io/teams/spring-team/pipelines/spring-ws-2.x"]
+|===
+
+
+
 == Installation
 
 Releases of Spring Web Services are available for download from Maven Central,
diff --git a/ci/build.sh b/ci/build.sh
index 146f60be..d8ee44c6 100755
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -x
+#!/bin/bash
 
 set -euo pipefail
 
diff --git a/ci/pipeline-template.yml b/ci/pipeline-template.yml
index 26ab9e5d..4465666a 100644
--- a/ci/pipeline-template.yml
+++ b/ci/pipeline-template.yml
@@ -68,13 +68,13 @@ groups:
 - name: spring-ws
   jobs:
   - Test - JDK 8
-  - Test - JDK 8 + Spring.NEXT
-  - Test - JDK 8 + Spring.NEXT (snapshots)
-  - Test - JDK 8 + Spring (snapshots)
+  - Test - JDK 8 and Spring.NEXT
+  - Test - JDK 8 and Spring.NEXT (snapshots)
+  - Test - JDK 8 and Spring (snapshots)
   - Test - JDK 11
-  - Test - JDK 11 + Spring.NEXT
-  - Test - JDK 11 + Spring.NEXT (snapshots)
-  - Test - JDK 11 + Spring (snapshots)
+  - Test - JDK 11 and Spring.NEXT
+  - Test - JDK 11 and Spring.NEXT (snapshots)
+  - Test - JDK 11 and Spring (snapshots)
   - Build
 - name: pull-requests
   jobs:
@@ -93,7 +93,7 @@ jobs:
     file: spring-ws-github/ci/test.yml
     params: { PROFILE: "distribute,convergence" }
 
-- name: Test - JDK 8 + Spring.NEXT
+- name: Test - JDK 8 and Spring.NEXT
   serial: true
   public: true
   plan:
@@ -105,7 +105,7 @@ jobs:
     file: spring-ws-github/ci/test.yml
     params: { PROFILE: "springnext,convergence" }
 
-- name: Test - JDK 8 + Spring.NEXT (snapshots)
+- name: Test - JDK 8 and Spring.NEXT (snapshots)
   serial: true
   public: true
   plan:
@@ -117,7 +117,7 @@ jobs:
     file: spring-ws-github/ci/test.yml
     params: { PROFILE: "springnext-buildsnapshot,convergence" }
 
-- name: Test - JDK 8 + Spring (snapshots)
+- name: Test - JDK 8 and Spring (snapshots)
   serial: true
   public: true
   plan:
@@ -142,7 +142,7 @@ jobs:
     file: spring-ws-github/ci/test.yml
     params: { PROFILE: "distribute,java11,convergence" }
 
-- name: Test - JDK 11 + Spring.NEXT
+- name: Test - JDK 11 and Spring.NEXT
   serial: true
   public: true
   plan:
@@ -155,7 +155,7 @@ jobs:
     file: spring-ws-github/ci/test.yml
     params: { PROFILE: "springnext,java11,convergence" }
 
-- name: Test - JDK 11 + Spring.NEXT (snapshots)
+- name: Test - JDK 11 and Spring.NEXT (snapshots)
   serial: true
   public: true
   plan:
@@ -168,7 +168,7 @@ jobs:
     file: spring-ws-github/ci/test.yml
     params: { PROFILE: "springnext-buildsnapshot,java11,convergence" }
 
-- name: Test - JDK 11 + Spring (snapshots)
+- name: Test - JDK 11 and Spring (snapshots)
   serial: true
   public: true
   plan:
@@ -189,13 +189,13 @@ jobs:
     trigger: true
     passed: [
       Test - JDK 8,
-      Test - JDK 8 + Spring.NEXT,
-      Test - JDK 8 + Spring.NEXT (snapshots),
-      Test - JDK 8 + Spring (snapshots),
+      Test - JDK 8 and Spring.NEXT,
+      Test - JDK 8 and Spring.NEXT (snapshots),
+      Test - JDK 8 and Spring (snapshots),
       Test - JDK 11,
-      Test - JDK 11 + Spring.NEXT,
-      Test - JDK 11 + Spring.NEXT (snapshots),
-      Test - JDK 11 + Spring (snapshots)
+      Test - JDK 11 and Spring.NEXT,
+      Test - JDK 11 and Spring.NEXT (snapshots),
+      Test - JDK 11 and Spring (snapshots)
     ]
   - put: spring-ws-status
     params:
@@ -242,28 +242,28 @@ jobs:
     - task: test (JDK 8)
       file: spring-ws-github/ci/test.yml
       params: { PROFILE: "distribute,convergence" }
-    - task: test (JDK 8 + Spring.NEXT)
+    - task: test (JDK 8 and Spring.NEXT)
       file: spring-ws-github/ci/test.yml
       params: { PROFILE: "springnext,convergence" }
-    - task: test (JDK 8 + Spring.NEXT snapshots)
+    - task: test (JDK 8 and Spring.NEXT snapshots)
       file: spring-ws-github/ci/test.yml
       params: { PROFILE: "springnext-buildsnapshot,convergence" }
-    - task: test (JDK 8 + Spring snapshots)
+    - task: test (JDK 8 and Spring snapshots)
       file: spring-ws-github/ci/test.yml
       params: { PROFILE: "spring-buildsnapshot,convergence" }
     - task: test (JDK 11)
       image: openjdk:11-jdk
       file: spring-ws-github/ci/test.yml
       params: { PROFILE: "distribute,java11,convergence" }
-    - task: test (JDK 11 + Spring.NEXT)
+    - task: test (JDK 11 and Spring.NEXT)
       image: openjdk:11-jdk
       file: spring-ws-github/ci/test.yml
       params: { PROFILE: "springnext,java11,convergence" }
-    - task: test (JDK 11 + Spring.NEXT snapshots)
+    - task: test (JDK 11 and Spring.NEXT snapshots)
       image: openjdk:11-jdk
       file: spring-ws-github/ci/test.yml
       params: { PROFILE: "springnext-buildsnapshot,java11,convergence" }
-    - task: test (JDK 11 + Spring snapshots)
+    - task: test (JDK 11 and Spring snapshots)
       image: openjdk:11-jdk
       file: spring-ws-github/ci/test.yml
       params: { PROFILE: "spring-buildsnapshot,java11,convergence" }
diff --git a/ci/test.sh b/ci/test.sh
index bdf7e836..e3817ec4 100755
--- a/ci/test.sh
+++ b/ci/test.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -x
+#!/bin/bash
 
 set -euo pipefail