diff --git a/batch-processing/README-source.adoc b/batch-processing/README-source.adoc
index 64a8e3e112..016e707d60 100644
--- a/batch-processing/README-source.adoc
+++ b/batch-processing/README-source.adoc
@@ -140,7 +140,4 @@ include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+2]
// Build and run sections for other environments/builds
include::../shared-doc/build-and-run-the-quickstart-with-provisioned-server.adoc[leveloffset=+1]
include::../shared-doc/build-and-run-the-quickstart-with-openshift.adoc[leveloffset=+1]
-ifndef::ProductRelease,EAPXPRelease[]
-// Kubernetes
-include::../shared-doc/build-and-run-the-quickstart-with-kubernetes.adoc[leveloffset=+1]
-endif::[]
\ No newline at end of file
+include::../shared-doc/build-and-run-the-quickstart-with-kubernetes.adoc[leveloffset=+1]
\ No newline at end of file
diff --git a/bmt/README-source.adoc b/bmt/README-source.adoc
index 2abcc53363..c602ece47b 100644
--- a/bmt/README-source.adoc
+++ b/bmt/README-source.adoc
@@ -59,7 +59,4 @@ include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+1]
// Build and run sections for other environments/builds
include::../shared-doc/build-and-run-the-quickstart-with-provisioned-server.adoc[leveloffset=+1]
include::../shared-doc/build-and-run-the-quickstart-with-openshift.adoc[leveloffset=+1]
-ifndef::ProductRelease,EAPXPRelease[]
-// Kubernetes
-include::../shared-doc/build-and-run-the-quickstart-with-kubernetes.adoc[leveloffset=+1]
-endif::[]
\ No newline at end of file
+include::../shared-doc/build-and-run-the-quickstart-with-kubernetes.adoc[leveloffset=+1]
\ No newline at end of file
diff --git a/cmt/README-source.adoc b/cmt/README-source.adoc
index cd0ec8b4d6..5e29fb5411 100644
--- a/cmt/README-source.adoc
+++ b/cmt/README-source.adoc
@@ -85,7 +85,4 @@ include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+2]
// Build and run sections for other environments/builds
include::../shared-doc/build-and-run-the-quickstart-with-provisioned-server.adoc[leveloffset=+1]
include::../shared-doc/build-and-run-the-quickstart-with-openshift.adoc[leveloffset=+1]
-ifndef::ProductRelease,EAPXPRelease[]
-// Kubernetes
include::../shared-doc/build-and-run-the-quickstart-with-kubernetes.adoc[leveloffset=+1]
-endif::[]
\ No newline at end of file
diff --git a/ee-security/README-source.adoc b/ee-security/README-source.adoc
index ccb35b619f..bd10a6a1de 100644
--- a/ee-security/README-source.adoc
+++ b/ee-security/README-source.adoc
@@ -128,7 +128,4 @@ include::../shared-doc/restore-standalone-server-configuration-manual.adoc[level
// Build and run sections for other environments/builds
include::../shared-doc/build-and-run-the-quickstart-with-provisioned-server.adoc[leveloffset=+1]
include::../shared-doc/build-and-run-the-quickstart-with-openshift.adoc[leveloffset=+1]
-ifndef::ProductRelease,EAPXPRelease[]
-// Kubernetes
-include::../shared-doc/build-and-run-the-quickstart-with-kubernetes.adoc[leveloffset=+1]
-endif::[]
+include::../shared-doc/build-and-run-the-quickstart-with-kubernetes.adoc[leveloffset=+1]
\ No newline at end of file
diff --git a/ejb-timer/README-source.adoc b/ejb-timer/README-source.adoc
index 2fd31055c6..767627e92b 100644
--- a/ejb-timer/README-source.adoc
+++ b/ejb-timer/README-source.adoc
@@ -90,10 +90,7 @@ include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+1]
// Build and run sections for other environments/builds
include::../shared-doc/build-and-run-the-quickstart-with-provisioned-server.adoc[leveloffset=+1]
include::../shared-doc/build-and-run-the-quickstart-with-openshift.adoc[leveloffset=+1]
-ifndef::ProductRelease,EAPXPRelease[]
-// Kubernetes
include::../shared-doc/build-and-run-the-quickstart-with-kubernetes.adoc[leveloffset=+1]
-endif::[]
=== Using Timer Service within a cluster
diff --git a/helloworld-mdb/README-source.adoc b/helloworld-mdb/README-source.adoc
index 321c30d6f8..d993e0ac5e 100644
--- a/helloworld-mdb/README-source.adoc
+++ b/helloworld-mdb/README-source.adoc
@@ -86,11 +86,7 @@ include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+2]
// Build and run sections for other environments/builds
include::../shared-doc/build-and-run-the-quickstart-with-provisioned-server.adoc[leveloffset=+1]
include::../shared-doc/build-and-run-the-quickstart-with-openshift.adoc[leveloffset=+1]
-ifndef::ProductRelease,EAPXPRelease[]
-//Kubernetes
include::../shared-doc/build-and-run-the-quickstart-with-kubernetes.adoc[leveloffset=+1]
-endif::[]
-
== Clustering
diff --git a/helloworld-rs/README-source.adoc b/helloworld-rs/README-source.adoc
index b872033033..5f9b074439 100644
--- a/helloworld-rs/README-source.adoc
+++ b/helloworld-rs/README-source.adoc
@@ -42,7 +42,4 @@ include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+2]
// Build and run sections for other environments/builds
include::../shared-doc/build-and-run-the-quickstart-with-provisioned-server.adoc[leveloffset=+1]
include::../shared-doc/build-and-run-the-quickstart-with-openshift.adoc[leveloffset=+1]
-ifndef::ProductRelease,EAPXPRelease[]
-//Kubernetes
-include::../shared-doc/build-and-run-the-quickstart-with-kubernetes.adoc[leveloffset=+1]
-endif::[]
\ No newline at end of file
+include::../shared-doc/build-and-run-the-quickstart-with-kubernetes.adoc[leveloffset=+1]
\ No newline at end of file
diff --git a/helloworld-singleton/README-source.adoc b/helloworld-singleton/README-source.adoc
index 96ef819979..09b6c40fa9 100644
--- a/helloworld-singleton/README-source.adoc
+++ b/helloworld-singleton/README-source.adoc
@@ -49,7 +49,4 @@ include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+2]
// Build and run sections for other environments/builds
include::../shared-doc/build-and-run-the-quickstart-with-provisioned-server.adoc[leveloffset=+1]
include::../shared-doc/build-and-run-the-quickstart-with-openshift.adoc[leveloffset=+1]
-ifndef::ProductRelease,EAPXPRelease[]
-//Kubernetes
-include::../shared-doc/build-and-run-the-quickstart-with-kubernetes.adoc[leveloffset=+1]
-endif::[]
\ No newline at end of file
+include::../shared-doc/build-and-run-the-quickstart-with-kubernetes.adoc[leveloffset=+1]
\ No newline at end of file
diff --git a/helloworld-ws/README-source.adoc b/helloworld-ws/README-source.adoc
index b0a138826b..cff376c2a4 100644
--- a/helloworld-ws/README-source.adoc
+++ b/helloworld-ws/README-source.adoc
@@ -57,7 +57,4 @@ include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+2]
// Build and run sections for other environments/builds
include::../shared-doc/build-and-run-the-quickstart-with-provisioned-server.adoc[leveloffset=+1]
include::../shared-doc/build-and-run-the-quickstart-with-openshift.adoc[leveloffset=+1]
-ifndef::ProductRelease,EAPXPRelease[]
-//Kubernetes
-include::../shared-doc/build-and-run-the-quickstart-with-kubernetes.adoc[leveloffset=+1]
-endif::[]
\ No newline at end of file
+include::../shared-doc/build-and-run-the-quickstart-with-kubernetes.adoc[leveloffset=+1]
\ No newline at end of file
diff --git a/helloworld/README-source.adoc b/helloworld/README-source.adoc
index 8abb3975cd..8d098194dc 100644
--- a/helloworld/README-source.adoc
+++ b/helloworld/README-source.adoc
@@ -45,7 +45,4 @@ include::../shared-doc/build-and-run-the-quickstart-with-provisioned-server.adoc
include::../shared-doc/build-and-run-the-quickstart-with-bootable-jar.adoc[leveloffset=+1]
// OpenShift
include::../shared-doc/build-and-run-the-quickstart-with-openshift.adoc[leveloffset=+1]
-ifndef::ProductRelease,EAPXPRelease[]
-//Kubernetes
-include::../shared-doc/build-and-run-the-quickstart-with-kubernetes.adoc[leveloffset=+1]
-endif::[]
\ No newline at end of file
+include::../shared-doc/build-and-run-the-quickstart-with-kubernetes.adoc[leveloffset=+1]
\ No newline at end of file
diff --git a/hibernate/README-source.adoc b/hibernate/README-source.adoc
index 8dccccd0e3..dc37ac48b2 100644
--- a/hibernate/README-source.adoc
+++ b/hibernate/README-source.adoc
@@ -71,7 +71,4 @@ include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+2]
// Build and run sections for other environments/builds
include::../shared-doc/build-and-run-the-quickstart-with-provisioned-server.adoc[leveloffset=+1]
include::../shared-doc/build-and-run-the-quickstart-with-openshift.adoc[leveloffset=+1]
-ifndef::ProductRelease,EAPXPRelease[]
-//Kubernetes
-include::../shared-doc/build-and-run-the-quickstart-with-kubernetes.adoc[leveloffset=+1]
-endif::[]
\ No newline at end of file
+include::../shared-doc/build-and-run-the-quickstart-with-kubernetes.adoc[leveloffset=+1]
\ No newline at end of file
diff --git a/jaxrs-client/README-source.adoc b/jaxrs-client/README-source.adoc
index 2fa091389e..3abaa68d7d 100644
--- a/jaxrs-client/README-source.adoc
+++ b/jaxrs-client/README-source.adoc
@@ -65,7 +65,4 @@ include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+2]
// Build and run sections for other environments/builds
include::../shared-doc/build-and-run-the-quickstart-with-provisioned-server.adoc[leveloffset=+1]
include::../shared-doc/build-and-run-the-quickstart-with-openshift.adoc[leveloffset=+1]
-ifndef::ProductRelease,EAPXPRelease[]
-//Kubernetes
-include::../shared-doc/build-and-run-the-quickstart-with-kubernetes.adoc[leveloffset=+1]
-endif::[]
\ No newline at end of file
+include::../shared-doc/build-and-run-the-quickstart-with-kubernetes.adoc[leveloffset=+1]
\ No newline at end of file
diff --git a/jaxrs-jwt/README-source.adoc b/jaxrs-jwt/README-source.adoc
index bae1683d40..546c5aa9e8 100644
--- a/jaxrs-jwt/README-source.adoc
+++ b/jaxrs-jwt/README-source.adoc
@@ -160,7 +160,4 @@ include::../shared-doc/restore-standalone-server-configuration-manual.adoc[level
include::../shared-doc/build-and-run-the-quickstart-with-provisioned-server.adoc[leveloffset=+1]
include::../shared-doc/build-and-run-the-quickstart-with-openshift.adoc[leveloffset=+1]
-ifndef::ProductRelease,EAPXPRelease[]
-//Kubernetes
-include::../shared-doc/build-and-run-the-quickstart-with-kubernetes.adoc[leveloffset=+1]
-endif::[]
\ No newline at end of file
+include::../shared-doc/build-and-run-the-quickstart-with-kubernetes.adoc[leveloffset=+1]
\ No newline at end of file
diff --git a/jaxws-ejb/README-source.adoc b/jaxws-ejb/README-source.adoc
index 48d0d567c1..dc89013806 100644
--- a/jaxws-ejb/README-source.adoc
+++ b/jaxws-ejb/README-source.adoc
@@ -47,7 +47,4 @@ include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+2]
// Build and run sections for other environments/builds
include::../shared-doc/build-and-run-the-quickstart-with-provisioned-server.adoc[leveloffset=+1]
include::../shared-doc/build-and-run-the-quickstart-with-openshift.adoc[leveloffset=+1]
-ifndef::ProductRelease,EAPXPRelease[]
-//Kubernetes
-include::../shared-doc/build-and-run-the-quickstart-with-kubernetes.adoc[leveloffset=+1]
-endif::[]
\ No newline at end of file
+include::../shared-doc/build-and-run-the-quickstart-with-kubernetes.adoc[leveloffset=+1]
\ No newline at end of file
diff --git a/jaxws-retail/README-source.adoc b/jaxws-retail/README-source.adoc
index b48a7191f0..52d10452ea 100644
--- a/jaxws-retail/README-source.adoc
+++ b/jaxws-retail/README-source.adoc
@@ -41,7 +41,4 @@ include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+1]
// Build and run sections for other environments/builds
include::../shared-doc/build-and-run-the-quickstart-with-provisioned-server.adoc[leveloffset=+1]
include::../shared-doc/build-and-run-the-quickstart-with-openshift.adoc[leveloffset=+1]
-ifndef::ProductRelease,EAPXPRelease[]
-//Kubernetes
-include::../shared-doc/build-and-run-the-quickstart-with-kubernetes.adoc[leveloffset=+1]
-endif::[]
\ No newline at end of file
+include::../shared-doc/build-and-run-the-quickstart-with-kubernetes.adoc[leveloffset=+1]
\ No newline at end of file
diff --git a/jsonp/README-source.adoc b/jsonp/README-source.adoc
index 70c52b5d94..6e800296af 100644
--- a/jsonp/README-source.adoc
+++ b/jsonp/README-source.adoc
@@ -49,6 +49,4 @@ include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+2]
// Build and run sections for other environments/builds
include::../shared-doc/build-and-run-the-quickstart-with-provisioned-server.adoc[leveloffset=+1]
include::../shared-doc/build-and-run-the-quickstart-with-openshift.adoc[leveloffset=+1]
-ifndef::ProductRelease,EAPXPRelease[]
-include::../shared-doc/build-and-run-the-quickstart-with-kubernetes.adoc[leveloffset=+1]
-endif::[]
\ No newline at end of file
+include::../shared-doc/build-and-run-the-quickstart-with-kubernetes.adoc[leveloffset=+1]
\ No newline at end of file
diff --git a/kitchensink/README-source.adoc b/kitchensink/README-source.adoc
index 71167eee0d..a53716b58e 100644
--- a/kitchensink/README-source.adoc
+++ b/kitchensink/README-source.adoc
@@ -136,7 +136,4 @@ include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+2]
// Build and run sections for other environments/builds
include::../shared-doc/build-and-run-the-quickstart-with-provisioned-server.adoc[leveloffset=+1]
include::../shared-doc/build-and-run-the-quickstart-with-openshift.adoc[leveloffset=+1]
-ifndef::ProductRelease,EAPXPRelease[]
-//Kubernetes
-include::../shared-doc/build-and-run-the-quickstart-with-kubernetes.adoc[leveloffset=+1]
-endif::[]
\ No newline at end of file
+include::../shared-doc/build-and-run-the-quickstart-with-kubernetes.adoc[leveloffset=+1]
\ No newline at end of file
diff --git a/logging/README-source.adoc b/logging/README-source.adoc
index e34a2fc031..ec8ba47d71 100644
--- a/logging/README-source.adoc
+++ b/logging/README-source.adoc
@@ -158,7 +158,4 @@ include::../shared-doc/restore-standalone-server-configuration-manual.adoc[level
// Build and run sections for other environments/builds
include::../shared-doc/build-and-run-the-quickstart-with-provisioned-server.adoc[leveloffset=+1]
include::../shared-doc/build-and-run-the-quickstart-with-openshift.adoc[leveloffset=+1]
-ifndef::ProductRelease,EAPXPRelease[]
-//Kubernetes
-include::../shared-doc/build-and-run-the-quickstart-with-kubernetes.adoc[leveloffset=+1]
-endif::[]
\ No newline at end of file
+include::../shared-doc/build-and-run-the-quickstart-with-kubernetes.adoc[leveloffset=+1]
\ No newline at end of file
diff --git a/mail/README-source.adoc b/mail/README-source.adoc
index d15e6a32ec..4d44991396 100644
--- a/mail/README-source.adoc
+++ b/mail/README-source.adoc
@@ -170,12 +170,5 @@ include::../shared-doc/restore-standalone-server-configuration-manual.adoc[level
// Build and run sections for other environments/builds
include::../shared-doc/build-and-run-the-quickstart-with-provisioned-server.adoc[leveloffset=+1]
-
-// OpenShift
include::../shared-doc/build-and-run-the-quickstart-with-openshift.adoc[leveloffset=+1]
-
-// Kubernetes
-ifndef::ProductRelease,EAPXPRelease[]
-//Kubernetes
-include::../shared-doc/build-and-run-the-quickstart-with-kubernetes.adoc[leveloffset=+1]
-endif::[]
\ No newline at end of file
+include::../shared-doc/build-and-run-the-quickstart-with-kubernetes.adoc[leveloffset=+1]
\ No newline at end of file
diff --git a/micrometer/README-source.adoc b/micrometer/README-source.adoc
index 7fc3695ee6..6e18800217 100644
--- a/micrometer/README-source.adoc
+++ b/micrometer/README-source.adoc
@@ -266,14 +266,9 @@ include::../shared-doc/restore-standalone-server-configuration.adoc[leveloffset=
include::../shared-doc/restore-standalone-server-configuration-manual.adoc[leveloffset=+3]
// Build and run sections for other environments/builds
include::../shared-doc/build-and-run-the-quickstart-with-provisioned-server.adoc[leveloffset=+1]
-// Bootable JAR
include::../shared-doc/build-and-run-the-quickstart-with-bootable-jar.adoc[leveloffset=+1]
-// OpenShift
include::../shared-doc/build-and-run-the-quickstart-with-openshift.adoc[leveloffset=+1]
-ifndef::ProductRelease,EAPXPRelease[]
-//Kubernetes
include::../shared-doc/build-and-run-the-quickstart-with-kubernetes.adoc[leveloffset=+1]
-endif::[]
== Conclusion
Micrometer provides a de facto standard way of capturing and publishing metrics to the monitoring solution of your choice. {productName} provides a convenient, out-of-the-box integration of Micrometer to make it easier to capture those metrics and monitor your application's health and performance. For more information on Micrometer, please refer to the project's https://micrometer.io[website].
diff --git a/microprofile-config/README-source.adoc b/microprofile-config/README-source.adoc
index 9c627ba9ca..7b61c574e4 100644
--- a/microprofile-config/README-source.adoc
+++ b/microprofile-config/README-source.adoc
@@ -796,15 +796,9 @@ endpoint using your browser or
converter. You will see the configured value which is taken from our created
`MicroProfileCustomValue` object.
-// Bootable JAR
include::../shared-doc/build-and-run-the-quickstart-with-bootable-jar.adoc[leveloffset=+1]
-
-// Openshift
include::../shared-doc/build-and-run-the-quickstart-with-openshift.adoc[leveloffset=+1]
-ifndef::ProductRelease,EAPXPRelease[]
-//Kubernetes
include::../shared-doc/build-and-run-the-quickstart-with-kubernetes.adoc[leveloffset=+1]
-endif::[]
== Conclusion
diff --git a/microprofile-fault-tolerance/README-source.adoc b/microprofile-fault-tolerance/README-source.adoc
index 8419ab8333..f5ba70be64 100644
--- a/microprofile-fault-tolerance/README-source.adoc
+++ b/microprofile-fault-tolerance/README-source.adoc
@@ -618,15 +618,9 @@ include::../shared-doc/run-integration-tests-with-server-distribution.adoc[level
// Undeploy the Quickstart
include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+2]
-// Bootable JAR
include::../shared-doc/build-and-run-the-quickstart-with-bootable-jar.adoc[leveloffset=+1]
-
-// OpenShift
include::../shared-doc/build-and-run-the-quickstart-with-openshift.adoc[leveloffset=+1]
-ifndef::ProductRelease,EAPXPRelease[]
-// Kubernetes
include::../shared-doc/build-and-run-the-quickstart-with-kubernetes.adoc[leveloffset=+1]
-endif::[]
== Conclusion
diff --git a/microprofile-health/README-source.adoc b/microprofile-health/README-source.adoc
index 97dc8e4944..9ef85c6327 100644
--- a/microprofile-health/README-source.adoc
+++ b/microprofile-health/README-source.adoc
@@ -449,15 +449,9 @@ error along with the health check response.
}
----
-//Bootable JAR
include::../shared-doc/build-and-run-the-quickstart-with-bootable-jar.adoc[leveloffset=+1]
-
-// OpenShift
include::../shared-doc/build-and-run-the-quickstart-with-openshift.adoc[leveloffset=+1]
-ifndef::ProductRelease,EAPXPRelease[]
-// Kubernetes
include::../shared-doc/build-and-run-the-quickstart-with-kubernetes.adoc[leveloffset=+1]
-endif::[]
== Conclusion
diff --git a/microprofile-jwt/README-source.adoc b/microprofile-jwt/README-source.adoc
index 1f78185db3..e877a42f71 100644
--- a/microprofile-jwt/README-source.adoc
+++ b/microprofile-jwt/README-source.adoc
@@ -691,15 +691,9 @@ $ curl -H "Authorization: Bearer ey..59g" http://localhost:8080/microprofile-jwt
7 months and 19 days until your next birthday.
----
-// Bootable JAR
include::../shared-doc/build-and-run-the-quickstart-with-bootable-jar.adoc[leveloffset=+1]
-
-// OpenShift
include::../shared-doc/build-and-run-the-quickstart-with-openshift.adoc[leveloffset=+1]
-ifndef::ProductRelease,EAPXPRelease[]
-// Kubernetes
include::../shared-doc/build-and-run-the-quickstart-with-kubernetes.adoc[leveloffset=+1]
-endif::[]
== Conclusion
diff --git a/microprofile-lra/README-source.adoc b/microprofile-lra/README-source.adoc
index 2c2110d297..87f759c201 100644
--- a/microprofile-lra/README-source.adoc
+++ b/microprofile-lra/README-source.adoc
@@ -157,15 +157,9 @@ process-state: reload-required
// Restore the {productName} Standalone Server Configuration Manually
include::../shared-doc/restore-standalone-server-configuration-manual.adoc[leveloffset=+2]
-//Bootable JAR
include::../shared-doc/build-and-run-the-quickstart-with-bootable-jar.adoc[leveloffset=+1]
-
-// OpenShift
include::../shared-doc/build-and-run-the-quickstart-with-openshift.adoc[leveloffset=+1]
-ifndef::ProductRelease,EAPXPRelease[]
-// Kubernetes
include::../shared-doc/build-and-run-the-quickstart-with-kubernetes.adoc[leveloffset=+1]
-endif::[]
[[creating-new-project]]
== Creating the Maven Project
diff --git a/microprofile-openapi/README-source.adoc b/microprofile-openapi/README-source.adoc
index 0be9c81a93..31105dea09 100644
--- a/microprofile-openapi/README-source.adoc
+++ b/microprofile-openapi/README-source.adoc
@@ -158,12 +158,6 @@ include::../shared-doc/run-integration-tests-with-server-distribution.adoc[level
// Undeploy the Quickstart
include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+1]
-// Bootable JAR
include::../shared-doc/build-and-run-the-quickstart-with-bootable-jar.adoc[leveloffset=+1]
-
-// OpenShift
include::../shared-doc/build-and-run-the-quickstart-with-openshift.adoc[leveloffset=+1]
-ifndef::ProductRelease,EAPXPRelease[]
-// Kubernetes
-include::../shared-doc/build-and-run-the-quickstart-with-kubernetes.adoc[leveloffset=+1]
-endif::[]
+include::../shared-doc/build-and-run-the-quickstart-with-kubernetes.adoc[leveloffset=+1]
\ No newline at end of file
diff --git a/microprofile-reactive-messaging-kafka/README-source.adoc b/microprofile-reactive-messaging-kafka/README-source.adoc
index 2812b44e2b..ce2731fe78 100644
--- a/microprofile-reactive-messaging-kafka/README-source.adoc
+++ b/microprofile-reactive-messaging-kafka/README-source.adoc
@@ -1038,10 +1038,7 @@ $ oc delete csv --all -n NAMESPACE
----
NOTE: Replace NAMESPACE above, with the actual name of the namespace used in the namespace-scoped installation.
-ifndef::ProductRelease,EAPXPRelease[]
-//Kubernetes
include::../shared-doc/build-and-run-the-quickstart-with-kubernetes.adoc[leveloffset=+2]
-endif::[]
== Conclusion
diff --git a/microprofile-rest-client/README-source.adoc b/microprofile-rest-client/README-source.adoc
index 903ac1e53c..575692a89c 100644
--- a/microprofile-rest-client/README-source.adoc
+++ b/microprofile-rest-client/README-source.adoc
@@ -167,15 +167,9 @@ include::../shared-doc/run-integration-tests-with-server-distribution.adoc[level
// Undeploy the Quickstart
include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+1]
-//Bootable JAR
include::../shared-doc/build-and-run-the-quickstart-with-bootable-jar.adoc[leveloffset=+1]
-// OpenShift
include::../shared-doc/build-and-run-the-quickstart-with-openshift.adoc[leveloffset=+1]
-ifndef::ProductRelease,EAPXPRelease[]
-// Kubernetes
include::../shared-doc/build-and-run-the-quickstart-with-kubernetes.adoc[leveloffset=+1]
-endif::[]
-
== Conclusion
diff --git a/numberguess/README-source.adoc b/numberguess/README-source.adoc
index 9303eaa799..d60c76fab1 100644
--- a/numberguess/README-source.adoc
+++ b/numberguess/README-source.adoc
@@ -43,7 +43,4 @@ include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+2]
// Build and run sections for other environments/builds
include::../shared-doc/build-and-run-the-quickstart-with-provisioned-server.adoc[leveloffset=+1]
include::../shared-doc/build-and-run-the-quickstart-with-openshift.adoc[leveloffset=+1]
-ifndef::ProductRelease,EAPXPRelease[]
-// Kubernetes
-include::../shared-doc/build-and-run-the-quickstart-with-kubernetes.adoc[leveloffset=+1]
-endif::[]
+include::../shared-doc/build-and-run-the-quickstart-with-kubernetes.adoc[leveloffset=+1]
\ No newline at end of file
diff --git a/opentelemetry-tracing/README-source.adoc b/opentelemetry-tracing/README-source.adoc
index a347b88b5e..94829a7bf5 100644
--- a/opentelemetry-tracing/README-source.adoc
+++ b/opentelemetry-tracing/README-source.adoc
@@ -225,14 +225,9 @@ include::../shared-doc/restore-standalone-server-configuration.adoc[leveloffset=
include::../shared-doc/restore-standalone-server-configuration-manual.adoc[leveloffset=+3]
// Build and run sections for other environments/builds
include::../shared-doc/build-and-run-the-quickstart-with-provisioned-server.adoc[leveloffset=+1]
-// Bootable JAR
include::../shared-doc/build-and-run-the-quickstart-with-bootable-jar.adoc[leveloffset=+1]
-// OpenShift
include::../shared-doc/build-and-run-the-quickstart-with-openshift.adoc[leveloffset=+1]
-ifndef::ProductRelease,EAPXPRelease[]
-//Kubernetes
include::../shared-doc/build-and-run-the-quickstart-with-kubernetes.adoc[leveloffset=+1]
-endif::[]
== Conclusion
diff --git a/remote-helloworld-mdb/README-source.adoc b/remote-helloworld-mdb/README-source.adoc
index 9b067a13bf..7c77ac9534 100644
--- a/remote-helloworld-mdb/README-source.adoc
+++ b/remote-helloworld-mdb/README-source.adoc
@@ -148,9 +148,4 @@ include::../shared-doc/restore-standalone-server-configuration-manual.adoc[level
// Build and run sections for other environments/builds
include::../shared-doc/build-and-run-the-quickstart-with-provisioned-server.adoc[leveloffset=+1]
include::../shared-doc/build-and-run-the-quickstart-with-openshift.adoc[leveloffset=+1]
-
-ifndef::ProductRelease,EAPXPRelease[]
-//Kubernetes
include::../shared-doc/build-and-run-the-quickstart-with-kubernetes.adoc[leveloffset=+1]
-endif::[]
-
diff --git a/servlet-async/README-source.adoc b/servlet-async/README-source.adoc
index e41041fa17..c77eb3e961 100644
--- a/servlet-async/README-source.adoc
+++ b/servlet-async/README-source.adoc
@@ -47,7 +47,4 @@ include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+2]
// Build and run sections for other environments/builds
include::../shared-doc/build-and-run-the-quickstart-with-provisioned-server.adoc[leveloffset=+1]
include::../shared-doc/build-and-run-the-quickstart-with-openshift.adoc[leveloffset=+1]
-ifndef::ProductRelease,EAPXPRelease[]
-// Kubernetes
-include::../shared-doc/build-and-run-the-quickstart-with-kubernetes.adoc[leveloffset=+1]
-endif::[]
+include::../shared-doc/build-and-run-the-quickstart-with-kubernetes.adoc[leveloffset=+1]
\ No newline at end of file
diff --git a/servlet-filterlistener/README-source.adoc b/servlet-filterlistener/README-source.adoc
index ab06c7480c..a691c76193 100644
--- a/servlet-filterlistener/README-source.adoc
+++ b/servlet-filterlistener/README-source.adoc
@@ -94,7 +94,4 @@ include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+2]
// Build and run sections for other environments/builds
include::../shared-doc/build-and-run-the-quickstart-with-provisioned-server.adoc[leveloffset=+1]
include::../shared-doc/build-and-run-the-quickstart-with-openshift.adoc[leveloffset=+1]
-ifndef::ProductRelease,EAPXPRelease[]
-// Kubernetes
-include::../shared-doc/build-and-run-the-quickstart-with-kubernetes.adoc[leveloffset=+1]
-endif::[]
+include::../shared-doc/build-and-run-the-quickstart-with-kubernetes.adoc[leveloffset=+1]
\ No newline at end of file
diff --git a/servlet-security/README-source.adoc b/servlet-security/README-source.adoc
index 4e40b69945..db880f6104 100644
--- a/servlet-security/README-source.adoc
+++ b/servlet-security/README-source.adoc
@@ -221,7 +221,4 @@ include::../shared-doc/restore-standalone-server-configuration-manual.adoc[level
:datasourceJndiName: java:jboss/datasources/ServletSecurityDS
include::../shared-doc/build-and-run-the-quickstart-with-provisioned-server.adoc[leveloffset=+1]
include::../shared-doc/build-and-run-the-quickstart-with-openshift.adoc[leveloffset=+1]
-ifndef::ProductRelease,EAPXPRelease[]
-// Kubernetes
-include::../shared-doc/build-and-run-the-quickstart-with-kubernetes.adoc[leveloffset=+1]
-endif::[]
+include::../shared-doc/build-and-run-the-quickstart-with-kubernetes.adoc[leveloffset=+1]
\ No newline at end of file
diff --git a/shared-doc/build-and-run-the-quickstart-with-bootable-jar.adoc b/shared-doc/build-and-run-the-quickstart-with-bootable-jar.adoc
index b0a4a38ca7..044fd9e1f5 100644
--- a/shared-doc/build-and-run-the-quickstart-with-bootable-jar.adoc
+++ b/shared-doc/build-and-run-the-quickstart-with-bootable-jar.adoc
@@ -58,8 +58,6 @@ ifndef::ProductRelease[]
endif::[]
ifdef::ProductRelease[]
-ifndef::EAPXPRelease[:featurePackLocation: org.jboss.eap:wildfly-ee-galleon-pack]
-ifdef::EAPXPRelease[:featurePackLocation: org.jboss.eap.xp:wildfly-galleon-pack]
[source,xml,subs="attributes+"]
----
@@ -74,13 +72,6 @@ ifdef::EAPXPRelease[:featurePackLocation: org.jboss.eap.xp:wildfly-galleon-pack]
eap-maven-plugin
...
-
-
- {featurePackLocation}
-
- ...
-
- ...
true
@@ -96,6 +87,11 @@ ifdef::EAPXPRelease[:featurePackLocation: org.jboss.eap.xp:wildfly-galleon-pack]
----
+[NOTE]
+====
+The Glow functionality of the EAP Maven Plugin is Tech Preview.
+====
+
endif::[]
[NOTE]
diff --git a/shared-doc/build-and-run-the-quickstart-with-kubernetes.adoc b/shared-doc/build-and-run-the-quickstart-with-kubernetes.adoc
index fca53b5232..2b6a6f0ac3 100644
--- a/shared-doc/build-and-run-the-quickstart-with-kubernetes.adoc
+++ b/shared-doc/build-and-run-the-quickstart-with-kubernetes.adoc
@@ -6,6 +6,14 @@ endif::helm-app-name[]
[[build_and_run_the_quickstart_on_kubernetes]]
= Building and running the quickstart application with Kubernetes
+
+ifdef::ProductRelease[]
+[NOTE]
+====
+Building and running this {productName} quickstart with Kubernetes is not supported.
+====
+endif::[]
+
// The openshift profile
include::../shared-doc/build-the-quickstart-for-kubernetes.adoc[leveloffset=+1]
// Getting Started with Helm
diff --git a/shared-doc/build-and-run-the-quickstart-with-provisioned-server.adoc b/shared-doc/build-and-run-the-quickstart-with-provisioned-server.adoc
index ed365c1b7f..0b185e44aa 100644
--- a/shared-doc/build-and-run-the-quickstart-with-provisioned-server.adoc
+++ b/shared-doc/build-and-run-the-quickstart-with-provisioned-server.adoc
@@ -21,7 +21,10 @@ endif::deploymentTargetDir[]
ifndef::extraStartParams[:extraStartParams: ]
ifndef::extraProvisioningTestParams[:extraProvisioningTestParams: ]
-Instead of using a standard {productName} server distribution, you can alternatively provision a {productName} server to deploy and run the quickstart. The functionality is provided by the WildFly Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
+ifndef::ProductRelease[:mavenPluginName: WildFly]
+ifdef::ProductRelease[:mavenPluginName: EAP]
+
+Instead of using a standard {productName} server distribution, you can alternatively provision a {productName} server to deploy and run the quickstart. The functionality is provided by the {mavenPluginName} Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
ifndef::ProductRelease[]
[source,xml,subs="attributes+"]
@@ -58,8 +61,6 @@ ifndef::ProductRelease[]
endif::[]
ifdef::ProductRelease[]
-ifndef::EAPXPRelease[:featurePackLocation: org.jboss.eap:wildfly-ee-galleon-pack]
-ifdef::EAPXPRelease[:featurePackLocation: org.jboss.eap.xp:wildfly-galleon-pack]
[source,xml,subs="attributes+"]
----
@@ -74,13 +75,6 @@ ifdef::EAPXPRelease[:featurePackLocation: org.jboss.eap.xp:wildfly-galleon-pack]
eap-maven-plugin
...
-
-
- {featurePackLocation}
-
- ...
-
- ...
@@ -95,6 +89,10 @@ ifdef::EAPXPRelease[:featurePackLocation: org.jboss.eap.xp:wildfly-galleon-pack]
----
+[NOTE]
+====
+The Glow functionality of the EAP Maven Plugin is Tech Preview.
+====
endif::[]
ifdef::glowWarnsAboutJNDILookups[]
diff --git a/shared-doc/build-the-quickstart-for-cloud-platform-internal.adoc b/shared-doc/build-the-quickstart-for-cloud-platform-internal.adoc
index b084fd7fdd..24b9ee425f 100644
--- a/shared-doc/build-the-quickstart-for-cloud-platform-internal.adoc
+++ b/shared-doc/build-the-quickstart-for-cloud-platform-internal.adoc
@@ -33,8 +33,6 @@ You may note that unlike the `provisioned-server` profile it uses the cloud cont
endif::[]
ifdef::ProductRelease[]
-ifndef::EAPXPRelease[:featurePackLocation: org.jboss.eap:wildfly-ee-galleon-pack]
-ifdef::EAPXPRelease[:featurePackLocation: org.jboss.eap.xp:wildfly-galleon-pack]
The server provisioning functionality is provided by the EAP Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
[source,xml,subs="attributes+"]
----
@@ -46,16 +44,11 @@ The server provisioning functionality is provided by the EAP Maven Plugin, and y
org.jboss.eap.plugins
eap-maven-plugin
+
+ ...
+ cloud
+
...
-
-
- {featurePackLocation}
-
-
- org.jboss.eap.cloud:eap-cloud-galleon-pack
-
-
- ...
@@ -71,4 +64,8 @@ The server provisioning functionality is provided by the EAP Maven Plugin, and y
----
You may note that it uses the cloud feature pack which enables a configuration tuned for the {cloud-platform} environment.
+[NOTE]
+====
+The Glow functionality of the EAP Maven Plugin is Tech Preview.
+====
endif::[]
diff --git a/spring-resteasy/README-source.adoc b/spring-resteasy/README-source.adoc
index 814ca7ab15..790600773d 100644
--- a/spring-resteasy/README-source.adoc
+++ b/spring-resteasy/README-source.adoc
@@ -88,7 +88,4 @@ include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+1]
// Build and run sections for other environments/builds
include::../shared-doc/build-and-run-the-quickstart-with-provisioned-server.adoc[leveloffset=+1]
include::../shared-doc/build-and-run-the-quickstart-with-openshift.adoc[leveloffset=+1]
-ifndef::ProductRelease,EAPXPRelease[]
-// Kubernetes
-include::../shared-doc/build-and-run-the-quickstart-with-kubernetes.adoc[leveloffset=+1]
-endif::[]
+include::../shared-doc/build-and-run-the-quickstart-with-kubernetes.adoc[leveloffset=+1]
\ No newline at end of file
diff --git a/tasks-jsf/README-source.adoc b/tasks-jsf/README-source.adoc
index 7649eee2d2..318e7fabea 100644
--- a/tasks-jsf/README-source.adoc
+++ b/tasks-jsf/README-source.adoc
@@ -57,7 +57,4 @@ include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+2]
// Build and run sections for other environments/builds
include::../shared-doc/build-and-run-the-quickstart-with-provisioned-server.adoc[leveloffset=+1]
include::../shared-doc/build-and-run-the-quickstart-with-openshift.adoc[leveloffset=+1]
-ifndef::ProductRelease,EAPXPRelease[]
-// Kubernetes
-include::../shared-doc/build-and-run-the-quickstart-with-kubernetes.adoc[leveloffset=+1]
-endif::[]
+include::../shared-doc/build-and-run-the-quickstart-with-kubernetes.adoc[leveloffset=+1]
\ No newline at end of file
diff --git a/temperature-converter/README-source.adoc b/temperature-converter/README-source.adoc
index 63077d4cb9..e52bc3ef9b 100644
--- a/temperature-converter/README-source.adoc
+++ b/temperature-converter/README-source.adoc
@@ -57,7 +57,4 @@ include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+2]
// Build and run sections for other environments/builds
include::../shared-doc/build-and-run-the-quickstart-with-provisioned-server.adoc[leveloffset=+1]
include::../shared-doc/build-and-run-the-quickstart-with-openshift.adoc[leveloffset=+1]
-ifndef::ProductRelease,EAPXPRelease[]
-// Kubernetes
-include::../shared-doc/build-and-run-the-quickstart-with-kubernetes.adoc[leveloffset=+1]
-endif::[]
+include::../shared-doc/build-and-run-the-quickstart-with-kubernetes.adoc[leveloffset=+1]
\ No newline at end of file
diff --git a/thread-racing/README-source.adoc b/thread-racing/README-source.adoc
index 61644f6c5f..76b48deb63 100644
--- a/thread-racing/README-source.adoc
+++ b/thread-racing/README-source.adoc
@@ -71,7 +71,4 @@ include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+2]
:glowWarnsAboutJNDILookups:
include::../shared-doc/build-and-run-the-quickstart-with-provisioned-server.adoc[leveloffset=+1]
include::../shared-doc/build-and-run-the-quickstart-with-openshift.adoc[leveloffset=+1]
-ifndef::ProductRelease,EAPXPRelease[]
-// Kubernetes
-include::../shared-doc/build-and-run-the-quickstart-with-kubernetes.adoc[leveloffset=+1]
-endif::[]
+include::../shared-doc/build-and-run-the-quickstart-with-kubernetes.adoc[leveloffset=+1]
\ No newline at end of file
diff --git a/todo-backend/README-source.adoc b/todo-backend/README-source.adoc
index ff74efb2a3..87d9c3949b 100644
--- a/todo-backend/README-source.adoc
+++ b/todo-backend/README-source.adoc
@@ -223,15 +223,9 @@ include::../todo-backend/additional-readme-openshift.adoc[leveloffset=+1]
//===========================================================
//===========================================================
-// Kubernetes - START
-ifndef::ProductRelease,EAPXPRelease[]
== Run the Backend on Kubernetes
-
-//Kubernetes
include::../shared-doc/build-and-run-the-quickstart-with-kubernetes.adoc[leveloffset=+1]
include::../todo-backend/additional-readme-kubernetes.adoc[leveloffset=+1]
-endif::[]
-// Kubernetes - END
//===========================================================
diff --git a/websocket-endpoint/README-source.adoc b/websocket-endpoint/README-source.adoc
index 0a72607e41..4872bb2638 100644
--- a/websocket-endpoint/README-source.adoc
+++ b/websocket-endpoint/README-source.adoc
@@ -55,7 +55,4 @@ include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+2]
// Build and run sections for other environments/builds
include::../shared-doc/build-and-run-the-quickstart-with-provisioned-server.adoc[leveloffset=+1]
include::../shared-doc/build-and-run-the-quickstart-with-openshift.adoc[leveloffset=+1]
-ifndef::ProductRelease,EAPXPRelease[]
-// Kubernetes
-include::../shared-doc/build-and-run-the-quickstart-with-kubernetes.adoc[leveloffset=+1]
-endif::[]
+include::../shared-doc/build-and-run-the-quickstart-with-kubernetes.adoc[leveloffset=+1]
\ No newline at end of file
diff --git a/websocket-hello/README-source.adoc b/websocket-hello/README-source.adoc
index 337add3d0b..4a3aee1df5 100644
--- a/websocket-hello/README-source.adoc
+++ b/websocket-hello/README-source.adoc
@@ -61,7 +61,4 @@ include::../shared-doc/undeploy-the-quickstart.adoc[leveloffset=+2]
// Build and run sections for other environments/builds
include::../shared-doc/build-and-run-the-quickstart-with-provisioned-server.adoc[leveloffset=+1]
include::../shared-doc/build-and-run-the-quickstart-with-openshift.adoc[leveloffset=+1]
-ifndef::ProductRelease,EAPXPRelease[]
-// Kubernetes
-include::../shared-doc/build-and-run-the-quickstart-with-kubernetes.adoc[leveloffset=+1]
-endif::[]
+include::../shared-doc/build-and-run-the-quickstart-with-kubernetes.adoc[leveloffset=+1]
\ No newline at end of file