diff --git a/README.adoc b/README.adoc
index b9f27b92c4..b0bf03af95 100644
--- a/README.adoc
+++ b/README.adoc
@@ -192,9 +192,6 @@ endif::[]
:LinkJBDSGettingStarted: https://access.redhat.com/documentation/en-us/red_hat_codeready_studio/{JBDSVersion}/html-single/getting_started_with_codeready_studio_tools/
:JBDSGettingStartedBookName: Getting Started with CodeReady Studio Tools
-// Enable Rendering of Glow configuration in plugin examples
-:portedToGlow: true
-
:toc:
:toclevels: 4
:numbered:
diff --git a/batch-processing/README.adoc b/batch-processing/README.adoc
index d4771e9dd5..556454c79d 100644
--- a/batch-processing/README.adoc
+++ b/batch-processing/README.adoc
@@ -66,7 +66,7 @@ ifndef::ProductRelease,EAPXPRelease[]
:productImageVersion: 31.0
:githubRepoUrl: https://github.com/wildfly/quickstart/
:githubRepoCodeUrl: https://github.com/wildfly/quickstart.git
-:WildFlyQuickStartRepoTag: 31.0.0.Final-glow-preview
+:WildFlyQuickStartRepoTag: 31.0.0.Final
:DocInfoProductName: Red Hat JBoss Enterprise Application Platform
:DocInfoProductNameURL: red_hat_jboss_enterprise_application_platform
:DocInfoProductNumber: 8.0
@@ -196,15 +196,11 @@ endif::[]
:LinkJBDSGettingStarted: https://access.redhat.com/documentation/en-us/red_hat_codeready_studio/{JBDSVersion}/html-single/getting_started_with_codeready_studio_tools/
:JBDSGettingStartedBookName: Getting Started with CodeReady Studio Tools
-// Enable Rendering of Glow configuration in plugin examples
-:portedToGlow: true
-
= batch-processing: Chunk oriented Batch 1.0 processing
:author: Rafael Benevides
:level: Intermediate
:technologies: CDI, Batch 1.0, JSF
:openshift: true
-:portedToGlow: true
[abstract]
The `batch-processing` quickstart shows how to use chunk oriented batch jobs to import a file to a database.
@@ -731,7 +727,7 @@ For Windows, use the `__{jbossHomeName}__\bin\add-user.bat` script.
endif::[]
The server provisioning functionality is provided by the WildFly Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
-ifndef::portedToGlow[]
+
[source,xml,subs="attributes+"]
----
@@ -764,55 +760,6 @@ ifndef::portedToGlow[]
----
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- provisioned-server
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases/tag[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
[NOTE]
====
@@ -1009,14 +956,9 @@ ifdef::ProductRelease,EAPXPRelease[]
The server provisioning functionality is provided by the EAP Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
endif::[]
-<<<<<<< HEAD
-ifndef::ProductRelease,EAPXPRelease[]
-ifndef::portedToGlow[]
-=======
// Render XML Snippet of openshift Maven profile...
ifndef::ProductRelease[]
// ... for WildFly
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -1051,68 +993,10 @@ ifndef::ProductRelease[]
----
-<<<<<<< HEAD
-You may note that unlike the `provisioned-server` profile it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- openshift
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
- cloud
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-You may note that unlike the `provisioned-server` profile it uses the cloud context which enables a configuration tuned for OpenShift environment.
-
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
-endif::ProductRelease,EAPXPRelease[]
-
-ifdef::ProductRelease,EAPXPRelease[]
-=======
endif::[]
ifdef::ProductRelease[]
ifndef::EAPXPRelease[]
// ... for EAP
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -1148,9 +1032,6 @@ ifndef::EAPXPRelease[]
----
-<<<<<<< HEAD
-You may note that it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-=======
endif::[]
ifdef::EAPXPRelease[]
// ... for EAP XP
@@ -1204,10 +1085,8 @@ ifdef::EAPXPRelease[]
====
Previous {productName} releases used the WildFly JAR Maven Plugin to package the quickstart in a Bootable JAR, when deploying it on OpenShift, and while that's still supported it's no longer recommended.
====
->>>>>>> upstream/main
endif::[]
-
:leveloffset: 1
// Getting Started with Helm
:leveloffset: +1
@@ -1313,11 +1192,7 @@ ifndef::useHelmChartDir[]
----
build:
uri: https://github.com/wildfly/quickstart.git
-<<<<<<< HEAD
- ref: 31.x-glow-preview
-=======
ref: main
->>>>>>> upstream/main
contextDir: batch-processing
deploy:
replicas: 1
diff --git a/bmt/README.adoc b/bmt/README.adoc
index d84b51bf47..efa5bb417e 100644
--- a/bmt/README.adoc
+++ b/bmt/README.adoc
@@ -66,7 +66,7 @@ ifndef::ProductRelease,EAPXPRelease[]
:productImageVersion: 31.0
:githubRepoUrl: https://github.com/wildfly/quickstart/
:githubRepoCodeUrl: https://github.com/wildfly/quickstart.git
-:WildFlyQuickStartRepoTag: 31.0.0.Final-glow-preview
+:WildFlyQuickStartRepoTag: 31.0.0.Final
:DocInfoProductName: Red Hat JBoss Enterprise Application Platform
:DocInfoProductNameURL: red_hat_jboss_enterprise_application_platform
:DocInfoProductNumber: 8.0
@@ -196,15 +196,11 @@ endif::[]
:LinkJBDSGettingStarted: https://access.redhat.com/documentation/en-us/red_hat_codeready_studio/{JBDSVersion}/html-single/getting_started_with_codeready_studio_tools/
:JBDSGettingStartedBookName: Getting Started with CodeReady Studio Tools
-// Enable Rendering of Glow configuration in plugin examples
-:portedToGlow: true
-
= bmt: Bean Managed Transactions with JPA and JTA
:author: Mike Musgrove
:level: Intermediate
:technologies: EJB, BMT
:openshift: true
-:portedToGlow: true
[abstract]
The `bmt` quickstart demonstrates Bean-Managed Transactions (BMT), showing how to manually manage transaction demarcation while accessing JPA entities.
@@ -663,7 +659,7 @@ For Windows, use the `__{jbossHomeName}__\bin\add-user.bat` script.
endif::[]
The server provisioning functionality is provided by the WildFly Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
-ifndef::portedToGlow[]
+
[source,xml,subs="attributes+"]
----
@@ -696,55 +692,6 @@ ifndef::portedToGlow[]
----
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- provisioned-server
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases/tag[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
[NOTE]
====
@@ -941,14 +888,9 @@ ifdef::ProductRelease,EAPXPRelease[]
The server provisioning functionality is provided by the EAP Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
endif::[]
-<<<<<<< HEAD
-ifndef::ProductRelease,EAPXPRelease[]
-ifndef::portedToGlow[]
-=======
// Render XML Snippet of openshift Maven profile...
ifndef::ProductRelease[]
// ... for WildFly
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -983,68 +925,10 @@ ifndef::ProductRelease[]
----
-<<<<<<< HEAD
-You may note that unlike the `provisioned-server` profile it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- openshift
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
- cloud
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-You may note that unlike the `provisioned-server` profile it uses the cloud context which enables a configuration tuned for OpenShift environment.
-
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
-endif::ProductRelease,EAPXPRelease[]
-
-ifdef::ProductRelease,EAPXPRelease[]
-=======
endif::[]
ifdef::ProductRelease[]
ifndef::EAPXPRelease[]
// ... for EAP
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -1080,9 +964,6 @@ ifndef::EAPXPRelease[]
----
-<<<<<<< HEAD
-You may note that it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-=======
endif::[]
ifdef::EAPXPRelease[]
// ... for EAP XP
@@ -1136,10 +1017,8 @@ ifdef::EAPXPRelease[]
====
Previous {productName} releases used the WildFly JAR Maven Plugin to package the quickstart in a Bootable JAR, when deploying it on OpenShift, and while that's still supported it's no longer recommended.
====
->>>>>>> upstream/main
endif::[]
-
:leveloffset: 1
// Getting Started with Helm
:leveloffset: +1
@@ -1245,11 +1124,7 @@ ifndef::useHelmChartDir[]
----
build:
uri: https://github.com/wildfly/quickstart.git
-<<<<<<< HEAD
- ref: 31.x-glow-preview
-=======
ref: main
->>>>>>> upstream/main
contextDir: bmt
deploy:
replicas: 1
diff --git a/cmt/README.adoc b/cmt/README.adoc
index 31821dbcdb..ae4d6f39f5 100644
--- a/cmt/README.adoc
+++ b/cmt/README.adoc
@@ -66,7 +66,7 @@ ifndef::ProductRelease,EAPXPRelease[]
:productImageVersion: 31.0
:githubRepoUrl: https://github.com/wildfly/quickstart/
:githubRepoCodeUrl: https://github.com/wildfly/quickstart.git
-:WildFlyQuickStartRepoTag: 31.0.0.Final-glow-preview
+:WildFlyQuickStartRepoTag: 31.0.0.Final
:DocInfoProductName: Red Hat JBoss Enterprise Application Platform
:DocInfoProductNameURL: red_hat_jboss_enterprise_application_platform
:DocInfoProductNumber: 8.0
@@ -196,15 +196,11 @@ endif::[]
:LinkJBDSGettingStarted: https://access.redhat.com/documentation/en-us/red_hat_codeready_studio/{JBDSVersion}/html-single/getting_started_with_codeready_studio_tools/
:JBDSGettingStartedBookName: Getting Started with CodeReady Studio Tools
-// Enable Rendering of Glow configuration in plugin examples
-:portedToGlow: true
-
= cmt: Container Managed Transactions (CMT)
:author: Tom Jenkinson
:level: Intermediate
:technologies: EJB, CMT, JMS
:openshift: true
-:portedToGlow: true
[abstract]
The `cmt` quickstart demonstrates Container-Managed Transactions (CMT), showing how to use transactions managed by the container.
@@ -676,7 +672,7 @@ For Windows, use the `__{jbossHomeName}__\bin\add-user.bat` script.
endif::[]
The server provisioning functionality is provided by the WildFly Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
-ifndef::portedToGlow[]
+
[source,xml,subs="attributes+"]
----
@@ -709,55 +705,6 @@ ifndef::portedToGlow[]
----
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- provisioned-server
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases/tag[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
[NOTE]
====
@@ -954,14 +901,9 @@ ifdef::ProductRelease,EAPXPRelease[]
The server provisioning functionality is provided by the EAP Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
endif::[]
-<<<<<<< HEAD
-ifndef::ProductRelease,EAPXPRelease[]
-ifndef::portedToGlow[]
-=======
// Render XML Snippet of openshift Maven profile...
ifndef::ProductRelease[]
// ... for WildFly
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -996,68 +938,10 @@ ifndef::ProductRelease[]
----
-<<<<<<< HEAD
-You may note that unlike the `provisioned-server` profile it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- openshift
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
- cloud
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-You may note that unlike the `provisioned-server` profile it uses the cloud context which enables a configuration tuned for OpenShift environment.
-
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
-endif::ProductRelease,EAPXPRelease[]
-
-ifdef::ProductRelease,EAPXPRelease[]
-=======
endif::[]
ifdef::ProductRelease[]
ifndef::EAPXPRelease[]
// ... for EAP
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -1093,9 +977,6 @@ ifndef::EAPXPRelease[]
----
-<<<<<<< HEAD
-You may note that it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-=======
endif::[]
ifdef::EAPXPRelease[]
// ... for EAP XP
@@ -1149,10 +1030,8 @@ ifdef::EAPXPRelease[]
====
Previous {productName} releases used the WildFly JAR Maven Plugin to package the quickstart in a Bootable JAR, when deploying it on OpenShift, and while that's still supported it's no longer recommended.
====
->>>>>>> upstream/main
endif::[]
-
:leveloffset: 1
// Getting Started with Helm
:leveloffset: +1
@@ -1258,11 +1137,7 @@ ifndef::useHelmChartDir[]
----
build:
uri: https://github.com/wildfly/quickstart.git
-<<<<<<< HEAD
- ref: 31.x-glow-preview
-=======
ref: main
->>>>>>> upstream/main
contextDir: cmt
deploy:
replicas: 1
diff --git a/ee-security/README.adoc b/ee-security/README.adoc
index d3b237c1ad..091aa1ad40 100644
--- a/ee-security/README.adoc
+++ b/ee-security/README.adoc
@@ -66,7 +66,7 @@ ifndef::ProductRelease,EAPXPRelease[]
:productImageVersion: 31.0
:githubRepoUrl: https://github.com/wildfly/quickstart/
:githubRepoCodeUrl: https://github.com/wildfly/quickstart.git
-:WildFlyQuickStartRepoTag: 31.0.0.Final-glow-preview
+:WildFlyQuickStartRepoTag: 31.0.0.Final
:DocInfoProductName: Red Hat JBoss Enterprise Application Platform
:DocInfoProductNameURL: red_hat_jboss_enterprise_application_platform
:DocInfoProductNumber: 8.0
@@ -196,15 +196,11 @@ endif::[]
:LinkJBDSGettingStarted: https://access.redhat.com/documentation/en-us/red_hat_codeready_studio/{JBDSVersion}/html-single/getting_started_with_codeready_studio_tools/
:JBDSGettingStartedBookName: Getting Started with CodeReady Studio Tools
-// Enable Rendering of Glow configuration in plugin examples
-:portedToGlow: true
-
= ee-security: Using Jakarta EE Security
:author: Darran Lofthouse
:level: Intermediate
:technologies: EE Security, Servlet, CDI
:openshift: true
-:portedToGlow: true
[abstract]
The `ee-security` quickstart demonstrates Jakarta EE security.
@@ -880,7 +876,7 @@ For Windows, use the `__{jbossHomeName}__\bin\add-user.bat` script.
endif::[]
The server provisioning functionality is provided by the WildFly Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
-ifndef::portedToGlow[]
+
[source,xml,subs="attributes+"]
----
@@ -913,55 +909,6 @@ ifndef::portedToGlow[]
----
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- provisioned-server
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases/tag[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
[NOTE]
====
@@ -1158,14 +1105,9 @@ ifdef::ProductRelease,EAPXPRelease[]
The server provisioning functionality is provided by the EAP Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
endif::[]
-<<<<<<< HEAD
-ifndef::ProductRelease,EAPXPRelease[]
-ifndef::portedToGlow[]
-=======
// Render XML Snippet of openshift Maven profile...
ifndef::ProductRelease[]
// ... for WildFly
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -1200,68 +1142,10 @@ ifndef::ProductRelease[]
----
-<<<<<<< HEAD
-You may note that unlike the `provisioned-server` profile it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- openshift
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
- cloud
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-You may note that unlike the `provisioned-server` profile it uses the cloud context which enables a configuration tuned for OpenShift environment.
-
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
-endif::ProductRelease,EAPXPRelease[]
-
-ifdef::ProductRelease,EAPXPRelease[]
-=======
endif::[]
ifdef::ProductRelease[]
ifndef::EAPXPRelease[]
// ... for EAP
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -1297,9 +1181,6 @@ ifndef::EAPXPRelease[]
----
-<<<<<<< HEAD
-You may note that it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-=======
endif::[]
ifdef::EAPXPRelease[]
// ... for EAP XP
@@ -1353,10 +1234,8 @@ ifdef::EAPXPRelease[]
====
Previous {productName} releases used the WildFly JAR Maven Plugin to package the quickstart in a Bootable JAR, when deploying it on OpenShift, and while that's still supported it's no longer recommended.
====
->>>>>>> upstream/main
endif::[]
-
:leveloffset: 1
// Getting Started with Helm
:leveloffset: +1
@@ -1462,11 +1341,7 @@ ifndef::useHelmChartDir[]
----
build:
uri: https://github.com/wildfly/quickstart.git
-<<<<<<< HEAD
- ref: 31.x-glow-preview
-=======
ref: main
->>>>>>> upstream/main
contextDir: ee-security
deploy:
replicas: 1
diff --git a/ejb-multi-server/README.adoc b/ejb-multi-server/README.adoc
index f5bf85c5c7..12de65f67e 100644
--- a/ejb-multi-server/README.adoc
+++ b/ejb-multi-server/README.adoc
@@ -66,7 +66,7 @@ ifndef::ProductRelease,EAPXPRelease[]
:productImageVersion: 31.0
:githubRepoUrl: https://github.com/wildfly/quickstart/
:githubRepoCodeUrl: https://github.com/wildfly/quickstart.git
-:WildFlyQuickStartRepoTag: 31.0.0.Final-glow-preview
+:WildFlyQuickStartRepoTag: 31.0.0.Final
:DocInfoProductName: Red Hat JBoss Enterprise Application Platform
:DocInfoProductNameURL: red_hat_jboss_enterprise_application_platform
:DocInfoProductNumber: 8.0
@@ -196,9 +196,6 @@ endif::[]
:LinkJBDSGettingStarted: https://access.redhat.com/documentation/en-us/red_hat_codeready_studio/{JBDSVersion}/html-single/getting_started_with_codeready_studio_tools/
:JBDSGettingStartedBookName: Getting Started with CodeReady Studio Tools
-// Enable Rendering of Glow configuration in plugin examples
-:portedToGlow: true
-
= ejb-multi-server: EJB Communication Across Servers
:author: Wolf-Dieter Fink
:level: Advanced
diff --git a/ejb-remote/README.adoc b/ejb-remote/README.adoc
index d94f86b5e9..5749452e7f 100644
--- a/ejb-remote/README.adoc
+++ b/ejb-remote/README.adoc
@@ -66,7 +66,7 @@ ifndef::ProductRelease,EAPXPRelease[]
:productImageVersion: 31.0
:githubRepoUrl: https://github.com/wildfly/quickstart/
:githubRepoCodeUrl: https://github.com/wildfly/quickstart.git
-:WildFlyQuickStartRepoTag: 31.0.0.Final-glow-preview
+:WildFlyQuickStartRepoTag: 31.0.0.Final
:DocInfoProductName: Red Hat JBoss Enterprise Application Platform
:DocInfoProductNameURL: red_hat_jboss_enterprise_application_platform
:DocInfoProductNumber: 8.0
@@ -196,15 +196,11 @@ endif::[]
:LinkJBDSGettingStarted: https://access.redhat.com/documentation/en-us/red_hat_codeready_studio/{JBDSVersion}/html-single/getting_started_with_codeready_studio_tools/
:JBDSGettingStartedBookName: Getting Started with CodeReady Studio Tools
-// Enable Rendering of Glow configuration in plugin examples
-:portedToGlow: true
-
= ejb-remote: Remote EJB Client Example
:author: Jaikiran Pai, Mike Musgrove
:level: Intermediate
:technologies: EJB, JNDI
:openshift: true
-:portedToGlow: true
[abstract]
The `ejb-remote` quickstart uses EJB and JNDI to demonstrate how to access an EJB, deployed to {productName}, from a remote Java client application.
@@ -703,7 +699,7 @@ For Windows, use the `__{jbossHomeName}__\bin\add-user.bat` script.
endif::[]
The server provisioning functionality is provided by the WildFly Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
-ifndef::portedToGlow[]
+
[source,xml,subs="attributes+"]
----
@@ -736,55 +732,6 @@ ifndef::portedToGlow[]
----
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- provisioned-server
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases/tag[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
[NOTE]
====
@@ -981,14 +928,9 @@ ifdef::ProductRelease,EAPXPRelease[]
The server provisioning functionality is provided by the EAP Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
endif::[]
-<<<<<<< HEAD
-ifndef::ProductRelease,EAPXPRelease[]
-ifndef::portedToGlow[]
-=======
// Render XML Snippet of openshift Maven profile...
ifndef::ProductRelease[]
// ... for WildFly
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -1023,68 +965,10 @@ ifndef::ProductRelease[]
----
-<<<<<<< HEAD
-You may note that unlike the `provisioned-server` profile it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- openshift
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
- cloud
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-You may note that unlike the `provisioned-server` profile it uses the cloud context which enables a configuration tuned for OpenShift environment.
-
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
-endif::ProductRelease,EAPXPRelease[]
-
-ifdef::ProductRelease,EAPXPRelease[]
-=======
endif::[]
ifdef::ProductRelease[]
ifndef::EAPXPRelease[]
// ... for EAP
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -1120,9 +1004,6 @@ ifndef::EAPXPRelease[]
----
-<<<<<<< HEAD
-You may note that it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-=======
endif::[]
ifdef::EAPXPRelease[]
// ... for EAP XP
@@ -1176,10 +1057,8 @@ ifdef::EAPXPRelease[]
====
Previous {productName} releases used the WildFly JAR Maven Plugin to package the quickstart in a Bootable JAR, when deploying it on OpenShift, and while that's still supported it's no longer recommended.
====
->>>>>>> upstream/main
endif::[]
-
:leveloffset: 1
// Getting Started with Helm
:leveloffset: +1
@@ -1285,11 +1164,7 @@ ifndef::useHelmChartDir[]
----
build:
uri: https://github.com/wildfly/quickstart.git
-<<<<<<< HEAD
- ref: 31.x-glow-preview
-=======
ref: main
->>>>>>> upstream/main
contextDir: ejb-remote
deploy:
replicas: 1
diff --git a/ejb-security-context-propagation/README.adoc b/ejb-security-context-propagation/README.adoc
index 490f783f18..c618beb97c 100644
--- a/ejb-security-context-propagation/README.adoc
+++ b/ejb-security-context-propagation/README.adoc
@@ -66,7 +66,7 @@ ifndef::ProductRelease,EAPXPRelease[]
:productImageVersion: 31.0
:githubRepoUrl: https://github.com/wildfly/quickstart/
:githubRepoCodeUrl: https://github.com/wildfly/quickstart.git
-:WildFlyQuickStartRepoTag: 31.0.0.Final-glow-preview
+:WildFlyQuickStartRepoTag: 31.0.0.Final
:DocInfoProductName: Red Hat JBoss Enterprise Application Platform
:DocInfoProductNameURL: red_hat_jboss_enterprise_application_platform
:DocInfoProductNumber: 8.0
@@ -196,14 +196,10 @@ endif::[]
:LinkJBDSGettingStarted: https://access.redhat.com/documentation/en-us/red_hat_codeready_studio/{JBDSVersion}/html-single/getting_started_with_codeready_studio_tools/
:JBDSGettingStartedBookName: Getting Started with CodeReady Studio Tools
-// Enable Rendering of Glow configuration in plugin examples
-:portedToGlow: true
-
= ejb-security-context-propagation: Demonstrate security context propagation in EJB to remote EJB calls
:author: Stefan Guilhen
:level: Advanced
:technologies: EJB, Security
-:portedToGlow: true
[abstract]
The `ejb-security-context-propagation` quickstart demonstrates how the security context can be propagated to a remote EJB using a remote outbound connection configuration
@@ -1130,7 +1126,7 @@ For Windows, use the `__{jbossHomeName}__\bin\add-user.bat` script.
endif::[]
The server provisioning functionality is provided by the WildFly Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
-ifndef::portedToGlow[]
+
[source,xml,subs="attributes+"]
----
@@ -1163,55 +1159,6 @@ ifndef::portedToGlow[]
----
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- provisioned-server
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases/tag[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
[NOTE]
====
diff --git a/ejb-security-programmatic-auth/README.adoc b/ejb-security-programmatic-auth/README.adoc
index a5c5e81dfc..05d7a2acf7 100644
--- a/ejb-security-programmatic-auth/README.adoc
+++ b/ejb-security-programmatic-auth/README.adoc
@@ -66,7 +66,7 @@ ifndef::ProductRelease,EAPXPRelease[]
:productImageVersion: 31.0
:githubRepoUrl: https://github.com/wildfly/quickstart/
:githubRepoCodeUrl: https://github.com/wildfly/quickstart.git
-:WildFlyQuickStartRepoTag: 31.0.0.Final-glow-preview
+:WildFlyQuickStartRepoTag: 31.0.0.Final
:DocInfoProductName: Red Hat JBoss Enterprise Application Platform
:DocInfoProductNameURL: red_hat_jboss_enterprise_application_platform
:DocInfoProductNumber: 8.0
@@ -196,14 +196,10 @@ endif::[]
:LinkJBDSGettingStarted: https://access.redhat.com/documentation/en-us/red_hat_codeready_studio/{JBDSVersion}/html-single/getting_started_with_codeready_studio_tools/
:JBDSGettingStartedBookName: Getting Started with CodeReady Studio Tools
-// Enable Rendering of Glow configuration in plugin examples
-:portedToGlow: true
-
= ejb-security-programmatic-auth: Using the programmatic API to invoke a remote EJB using different identities
:author: Stefan Guilhen
:level: Intermediate
:technologies: EJB, Security
-:portedToGlow: true
[abstract]
The `ejb-security-programmatic-auth` quickstart demonstrates how to programmatically setup different identities when invoking a remote secured EJB.
@@ -1025,7 +1021,7 @@ For Windows, use the `__{jbossHomeName}__\bin\add-user.bat` script.
endif::[]
The server provisioning functionality is provided by the WildFly Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
-ifndef::portedToGlow[]
+
[source,xml,subs="attributes+"]
----
@@ -1058,55 +1054,6 @@ ifndef::portedToGlow[]
----
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- provisioned-server
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases/tag[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
[NOTE]
====
diff --git a/ejb-throws-exception/README.adoc b/ejb-throws-exception/README.adoc
index 9369c576ae..8b0da1a304 100644
--- a/ejb-throws-exception/README.adoc
+++ b/ejb-throws-exception/README.adoc
@@ -66,7 +66,7 @@ ifndef::ProductRelease,EAPXPRelease[]
:productImageVersion: 31.0
:githubRepoUrl: https://github.com/wildfly/quickstart/
:githubRepoCodeUrl: https://github.com/wildfly/quickstart.git
-:WildFlyQuickStartRepoTag: 31.0.0.Final-glow-preview
+:WildFlyQuickStartRepoTag: 31.0.0.Final
:DocInfoProductName: Red Hat JBoss Enterprise Application Platform
:DocInfoProductNameURL: red_hat_jboss_enterprise_application_platform
:DocInfoProductNumber: 8.0
@@ -196,15 +196,11 @@ endif::[]
:LinkJBDSGettingStarted: https://access.redhat.com/documentation/en-us/red_hat_codeready_studio/{JBDSVersion}/html-single/getting_started_with_codeready_studio_tools/
:JBDSGettingStartedBookName: Getting Started with CodeReady Studio Tools
-// Enable Rendering of Glow configuration in plugin examples
-:portedToGlow: true
-
= ejb-throws-exception: Handle Exceptions across JARs in an EAR
:author: Brad Maxwell
:level: Intermediate
:technologies: EJB, EAR
:deploymentDir: ear
-:portedToGlow: true
[abstract]
The `ejb-throws-exception` quickstart demonstrates how to throw and handle exceptions across JARs in an EAR.
@@ -650,7 +646,7 @@ For Windows, use the `__{jbossHomeName}__\bin\add-user.bat` script.
endif::[]
The server provisioning functionality is provided by the WildFly Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
-ifndef::portedToGlow[]
+
[source,xml,subs="attributes+"]
----
@@ -683,55 +679,6 @@ ifndef::portedToGlow[]
----
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- provisioned-server
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases/tag[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
[NOTE]
====
diff --git a/ejb-timer/README.adoc b/ejb-timer/README.adoc
index 485a530392..4e9e3ea344 100644
--- a/ejb-timer/README.adoc
+++ b/ejb-timer/README.adoc
@@ -66,7 +66,7 @@ ifndef::ProductRelease,EAPXPRelease[]
:productImageVersion: 31.0
:githubRepoUrl: https://github.com/wildfly/quickstart/
:githubRepoCodeUrl: https://github.com/wildfly/quickstart.git
-:WildFlyQuickStartRepoTag: 31.0.0.Final-glow-preview
+:WildFlyQuickStartRepoTag: 31.0.0.Final
:DocInfoProductName: Red Hat JBoss Enterprise Application Platform
:DocInfoProductNameURL: red_hat_jboss_enterprise_application_platform
:DocInfoProductNumber: 8.0
@@ -196,15 +196,11 @@ endif::[]
:LinkJBDSGettingStarted: https://access.redhat.com/documentation/en-us/red_hat_codeready_studio/{JBDSVersion}/html-single/getting_started_with_codeready_studio_tools/
:JBDSGettingStartedBookName: Getting Started with CodeReady Studio Tools
-// Enable Rendering of Glow configuration in plugin examples
-:portedToGlow: true
-
= ejb-timer: Example of Jakarta Enterprise Bean Timer Service - @Schedule and @Timeout
:author: Ondrej Zizka
:level: Beginner
:technologies: EJB Timer
:openshift: true
-:portedToGlow: true
[abstract]
The `ejb-timer` quickstart demonstrates how to use the Jakarta Enterprise Bean timer service `@Schedule` and `@Timeout` annotations with {productName}.
@@ -653,7 +649,7 @@ For Windows, use the `__{jbossHomeName}__\bin\add-user.bat` script.
endif::[]
The server provisioning functionality is provided by the WildFly Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
-ifndef::portedToGlow[]
+
[source,xml,subs="attributes+"]
----
@@ -686,55 +682,6 @@ ifndef::portedToGlow[]
----
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- provisioned-server
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases/tag[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
[NOTE]
====
@@ -931,14 +878,9 @@ ifdef::ProductRelease,EAPXPRelease[]
The server provisioning functionality is provided by the EAP Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
endif::[]
-<<<<<<< HEAD
-ifndef::ProductRelease,EAPXPRelease[]
-ifndef::portedToGlow[]
-=======
// Render XML Snippet of openshift Maven profile...
ifndef::ProductRelease[]
// ... for WildFly
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -973,68 +915,10 @@ ifndef::ProductRelease[]
----
-<<<<<<< HEAD
-You may note that unlike the `provisioned-server` profile it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- openshift
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
- cloud
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-You may note that unlike the `provisioned-server` profile it uses the cloud context which enables a configuration tuned for OpenShift environment.
-
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
-endif::ProductRelease,EAPXPRelease[]
-
-ifdef::ProductRelease,EAPXPRelease[]
-=======
endif::[]
ifdef::ProductRelease[]
ifndef::EAPXPRelease[]
// ... for EAP
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -1070,9 +954,6 @@ ifndef::EAPXPRelease[]
----
-<<<<<<< HEAD
-You may note that it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-=======
endif::[]
ifdef::EAPXPRelease[]
// ... for EAP XP
@@ -1126,10 +1007,8 @@ ifdef::EAPXPRelease[]
====
Previous {productName} releases used the WildFly JAR Maven Plugin to package the quickstart in a Bootable JAR, when deploying it on OpenShift, and while that's still supported it's no longer recommended.
====
->>>>>>> upstream/main
endif::[]
-
:leveloffset: 1
// Getting Started with Helm
:leveloffset: +1
@@ -1235,11 +1114,7 @@ ifndef::useHelmChartDir[]
----
build:
uri: https://github.com/wildfly/quickstart.git
-<<<<<<< HEAD
- ref: 31.x-glow-preview
-=======
ref: main
->>>>>>> upstream/main
contextDir: ejb-timer
deploy:
replicas: 1
diff --git a/ejb-txn-remote-call/README.adoc b/ejb-txn-remote-call/README.adoc
index 3b530a64d6..39c2448414 100644
--- a/ejb-txn-remote-call/README.adoc
+++ b/ejb-txn-remote-call/README.adoc
@@ -66,7 +66,7 @@ ifndef::ProductRelease,EAPXPRelease[]
:productImageVersion: 31.0
:githubRepoUrl: https://github.com/wildfly/quickstart/
:githubRepoCodeUrl: https://github.com/wildfly/quickstart.git
-:WildFlyQuickStartRepoTag: 31.0.0.Final-glow-preview
+:WildFlyQuickStartRepoTag: 31.0.0.Final
:DocInfoProductName: Red Hat JBoss Enterprise Application Platform
:DocInfoProductNameURL: red_hat_jboss_enterprise_application_platform
:DocInfoProductNumber: 8.0
@@ -196,15 +196,11 @@ endif::[]
:LinkJBDSGettingStarted: https://access.redhat.com/documentation/en-us/red_hat_codeready_studio/{JBDSVersion}/html-single/getting_started_with_codeready_studio_tools/
:JBDSGettingStartedBookName: Getting Started with CodeReady Studio Tools
-// Enable Rendering of Glow configuration in plugin examples
-:portedToGlow: true
-
= ejb-txn-remote-call: Demonstrates remote EJB calls and transaction propagation
:author: Ondra Chaloupka
:level: Intermediate
:technologies: EJB, JTA, Clustering
:openshift: true
-:portedToGlow: true
[abstract]
The `ejb-txn-remote-call` quickstart demonstrates remote transactional EJB calls over two application servers of {productName}.
diff --git a/ha-singleton-deployment/README.adoc b/ha-singleton-deployment/README.adoc
index b241e50640..3845d82006 100644
--- a/ha-singleton-deployment/README.adoc
+++ b/ha-singleton-deployment/README.adoc
@@ -66,7 +66,7 @@ ifndef::ProductRelease,EAPXPRelease[]
:productImageVersion: 31.0
:githubRepoUrl: https://github.com/wildfly/quickstart/
:githubRepoCodeUrl: https://github.com/wildfly/quickstart.git
-:WildFlyQuickStartRepoTag: 31.0.0.Final-glow-preview
+:WildFlyQuickStartRepoTag: 31.0.0.Final
:DocInfoProductName: Red Hat JBoss Enterprise Application Platform
:DocInfoProductNameURL: red_hat_jboss_enterprise_application_platform
:DocInfoProductNumber: 8.0
@@ -196,9 +196,6 @@ endif::[]
:LinkJBDSGettingStarted: https://access.redhat.com/documentation/en-us/red_hat_codeready_studio/{JBDSVersion}/html-single/getting_started_with_codeready_studio_tools/
:JBDSGettingStartedBookName: Getting Started with CodeReady Studio Tools
-// Enable Rendering of Glow configuration in plugin examples
-:portedToGlow: true
-
= ha-singleton-deployment: Deploying Cluster-wide Singleton Services Using Singleton Deployments
:author: Radoslav Husar
:level: Advanced
diff --git a/ha-singleton-service/README.adoc b/ha-singleton-service/README.adoc
index c872c24e2e..e17f468206 100644
--- a/ha-singleton-service/README.adoc
+++ b/ha-singleton-service/README.adoc
@@ -66,7 +66,7 @@ ifndef::ProductRelease,EAPXPRelease[]
:productImageVersion: 31.0
:githubRepoUrl: https://github.com/wildfly/quickstart/
:githubRepoCodeUrl: https://github.com/wildfly/quickstart.git
-:WildFlyQuickStartRepoTag: 31.0.0.Final-glow-preview
+:WildFlyQuickStartRepoTag: 31.0.0.Final
:DocInfoProductName: Red Hat JBoss Enterprise Application Platform
:DocInfoProductNameURL: red_hat_jboss_enterprise_application_platform
:DocInfoProductNumber: 8.0
@@ -196,9 +196,6 @@ endif::[]
:LinkJBDSGettingStarted: https://access.redhat.com/documentation/en-us/red_hat_codeready_studio/{JBDSVersion}/html-single/getting_started_with_codeready_studio_tools/
:JBDSGettingStartedBookName: Getting Started with CodeReady Studio Tools
-// Enable Rendering of Glow configuration in plugin examples
-:portedToGlow: true
-
= ha-singleton-service: Deploying Cluster-wide Singleton MSC Services
:author: Radoslav Husar
:level: Advanced
diff --git a/helloworld-jms/README.adoc b/helloworld-jms/README.adoc
index 584918f022..9f663105eb 100644
--- a/helloworld-jms/README.adoc
+++ b/helloworld-jms/README.adoc
@@ -66,7 +66,7 @@ ifndef::ProductRelease,EAPXPRelease[]
:productImageVersion: 31.0
:githubRepoUrl: https://github.com/wildfly/quickstart/
:githubRepoCodeUrl: https://github.com/wildfly/quickstart.git
-:WildFlyQuickStartRepoTag: 31.0.0.Final-glow-preview
+:WildFlyQuickStartRepoTag: 31.0.0.Final
:DocInfoProductName: Red Hat JBoss Enterprise Application Platform
:DocInfoProductNameURL: red_hat_jboss_enterprise_application_platform
:DocInfoProductNumber: 8.0
@@ -196,14 +196,10 @@ endif::[]
:LinkJBDSGettingStarted: https://access.redhat.com/documentation/en-us/red_hat_codeready_studio/{JBDSVersion}/html-single/getting_started_with_codeready_studio_tools/
:JBDSGettingStartedBookName: Getting Started with CodeReady Studio Tools
-// Enable Rendering of Glow configuration in plugin examples
-:portedToGlow: true
-
= helloworld-jms: Helloworld JMS Example
:author: Weston Price
:level: Intermediate
:technologies: JMS
-:portedToGlow: true
[abstract]
The `helloworld-jms` quickstart demonstrates the use of external JMS clients with {productName}.
diff --git a/helloworld-mdb/README.adoc b/helloworld-mdb/README.adoc
index 8f5a0f9a2a..544283e0af 100644
--- a/helloworld-mdb/README.adoc
+++ b/helloworld-mdb/README.adoc
@@ -66,7 +66,7 @@ ifndef::ProductRelease,EAPXPRelease[]
:productImageVersion: 31.0
:githubRepoUrl: https://github.com/wildfly/quickstart/
:githubRepoCodeUrl: https://github.com/wildfly/quickstart.git
-:WildFlyQuickStartRepoTag: 31.0.0.Final-glow-preview
+:WildFlyQuickStartRepoTag: 31.0.0.Final
:DocInfoProductName: Red Hat JBoss Enterprise Application Platform
:DocInfoProductNameURL: red_hat_jboss_enterprise_application_platform
:DocInfoProductNumber: 8.0
@@ -196,15 +196,11 @@ endif::[]
:LinkJBDSGettingStarted: https://access.redhat.com/documentation/en-us/red_hat_codeready_studio/{JBDSVersion}/html-single/getting_started_with_codeready_studio_tools/
:JBDSGettingStartedBookName: Getting Started with CodeReady Studio Tools
-// Enable Rendering of Glow configuration in plugin examples
-:portedToGlow: true
-
= helloworld-mdb: Helloworld Using an MDB (Message-Driven Bean)
:author: Serge Pagop, Andy Taylor, Jeff Mesnil
:level: Intermediate
:technologies: JMS, EJB, MDB
:openshift: true
-:portedToGlow: true
[abstract]
The `helloworld-mdb` quickstart uses JMS and EJB Message-Driven Bean (MDB) to create and deploy JMS topic and queue resources in {productName}.
@@ -649,7 +645,7 @@ For Windows, use the `__{jbossHomeName}__\bin\add-user.bat` script.
endif::[]
The server provisioning functionality is provided by the WildFly Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
-ifndef::portedToGlow[]
+
[source,xml,subs="attributes+"]
----
@@ -682,55 +678,6 @@ ifndef::portedToGlow[]
----
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- provisioned-server
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases/tag[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
[NOTE]
====
@@ -927,14 +874,9 @@ ifdef::ProductRelease,EAPXPRelease[]
The server provisioning functionality is provided by the EAP Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
endif::[]
-<<<<<<< HEAD
-ifndef::ProductRelease,EAPXPRelease[]
-ifndef::portedToGlow[]
-=======
// Render XML Snippet of openshift Maven profile...
ifndef::ProductRelease[]
// ... for WildFly
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -969,68 +911,10 @@ ifndef::ProductRelease[]
----
-<<<<<<< HEAD
-You may note that unlike the `provisioned-server` profile it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- openshift
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
- cloud
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-You may note that unlike the `provisioned-server` profile it uses the cloud context which enables a configuration tuned for OpenShift environment.
-
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
-endif::ProductRelease,EAPXPRelease[]
-
-ifdef::ProductRelease,EAPXPRelease[]
-=======
endif::[]
ifdef::ProductRelease[]
ifndef::EAPXPRelease[]
// ... for EAP
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -1066,9 +950,6 @@ ifndef::EAPXPRelease[]
----
-<<<<<<< HEAD
-You may note that it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-=======
endif::[]
ifdef::EAPXPRelease[]
// ... for EAP XP
@@ -1122,10 +1003,8 @@ ifdef::EAPXPRelease[]
====
Previous {productName} releases used the WildFly JAR Maven Plugin to package the quickstart in a Bootable JAR, when deploying it on OpenShift, and while that's still supported it's no longer recommended.
====
->>>>>>> upstream/main
endif::[]
-
:leveloffset: 1
// Getting Started with Helm
:leveloffset: +1
@@ -1231,11 +1110,7 @@ ifndef::useHelmChartDir[]
----
build:
uri: https://github.com/wildfly/quickstart.git
-<<<<<<< HEAD
- ref: 31.x-glow-preview
-=======
ref: main
->>>>>>> upstream/main
contextDir: helloworld-mdb
deploy:
replicas: 2
diff --git a/helloworld-mutual-ssl-secured/README.adoc b/helloworld-mutual-ssl-secured/README.adoc
index e42fc5efa8..cf2fe63ba6 100644
--- a/helloworld-mutual-ssl-secured/README.adoc
+++ b/helloworld-mutual-ssl-secured/README.adoc
@@ -66,7 +66,7 @@ ifndef::ProductRelease,EAPXPRelease[]
:productImageVersion: 31.0
:githubRepoUrl: https://github.com/wildfly/quickstart/
:githubRepoCodeUrl: https://github.com/wildfly/quickstart.git
-:WildFlyQuickStartRepoTag: 31.0.0.Final-glow-preview
+:WildFlyQuickStartRepoTag: 31.0.0.Final
:DocInfoProductName: Red Hat JBoss Enterprise Application Platform
:DocInfoProductNameURL: red_hat_jboss_enterprise_application_platform
:DocInfoProductNumber: 8.0
@@ -196,9 +196,6 @@ endif::[]
:LinkJBDSGettingStarted: https://access.redhat.com/documentation/en-us/red_hat_codeready_studio/{JBDSVersion}/html-single/getting_started_with_codeready_studio_tools/
:JBDSGettingStartedBookName: Getting Started with CodeReady Studio Tools
-// Enable Rendering of Glow configuration in plugin examples
-:portedToGlow: true
-
= helloworld-mutual-ssl-secured: Securing a Web Application with Mutual (two-way) TLS Configuration and Role-based Access Control
:author: Giriraj Sharma, Stefan Guilhen
:level: Intermediate
diff --git a/helloworld-mutual-ssl/README.adoc b/helloworld-mutual-ssl/README.adoc
index 5f65f6b8a7..88dcd3475c 100644
--- a/helloworld-mutual-ssl/README.adoc
+++ b/helloworld-mutual-ssl/README.adoc
@@ -66,7 +66,7 @@ ifndef::ProductRelease,EAPXPRelease[]
:productImageVersion: 31.0
:githubRepoUrl: https://github.com/wildfly/quickstart/
:githubRepoCodeUrl: https://github.com/wildfly/quickstart.git
-:WildFlyQuickStartRepoTag: 31.0.0.Final-glow-preview
+:WildFlyQuickStartRepoTag: 31.0.0.Final
:DocInfoProductName: Red Hat JBoss Enterprise Application Platform
:DocInfoProductNameURL: red_hat_jboss_enterprise_application_platform
:DocInfoProductNumber: 8.0
@@ -196,9 +196,6 @@ endif::[]
:LinkJBDSGettingStarted: https://access.redhat.com/documentation/en-us/red_hat_codeready_studio/{JBDSVersion}/html-single/getting_started_with_codeready_studio_tools/
:JBDSGettingStartedBookName: Getting Started with CodeReady Studio Tools
-// Enable Rendering of Glow configuration in plugin examples
-:portedToGlow: true
-
= helloworld-mutual-ssl: {productName} Mutual TLS(two-way) Configuration Example
:author: Giriraj Sharma, Stefan Guilhen
:level: Intermediate
diff --git a/helloworld-singleton/README.adoc b/helloworld-singleton/README.adoc
index 9f89d96999..d95c46f4eb 100644
--- a/helloworld-singleton/README.adoc
+++ b/helloworld-singleton/README.adoc
@@ -66,7 +66,7 @@ ifndef::ProductRelease,EAPXPRelease[]
:productImageVersion: 31.0
:githubRepoUrl: https://github.com/wildfly/quickstart/
:githubRepoCodeUrl: https://github.com/wildfly/quickstart.git
-:WildFlyQuickStartRepoTag: 31.0.0.Final-glow-preview
+:WildFlyQuickStartRepoTag: 31.0.0.Final
:DocInfoProductName: Red Hat JBoss Enterprise Application Platform
:DocInfoProductNameURL: red_hat_jboss_enterprise_application_platform
:DocInfoProductNumber: 8.0
@@ -196,15 +196,11 @@ endif::[]
:LinkJBDSGettingStarted: https://access.redhat.com/documentation/en-us/red_hat_codeready_studio/{JBDSVersion}/html-single/getting_started_with_codeready_studio_tools/
:JBDSGettingStartedBookName: Getting Started with CodeReady Studio Tools
-// Enable Rendering of Glow configuration in plugin examples
-:portedToGlow: true
-
= helloworld-singleton: Helloworld Using a Singleton EJB
:author: Serge Pagop
:level: Beginner
:technologies: EJB, Singleton
:openshift: true
-:portedToGlow: true
[abstract]
The `helloworld-singleton` quickstart demonstrates an EJB Singleton Bean that is instantiated once and maintains state for the life of the session.
@@ -611,7 +607,7 @@ For Windows, use the `__{jbossHomeName}__\bin\add-user.bat` script.
endif::[]
The server provisioning functionality is provided by the WildFly Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
-ifndef::portedToGlow[]
+
[source,xml,subs="attributes+"]
----
@@ -644,55 +640,6 @@ ifndef::portedToGlow[]
----
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- provisioned-server
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases/tag[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
[NOTE]
====
@@ -889,14 +836,9 @@ ifdef::ProductRelease,EAPXPRelease[]
The server provisioning functionality is provided by the EAP Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
endif::[]
-<<<<<<< HEAD
-ifndef::ProductRelease,EAPXPRelease[]
-ifndef::portedToGlow[]
-=======
// Render XML Snippet of openshift Maven profile...
ifndef::ProductRelease[]
// ... for WildFly
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -931,68 +873,10 @@ ifndef::ProductRelease[]
----
-<<<<<<< HEAD
-You may note that unlike the `provisioned-server` profile it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- openshift
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
- cloud
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-You may note that unlike the `provisioned-server` profile it uses the cloud context which enables a configuration tuned for OpenShift environment.
-
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
-endif::ProductRelease,EAPXPRelease[]
-
-ifdef::ProductRelease,EAPXPRelease[]
-=======
endif::[]
ifdef::ProductRelease[]
ifndef::EAPXPRelease[]
// ... for EAP
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -1028,9 +912,6 @@ ifndef::EAPXPRelease[]
----
-<<<<<<< HEAD
-You may note that it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-=======
endif::[]
ifdef::EAPXPRelease[]
// ... for EAP XP
@@ -1084,10 +965,8 @@ ifdef::EAPXPRelease[]
====
Previous {productName} releases used the WildFly JAR Maven Plugin to package the quickstart in a Bootable JAR, when deploying it on OpenShift, and while that's still supported it's no longer recommended.
====
->>>>>>> upstream/main
endif::[]
-
:leveloffset: 1
// Getting Started with Helm
:leveloffset: +1
@@ -1193,11 +1072,7 @@ ifndef::useHelmChartDir[]
----
build:
uri: https://github.com/wildfly/quickstart.git
-<<<<<<< HEAD
- ref: 31.x-glow-preview
-=======
ref: main
->>>>>>> upstream/main
contextDir: helloworld-singleton
deploy:
replicas: 1
diff --git a/helloworld-ws/README.adoc b/helloworld-ws/README.adoc
index 64b3bda0ed..19d45a4ead 100644
--- a/helloworld-ws/README.adoc
+++ b/helloworld-ws/README.adoc
@@ -66,7 +66,7 @@ ifndef::ProductRelease,EAPXPRelease[]
:productImageVersion: 31.0
:githubRepoUrl: https://github.com/wildfly/quickstart/
:githubRepoCodeUrl: https://github.com/wildfly/quickstart.git
-:WildFlyQuickStartRepoTag: 31.0.0.Final-glow-preview
+:WildFlyQuickStartRepoTag: 31.0.0.Final
:DocInfoProductName: Red Hat JBoss Enterprise Application Platform
:DocInfoProductNameURL: red_hat_jboss_enterprise_application_platform
:DocInfoProductNumber: 8.0
@@ -196,15 +196,11 @@ endif::[]
:LinkJBDSGettingStarted: https://access.redhat.com/documentation/en-us/red_hat_codeready_studio/{JBDSVersion}/html-single/getting_started_with_codeready_studio_tools/
:JBDSGettingStartedBookName: Getting Started with CodeReady Studio Tools
-// Enable Rendering of Glow configuration in plugin examples
-:portedToGlow: true
-
= helloworld-ws: Hello World JAX-WS Web Service
:author: Lee Newson
:level: Beginner
:technologies: JAX-WS
:openshift: true
-:portedToGlow: true
[abstract]
The `helloworld-ws` quickstart demonstrates a simple Hello World application, bundled and deployed as a WAR, that uses JAX-WS to say Hello.
@@ -597,7 +593,7 @@ For Windows, use the `__{jbossHomeName}__\bin\add-user.bat` script.
endif::[]
The server provisioning functionality is provided by the WildFly Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
-ifndef::portedToGlow[]
+
[source,xml,subs="attributes+"]
----
@@ -630,55 +626,6 @@ ifndef::portedToGlow[]
----
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- provisioned-server
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases/tag[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
[NOTE]
====
@@ -875,14 +822,9 @@ ifdef::ProductRelease,EAPXPRelease[]
The server provisioning functionality is provided by the EAP Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
endif::[]
-<<<<<<< HEAD
-ifndef::ProductRelease,EAPXPRelease[]
-ifndef::portedToGlow[]
-=======
// Render XML Snippet of openshift Maven profile...
ifndef::ProductRelease[]
// ... for WildFly
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -917,68 +859,10 @@ ifndef::ProductRelease[]
----
-<<<<<<< HEAD
-You may note that unlike the `provisioned-server` profile it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- openshift
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
- cloud
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-You may note that unlike the `provisioned-server` profile it uses the cloud context which enables a configuration tuned for OpenShift environment.
-
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
-endif::ProductRelease,EAPXPRelease[]
-
-ifdef::ProductRelease,EAPXPRelease[]
-=======
endif::[]
ifdef::ProductRelease[]
ifndef::EAPXPRelease[]
// ... for EAP
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -1014,9 +898,6 @@ ifndef::EAPXPRelease[]
----
-<<<<<<< HEAD
-You may note that it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-=======
endif::[]
ifdef::EAPXPRelease[]
// ... for EAP XP
@@ -1070,10 +951,8 @@ ifdef::EAPXPRelease[]
====
Previous {productName} releases used the WildFly JAR Maven Plugin to package the quickstart in a Bootable JAR, when deploying it on OpenShift, and while that's still supported it's no longer recommended.
====
->>>>>>> upstream/main
endif::[]
-
:leveloffset: 1
// Getting Started with Helm
:leveloffset: +1
@@ -1179,11 +1058,7 @@ ifndef::useHelmChartDir[]
----
build:
uri: https://github.com/wildfly/quickstart.git
-<<<<<<< HEAD
- ref: 31.x-glow-preview
-=======
ref: main
->>>>>>> upstream/main
contextDir: helloworld-ws
deploy:
replicas: 1
diff --git a/helloworld/README.adoc b/helloworld/README.adoc
index 34c8c549fe..84acfaf9a0 100644
--- a/helloworld/README.adoc
+++ b/helloworld/README.adoc
@@ -66,7 +66,7 @@ ifndef::ProductRelease,EAPXPRelease[]
:productImageVersion: 31.0
:githubRepoUrl: https://github.com/wildfly/quickstart/
:githubRepoCodeUrl: https://github.com/wildfly/quickstart.git
-:WildFlyQuickStartRepoTag: 31.0.0.Final-glow-preview
+:WildFlyQuickStartRepoTag: 31.0.0.Final
:DocInfoProductName: Red Hat JBoss Enterprise Application Platform
:DocInfoProductNameURL: red_hat_jboss_enterprise_application_platform
:DocInfoProductNumber: 8.0
@@ -196,15 +196,11 @@ endif::[]
:LinkJBDSGettingStarted: https://access.redhat.com/documentation/en-us/red_hat_codeready_studio/{JBDSVersion}/html-single/getting_started_with_codeready_studio_tools/
:JBDSGettingStartedBookName: Getting Started with CodeReady Studio Tools
-// Enable Rendering of Glow configuration in plugin examples
-:portedToGlow: true
-
= helloworld: Helloworld Example
:author: Pete Muir
:level: Beginner
:technologies: Servlet
:openshift: true
-:portedToGlow: true
[abstract]
The `helloworld` quickstart demonstrates the use of Servlet 6 and is a good starting point to verify {productName} is configured correctly.
@@ -604,7 +600,7 @@ For Windows, use the `__{jbossHomeName}__\bin\add-user.bat` script.
endif::[]
The server provisioning functionality is provided by the WildFly Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
-ifndef::portedToGlow[]
+
[source,xml,subs="attributes+"]
----
@@ -637,55 +633,6 @@ ifndef::portedToGlow[]
----
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- provisioned-server
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases/tag[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
[NOTE]
====
@@ -882,14 +829,9 @@ ifdef::ProductRelease,EAPXPRelease[]
The server provisioning functionality is provided by the EAP Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
endif::[]
-<<<<<<< HEAD
-ifndef::ProductRelease,EAPXPRelease[]
-ifndef::portedToGlow[]
-=======
// Render XML Snippet of openshift Maven profile...
ifndef::ProductRelease[]
// ... for WildFly
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -924,68 +866,10 @@ ifndef::ProductRelease[]
----
-<<<<<<< HEAD
-You may note that unlike the `provisioned-server` profile it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- openshift
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
- cloud
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-You may note that unlike the `provisioned-server` profile it uses the cloud context which enables a configuration tuned for OpenShift environment.
-
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
-endif::ProductRelease,EAPXPRelease[]
-
-ifdef::ProductRelease,EAPXPRelease[]
-=======
endif::[]
ifdef::ProductRelease[]
ifndef::EAPXPRelease[]
// ... for EAP
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -1021,9 +905,6 @@ ifndef::EAPXPRelease[]
----
-<<<<<<< HEAD
-You may note that it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-=======
endif::[]
ifdef::EAPXPRelease[]
// ... for EAP XP
@@ -1077,10 +958,8 @@ ifdef::EAPXPRelease[]
====
Previous {productName} releases used the WildFly JAR Maven Plugin to package the quickstart in a Bootable JAR, when deploying it on OpenShift, and while that's still supported it's no longer recommended.
====
->>>>>>> upstream/main
endif::[]
-
:leveloffset: 1
// Getting Started with Helm
:leveloffset: +1
@@ -1186,11 +1065,7 @@ ifndef::useHelmChartDir[]
----
build:
uri: https://github.com/wildfly/quickstart.git
-<<<<<<< HEAD
- ref: 31.x-glow-preview
-=======
ref: main
->>>>>>> upstream/main
contextDir: helloworld
deploy:
replicas: 1
diff --git a/hibernate/README.adoc b/hibernate/README.adoc
index 4936bc9e2e..f3d7929ec8 100644
--- a/hibernate/README.adoc
+++ b/hibernate/README.adoc
@@ -66,7 +66,7 @@ ifndef::ProductRelease,EAPXPRelease[]
:productImageVersion: 31.0
:githubRepoUrl: https://github.com/wildfly/quickstart/
:githubRepoCodeUrl: https://github.com/wildfly/quickstart.git
-:WildFlyQuickStartRepoTag: 31.0.0.Final-glow-preview
+:WildFlyQuickStartRepoTag: 31.0.0.Final
:DocInfoProductName: Red Hat JBoss Enterprise Application Platform
:DocInfoProductNameURL: red_hat_jboss_enterprise_application_platform
:DocInfoProductNumber: 8.0
@@ -196,15 +196,11 @@ endif::[]
:LinkJBDSGettingStarted: https://access.redhat.com/documentation/en-us/red_hat_codeready_studio/{JBDSVersion}/html-single/getting_started_with_codeready_studio_tools/
:JBDSGettingStartedBookName: Getting Started with CodeReady Studio Tools
-// Enable Rendering of Glow configuration in plugin examples
-:portedToGlow: true
-
= hibernate: How to Use Hibernate in an Application
:author: Madhumita Sadhukhan
:level: Intermediate
:technologies: Hibernate
:openshift: true
-:portedToGlow: true
[abstract]
The `hibernate` quickstart demonstrates how to use Hibernate ORM 6 over Persistence, using Bean Validation, and Enterprise Beans.
@@ -919,7 +915,7 @@ For Windows, use the `__{jbossHomeName}__\bin\add-user.bat` script.
endif::[]
The server provisioning functionality is provided by the WildFly Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
-ifndef::portedToGlow[]
+
[source,xml,subs="attributes+"]
----
@@ -952,55 +948,6 @@ ifndef::portedToGlow[]
----
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- provisioned-server
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases/tag[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
[NOTE]
====
@@ -1197,14 +1144,9 @@ ifdef::ProductRelease,EAPXPRelease[]
The server provisioning functionality is provided by the EAP Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
endif::[]
-<<<<<<< HEAD
-ifndef::ProductRelease,EAPXPRelease[]
-ifndef::portedToGlow[]
-=======
// Render XML Snippet of openshift Maven profile...
ifndef::ProductRelease[]
// ... for WildFly
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -1239,68 +1181,10 @@ ifndef::ProductRelease[]
----
-<<<<<<< HEAD
-You may note that unlike the `provisioned-server` profile it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- openshift
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
- cloud
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-You may note that unlike the `provisioned-server` profile it uses the cloud context which enables a configuration tuned for OpenShift environment.
-
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
-endif::ProductRelease,EAPXPRelease[]
-
-ifdef::ProductRelease,EAPXPRelease[]
-=======
endif::[]
ifdef::ProductRelease[]
ifndef::EAPXPRelease[]
// ... for EAP
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -1336,9 +1220,6 @@ ifndef::EAPXPRelease[]
----
-<<<<<<< HEAD
-You may note that it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-=======
endif::[]
ifdef::EAPXPRelease[]
// ... for EAP XP
@@ -1392,10 +1273,8 @@ ifdef::EAPXPRelease[]
====
Previous {productName} releases used the WildFly JAR Maven Plugin to package the quickstart in a Bootable JAR, when deploying it on OpenShift, and while that's still supported it's no longer recommended.
====
->>>>>>> upstream/main
endif::[]
-
:leveloffset: 1
// Getting Started with Helm
:leveloffset: +1
@@ -1501,11 +1380,7 @@ ifndef::useHelmChartDir[]
----
build:
uri: https://github.com/wildfly/quickstart.git
-<<<<<<< HEAD
- ref: 31.x-glow-preview
-=======
ref: main
->>>>>>> upstream/main
contextDir: hibernate
deploy:
replicas: 1
diff --git a/http-custom-mechanism/README.adoc b/http-custom-mechanism/README.adoc
index 41b09f5665..c61dee8f77 100644
--- a/http-custom-mechanism/README.adoc
+++ b/http-custom-mechanism/README.adoc
@@ -66,7 +66,7 @@ ifndef::ProductRelease,EAPXPRelease[]
:productImageVersion: 31.0
:githubRepoUrl: https://github.com/wildfly/quickstart/
:githubRepoCodeUrl: https://github.com/wildfly/quickstart.git
-:WildFlyQuickStartRepoTag: 31.0.0.Final-glow-preview
+:WildFlyQuickStartRepoTag: 31.0.0.Final
:DocInfoProductName: Red Hat JBoss Enterprise Application Platform
:DocInfoProductNameURL: red_hat_jboss_enterprise_application_platform
:DocInfoProductNumber: 8.0
@@ -196,14 +196,10 @@ endif::[]
:LinkJBDSGettingStarted: https://access.redhat.com/documentation/en-us/red_hat_codeready_studio/{JBDSVersion}/html-single/getting_started_with_codeready_studio_tools/
:JBDSGettingStartedBookName: Getting Started with CodeReady Studio Tools
-// Enable Rendering of Glow configuration in plugin examples
-:portedToGlow: true
-
= http-custom-mechanism: Create a custom HTTP authorization mechanism
:author: Darran Lofthouse
:level: Intermediate
:technologies: EJB, Security
-:portedToGlow: true
[abstract]
The `http-custom-mechanism` quickstart demonstrates how to implement a custom HTTP authentication mechanism that can be registered with Elytron.
@@ -1054,7 +1050,7 @@ For Windows, use the `__{jbossHomeName}__\bin\add-user.bat` script.
endif::[]
The server provisioning functionality is provided by the WildFly Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
-ifndef::portedToGlow[]
+
[source,xml,subs="attributes+"]
----
@@ -1087,55 +1083,6 @@ ifndef::portedToGlow[]
----
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- provisioned-server
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases/tag[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
[NOTE]
====
diff --git a/jaxrs-client/README.adoc b/jaxrs-client/README.adoc
index 9fa14f669e..5585af75dd 100644
--- a/jaxrs-client/README.adoc
+++ b/jaxrs-client/README.adoc
@@ -66,7 +66,7 @@ ifndef::ProductRelease,EAPXPRelease[]
:productImageVersion: 31.0
:githubRepoUrl: https://github.com/wildfly/quickstart/
:githubRepoCodeUrl: https://github.com/wildfly/quickstart.git
-:WildFlyQuickStartRepoTag: 31.0.0.Final-glow-preview
+:WildFlyQuickStartRepoTag: 31.0.0.Final
:DocInfoProductName: Red Hat JBoss Enterprise Application Platform
:DocInfoProductNameURL: red_hat_jboss_enterprise_application_platform
:DocInfoProductNumber: 8.0
@@ -196,15 +196,11 @@ endif::[]
:LinkJBDSGettingStarted: https://access.redhat.com/documentation/en-us/red_hat_codeready_studio/{JBDSVersion}/html-single/getting_started_with_codeready_studio_tools/
:JBDSGettingStartedBookName: Getting Started with CodeReady Studio Tools
-// Enable Rendering of Glow configuration in plugin examples
-:portedToGlow: true
-
= jaxrs-client: Jakarta REST Client API example
:author: Rafael Benevides
:level: Beginner
:technologies: JAX-RS
:openshift: true
-:portedToGlow: true
[abstract]
The `jaxrs-client` quickstart demonstrates Jakarta REST Client API, which interacts with a Jakarta REST Web service that runs on {productName}.
@@ -626,7 +622,7 @@ For Windows, use the `__{jbossHomeName}__\bin\add-user.bat` script.
endif::[]
The server provisioning functionality is provided by the WildFly Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
-ifndef::portedToGlow[]
+
[source,xml,subs="attributes+"]
----
@@ -659,55 +655,6 @@ ifndef::portedToGlow[]
----
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- provisioned-server
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases/tag[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
[NOTE]
====
@@ -904,14 +851,9 @@ ifdef::ProductRelease,EAPXPRelease[]
The server provisioning functionality is provided by the EAP Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
endif::[]
-<<<<<<< HEAD
-ifndef::ProductRelease,EAPXPRelease[]
-ifndef::portedToGlow[]
-=======
// Render XML Snippet of openshift Maven profile...
ifndef::ProductRelease[]
// ... for WildFly
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -946,68 +888,10 @@ ifndef::ProductRelease[]
----
-<<<<<<< HEAD
-You may note that unlike the `provisioned-server` profile it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- openshift
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
- cloud
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-You may note that unlike the `provisioned-server` profile it uses the cloud context which enables a configuration tuned for OpenShift environment.
-
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
-endif::ProductRelease,EAPXPRelease[]
-
-ifdef::ProductRelease,EAPXPRelease[]
-=======
endif::[]
ifdef::ProductRelease[]
ifndef::EAPXPRelease[]
// ... for EAP
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -1043,9 +927,6 @@ ifndef::EAPXPRelease[]
----
-<<<<<<< HEAD
-You may note that it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-=======
endif::[]
ifdef::EAPXPRelease[]
// ... for EAP XP
@@ -1099,10 +980,8 @@ ifdef::EAPXPRelease[]
====
Previous {productName} releases used the WildFly JAR Maven Plugin to package the quickstart in a Bootable JAR, when deploying it on OpenShift, and while that's still supported it's no longer recommended.
====
->>>>>>> upstream/main
endif::[]
-
:leveloffset: 1
// Getting Started with Helm
:leveloffset: +1
@@ -1208,11 +1087,7 @@ ifndef::useHelmChartDir[]
----
build:
uri: https://github.com/wildfly/quickstart.git
-<<<<<<< HEAD
- ref: 31.x-glow-preview
-=======
ref: main
->>>>>>> upstream/main
contextDir: jaxrs-client
deploy:
replicas: 1
diff --git a/jaxrs-jwt/README.adoc b/jaxrs-jwt/README.adoc
index 6465460b7b..ef459c01c6 100644
--- a/jaxrs-jwt/README.adoc
+++ b/jaxrs-jwt/README.adoc
@@ -66,7 +66,7 @@ ifndef::ProductRelease,EAPXPRelease[]
:productImageVersion: 31.0
:githubRepoUrl: https://github.com/wildfly/quickstart/
:githubRepoCodeUrl: https://github.com/wildfly/quickstart.git
-:WildFlyQuickStartRepoTag: 31.0.0.Final-glow-preview
+:WildFlyQuickStartRepoTag: 31.0.0.Final
:DocInfoProductName: Red Hat JBoss Enterprise Application Platform
:DocInfoProductNameURL: red_hat_jboss_enterprise_application_platform
:DocInfoProductNumber: 8.0
@@ -196,14 +196,10 @@ endif::[]
:LinkJBDSGettingStarted: https://access.redhat.com/documentation/en-us/red_hat_codeready_studio/{JBDSVersion}/html-single/getting_started_with_codeready_studio_tools/
:JBDSGettingStartedBookName: Getting Started with CodeReady Studio Tools
-// Enable Rendering of Glow configuration in plugin examples
-:portedToGlow: true
-
= jaxrs-jwt: Jakarta REST secured using JSON Web Tokens (JWTs)
:author: Martin Mazanek
:level: Intermediate
:technologies: JAX-RS, Security
-:portedToGlow: true
[abstract]
The `jaxrs-jwt` quickstart demonstrates a Jakarta REST secured application using JSON Web Tokens (JWT) with Elytron.
@@ -927,7 +923,7 @@ For Windows, use the `__{jbossHomeName}__\bin\add-user.bat` script.
endif::[]
The server provisioning functionality is provided by the WildFly Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
-ifndef::portedToGlow[]
+
[source,xml,subs="attributes+"]
----
@@ -960,55 +956,6 @@ ifndef::portedToGlow[]
----
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- provisioned-server
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases/tag[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
[NOTE]
====
@@ -1206,14 +1153,9 @@ ifdef::ProductRelease,EAPXPRelease[]
The server provisioning functionality is provided by the EAP Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
endif::[]
-<<<<<<< HEAD
-ifndef::ProductRelease,EAPXPRelease[]
-ifndef::portedToGlow[]
-=======
// Render XML Snippet of openshift Maven profile...
ifndef::ProductRelease[]
// ... for WildFly
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -1248,68 +1190,10 @@ ifndef::ProductRelease[]
----
-<<<<<<< HEAD
-You may note that unlike the `provisioned-server` profile it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- openshift
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
- cloud
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-You may note that unlike the `provisioned-server` profile it uses the cloud context which enables a configuration tuned for OpenShift environment.
-
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
-endif::ProductRelease,EAPXPRelease[]
-
-ifdef::ProductRelease,EAPXPRelease[]
-=======
endif::[]
ifdef::ProductRelease[]
ifndef::EAPXPRelease[]
// ... for EAP
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -1345,9 +1229,6 @@ ifndef::EAPXPRelease[]
----
-<<<<<<< HEAD
-You may note that it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-=======
endif::[]
ifdef::EAPXPRelease[]
// ... for EAP XP
@@ -1401,10 +1282,8 @@ ifdef::EAPXPRelease[]
====
Previous {productName} releases used the WildFly JAR Maven Plugin to package the quickstart in a Bootable JAR, when deploying it on OpenShift, and while that's still supported it's no longer recommended.
====
->>>>>>> upstream/main
endif::[]
-
:leveloffset: 1
// Getting Started with Helm
:leveloffset: +1
diff --git a/jaxws-ejb/README.adoc b/jaxws-ejb/README.adoc
index de069272c5..55e61c22ae 100644
--- a/jaxws-ejb/README.adoc
+++ b/jaxws-ejb/README.adoc
@@ -66,7 +66,7 @@ ifndef::ProductRelease,EAPXPRelease[]
:productImageVersion: 31.0
:githubRepoUrl: https://github.com/wildfly/quickstart/
:githubRepoCodeUrl: https://github.com/wildfly/quickstart.git
-:WildFlyQuickStartRepoTag: 31.0.0.Final-glow-preview
+:WildFlyQuickStartRepoTag: 31.0.0.Final
:DocInfoProductName: Red Hat JBoss Enterprise Application Platform
:DocInfoProductNameURL: red_hat_jboss_enterprise_application_platform
:DocInfoProductNumber: 8.0
@@ -196,14 +196,10 @@ endif::[]
:LinkJBDSGettingStarted: https://access.redhat.com/documentation/en-us/red_hat_codeready_studio/{JBDSVersion}/html-single/getting_started_with_codeready_studio_tools/
:JBDSGettingStartedBookName: Getting Started with CodeReady Studio Tools
-// Enable Rendering of Glow configuration in plugin examples
-:portedToGlow: true
-
= jaxws-ejb: An EJB JAX-WS Web Service
:author: R Searls
:level: Beginner
:technologies: JAX-WS
-:portedToGlow: true
[abstract]
The `jaxws-ejb` quickstart is a working example of the web service endpoint created from an EJB.
@@ -609,7 +605,7 @@ For Windows, use the `__{jbossHomeName}__\bin\add-user.bat` script.
endif::[]
The server provisioning functionality is provided by the WildFly Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
-ifndef::portedToGlow[]
+
[source,xml,subs="attributes+"]
----
@@ -642,55 +638,6 @@ ifndef::portedToGlow[]
----
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- provisioned-server
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases/tag[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
[NOTE]
====
@@ -887,14 +834,9 @@ ifdef::ProductRelease,EAPXPRelease[]
The server provisioning functionality is provided by the EAP Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
endif::[]
-<<<<<<< HEAD
-ifndef::ProductRelease,EAPXPRelease[]
-ifndef::portedToGlow[]
-=======
// Render XML Snippet of openshift Maven profile...
ifndef::ProductRelease[]
// ... for WildFly
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -929,68 +871,10 @@ ifndef::ProductRelease[]
----
-<<<<<<< HEAD
-You may note that unlike the `provisioned-server` profile it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- openshift
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
- cloud
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-You may note that unlike the `provisioned-server` profile it uses the cloud context which enables a configuration tuned for OpenShift environment.
-
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
-endif::ProductRelease,EAPXPRelease[]
-
-ifdef::ProductRelease,EAPXPRelease[]
-=======
endif::[]
ifdef::ProductRelease[]
ifndef::EAPXPRelease[]
// ... for EAP
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -1026,9 +910,6 @@ ifndef::EAPXPRelease[]
----
-<<<<<<< HEAD
-You may note that it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-=======
endif::[]
ifdef::EAPXPRelease[]
// ... for EAP XP
@@ -1082,10 +963,8 @@ ifdef::EAPXPRelease[]
====
Previous {productName} releases used the WildFly JAR Maven Plugin to package the quickstart in a Bootable JAR, when deploying it on OpenShift, and while that's still supported it's no longer recommended.
====
->>>>>>> upstream/main
endif::[]
-
:leveloffset: 1
// Getting Started with Helm
:leveloffset: +1
@@ -1191,11 +1070,7 @@ ifndef::useHelmChartDir[]
----
build:
uri: https://github.com/wildfly/quickstart.git
-<<<<<<< HEAD
- ref: 31.x-glow-preview
-=======
ref: main
->>>>>>> upstream/main
contextDir: jaxws-ejb
deploy:
replicas: 1
diff --git a/jaxws-retail/README.adoc b/jaxws-retail/README.adoc
index 245d3ccaed..7452fc0401 100644
--- a/jaxws-retail/README.adoc
+++ b/jaxws-retail/README.adoc
@@ -66,7 +66,7 @@ ifndef::ProductRelease,EAPXPRelease[]
:productImageVersion: 31.0
:githubRepoUrl: https://github.com/wildfly/quickstart/
:githubRepoCodeUrl: https://github.com/wildfly/quickstart.git
-:WildFlyQuickStartRepoTag: 31.0.0.Final-glow-preview
+:WildFlyQuickStartRepoTag: 31.0.0.Final
:DocInfoProductName: Red Hat JBoss Enterprise Application Platform
:DocInfoProductNameURL: red_hat_jboss_enterprise_application_platform
:DocInfoProductNumber: 8.0
@@ -196,14 +196,10 @@ endif::[]
:LinkJBDSGettingStarted: https://access.redhat.com/documentation/en-us/red_hat_codeready_studio/{JBDSVersion}/html-single/getting_started_with_codeready_studio_tools/
:JBDSGettingStartedBookName: Getting Started with CodeReady Studio Tools
-// Enable Rendering of Glow configuration in plugin examples
-:portedToGlow: true
-
= jaxws-retail: A Retail JAX-WS Web Service
:author: R Searls
:level: Beginner
:technologies: JAX-WS
-:portedToGlow: true
[abstract]
The `jaxws-retail` quickstart is a working example of a simple web service endpoint.
@@ -606,7 +602,7 @@ For Windows, use the `__{jbossHomeName}__\bin\add-user.bat` script.
endif::[]
The server provisioning functionality is provided by the WildFly Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
-ifndef::portedToGlow[]
+
[source,xml,subs="attributes+"]
----
@@ -639,55 +635,6 @@ ifndef::portedToGlow[]
----
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- provisioned-server
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases/tag[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
[NOTE]
====
@@ -884,14 +831,9 @@ ifdef::ProductRelease,EAPXPRelease[]
The server provisioning functionality is provided by the EAP Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
endif::[]
-<<<<<<< HEAD
-ifndef::ProductRelease,EAPXPRelease[]
-ifndef::portedToGlow[]
-=======
// Render XML Snippet of openshift Maven profile...
ifndef::ProductRelease[]
// ... for WildFly
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -926,68 +868,10 @@ ifndef::ProductRelease[]
----
-<<<<<<< HEAD
-You may note that unlike the `provisioned-server` profile it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- openshift
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
- cloud
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-You may note that unlike the `provisioned-server` profile it uses the cloud context which enables a configuration tuned for OpenShift environment.
-
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
-endif::ProductRelease,EAPXPRelease[]
-
-ifdef::ProductRelease,EAPXPRelease[]
-=======
endif::[]
ifdef::ProductRelease[]
ifndef::EAPXPRelease[]
// ... for EAP
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -1023,9 +907,6 @@ ifndef::EAPXPRelease[]
----
-<<<<<<< HEAD
-You may note that it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-=======
endif::[]
ifdef::EAPXPRelease[]
// ... for EAP XP
@@ -1079,10 +960,8 @@ ifdef::EAPXPRelease[]
====
Previous {productName} releases used the WildFly JAR Maven Plugin to package the quickstart in a Bootable JAR, when deploying it on OpenShift, and while that's still supported it's no longer recommended.
====
->>>>>>> upstream/main
endif::[]
-
:leveloffset: 1
// Getting Started with Helm
:leveloffset: +1
@@ -1188,11 +1067,7 @@ ifndef::useHelmChartDir[]
----
build:
uri: https://github.com/wildfly/quickstart.git
-<<<<<<< HEAD
- ref: 31.x-glow-preview
-=======
ref: main
->>>>>>> upstream/main
contextDir: jaxws-retail
deploy:
replicas: 1
diff --git a/jsonp/README.adoc b/jsonp/README.adoc
index 59beb27cb6..f121bbb8cd 100644
--- a/jsonp/README.adoc
+++ b/jsonp/README.adoc
@@ -66,7 +66,7 @@ ifndef::ProductRelease,EAPXPRelease[]
:productImageVersion: 31.0
:githubRepoUrl: https://github.com/wildfly/quickstart/
:githubRepoCodeUrl: https://github.com/wildfly/quickstart.git
-:WildFlyQuickStartRepoTag: 31.0.0.Final-glow-preview
+:WildFlyQuickStartRepoTag: 31.0.0.Final
:DocInfoProductName: Red Hat JBoss Enterprise Application Platform
:DocInfoProductNameURL: red_hat_jboss_enterprise_application_platform
:DocInfoProductNumber: 8.0
@@ -196,15 +196,11 @@ endif::[]
:LinkJBDSGettingStarted: https://access.redhat.com/documentation/en-us/red_hat_codeready_studio/{JBDSVersion}/html-single/getting_started_with_codeready_studio_tools/
:JBDSGettingStartedBookName: Getting Started with CodeReady Studio Tools
-// Enable Rendering of Glow configuration in plugin examples
-:portedToGlow: true
-
= jsonp: JSON-P Object-based JSON generation and Stream-based JSON consuming
:author: Rafael Benevides
:level: Beginner
:technologies: CDI, JSF, JSON-P
:openshift: true
-:portedToGlow: true
[abstract]
The `jsonp` quickstart demonstrates how to use the JSON-P API to produce object-based structures and then parse and consume them as stream-based JSON strings.
@@ -562,7 +558,7 @@ For Windows, use the `__{jbossHomeName}__\bin\add-user.bat` script.
endif::[]
The server provisioning functionality is provided by the WildFly Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
-ifndef::portedToGlow[]
+
[source,xml,subs="attributes+"]
----
@@ -595,55 +591,6 @@ ifndef::portedToGlow[]
----
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- provisioned-server
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases/tag[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
[NOTE]
====
@@ -840,14 +787,9 @@ ifdef::ProductRelease,EAPXPRelease[]
The server provisioning functionality is provided by the EAP Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
endif::[]
-<<<<<<< HEAD
-ifndef::ProductRelease,EAPXPRelease[]
-ifndef::portedToGlow[]
-=======
// Render XML Snippet of openshift Maven profile...
ifndef::ProductRelease[]
// ... for WildFly
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -882,68 +824,10 @@ ifndef::ProductRelease[]
----
-<<<<<<< HEAD
-You may note that unlike the `provisioned-server` profile it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- openshift
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
- cloud
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-You may note that unlike the `provisioned-server` profile it uses the cloud context which enables a configuration tuned for OpenShift environment.
-
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
-endif::ProductRelease,EAPXPRelease[]
-
-ifdef::ProductRelease,EAPXPRelease[]
-=======
endif::[]
ifdef::ProductRelease[]
ifndef::EAPXPRelease[]
// ... for EAP
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -979,9 +863,6 @@ ifndef::EAPXPRelease[]
----
-<<<<<<< HEAD
-You may note that it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-=======
endif::[]
ifdef::EAPXPRelease[]
// ... for EAP XP
@@ -1035,10 +916,8 @@ ifdef::EAPXPRelease[]
====
Previous {productName} releases used the WildFly JAR Maven Plugin to package the quickstart in a Bootable JAR, when deploying it on OpenShift, and while that's still supported it's no longer recommended.
====
->>>>>>> upstream/main
endif::[]
-
:leveloffset: 1
// Getting Started with Helm
:leveloffset: +1
@@ -1144,11 +1023,7 @@ ifndef::useHelmChartDir[]
----
build:
uri: https://github.com/wildfly/quickstart.git
-<<<<<<< HEAD
- ref: 31.x-glow-preview
-=======
ref: main
->>>>>>> upstream/main
contextDir: jsonp
deploy:
replicas: 1
diff --git a/jta-crash-rec/README.adoc b/jta-crash-rec/README.adoc
index aaed388b11..cee53132d6 100644
--- a/jta-crash-rec/README.adoc
+++ b/jta-crash-rec/README.adoc
@@ -66,7 +66,7 @@ ifndef::ProductRelease,EAPXPRelease[]
:productImageVersion: 31.0
:githubRepoUrl: https://github.com/wildfly/quickstart/
:githubRepoCodeUrl: https://github.com/wildfly/quickstart.git
-:WildFlyQuickStartRepoTag: 31.0.0.Final-glow-preview
+:WildFlyQuickStartRepoTag: 31.0.0.Final
:DocInfoProductName: Red Hat JBoss Enterprise Application Platform
:DocInfoProductNameURL: red_hat_jboss_enterprise_application_platform
:DocInfoProductNumber: 8.0
@@ -196,9 +196,6 @@ endif::[]
:LinkJBDSGettingStarted: https://access.redhat.com/documentation/en-us/red_hat_codeready_studio/{JBDSVersion}/html-single/getting_started_with_codeready_studio_tools/
:JBDSGettingStartedBookName: Getting Started with CodeReady Studio Tools
-// Enable Rendering of Glow configuration in plugin examples
-:portedToGlow: true
-
= jta-crash-rec: Example of JTA Crash Recovery
:author: Mike Musgrove
:level: Advanced
diff --git a/jts/README.adoc b/jts/README.adoc
index 7dc851eb4c..4b03e95607 100644
--- a/jts/README.adoc
+++ b/jts/README.adoc
@@ -66,7 +66,7 @@ ifndef::ProductRelease,EAPXPRelease[]
:productImageVersion: 31.0
:githubRepoUrl: https://github.com/wildfly/quickstart/
:githubRepoCodeUrl: https://github.com/wildfly/quickstart.git
-:WildFlyQuickStartRepoTag: 31.0.0.Final-glow-preview
+:WildFlyQuickStartRepoTag: 31.0.0.Final
:DocInfoProductName: Red Hat JBoss Enterprise Application Platform
:DocInfoProductNameURL: red_hat_jboss_enterprise_application_platform
:DocInfoProductNumber: 8.0
@@ -196,9 +196,6 @@ endif::[]
:LinkJBDSGettingStarted: https://access.redhat.com/documentation/en-us/red_hat_codeready_studio/{JBDSVersion}/html-single/getting_started_with_codeready_studio_tools/
:JBDSGettingStartedBookName: Getting Started with CodeReady Studio Tools
-// Enable Rendering of Glow configuration in plugin examples
-:portedToGlow: true
-
= jts: Java Transaction Service - Distributed EJB Transactions
:author: Tom Jenkinson
:level: Intermediate
diff --git a/kitchensink/README.adoc b/kitchensink/README.adoc
index f64931d395..504ac03fb6 100644
--- a/kitchensink/README.adoc
+++ b/kitchensink/README.adoc
@@ -66,7 +66,7 @@ ifndef::ProductRelease,EAPXPRelease[]
:productImageVersion: 31.0
:githubRepoUrl: https://github.com/wildfly/quickstart/
:githubRepoCodeUrl: https://github.com/wildfly/quickstart.git
-:WildFlyQuickStartRepoTag: 31.0.0.Final-glow-preview
+:WildFlyQuickStartRepoTag: 31.0.0.Final
:DocInfoProductName: Red Hat JBoss Enterprise Application Platform
:DocInfoProductNameURL: red_hat_jboss_enterprise_application_platform
:DocInfoProductNumber: 8.0
@@ -196,15 +196,11 @@ endif::[]
:LinkJBDSGettingStarted: https://access.redhat.com/documentation/en-us/red_hat_codeready_studio/{JBDSVersion}/html-single/getting_started_with_codeready_studio_tools/
:JBDSGettingStartedBookName: Getting Started with CodeReady Studio Tools
-// Enable Rendering of Glow configuration in plugin examples
-:portedToGlow: true
-
= kitchensink: Assortment of technologies
:author: Pete Muir
:level: Intermediate
:technologies: CDI, JSF, JPA, EJB, JAX-RS, BV
:openshift: true
-:portedToGlow: true
[abstract]
The `kitchensink` quickstart demonstrates a localized {javaVersion} web-enabled database application using JSF, CDI, EJB, JPA, and Bean Validation.
@@ -737,7 +733,7 @@ For Windows, use the `__{jbossHomeName}__\bin\add-user.bat` script.
endif::[]
The server provisioning functionality is provided by the WildFly Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
-ifndef::portedToGlow[]
+
[source,xml,subs="attributes+"]
----
@@ -770,55 +766,6 @@ ifndef::portedToGlow[]
----
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- provisioned-server
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases/tag[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
[NOTE]
====
@@ -1015,14 +962,9 @@ ifdef::ProductRelease,EAPXPRelease[]
The server provisioning functionality is provided by the EAP Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
endif::[]
-<<<<<<< HEAD
-ifndef::ProductRelease,EAPXPRelease[]
-ifndef::portedToGlow[]
-=======
// Render XML Snippet of openshift Maven profile...
ifndef::ProductRelease[]
// ... for WildFly
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -1057,68 +999,10 @@ ifndef::ProductRelease[]
----
-<<<<<<< HEAD
-You may note that unlike the `provisioned-server` profile it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- openshift
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
- cloud
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-You may note that unlike the `provisioned-server` profile it uses the cloud context which enables a configuration tuned for OpenShift environment.
-
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
-endif::ProductRelease,EAPXPRelease[]
-
-ifdef::ProductRelease,EAPXPRelease[]
-=======
endif::[]
ifdef::ProductRelease[]
ifndef::EAPXPRelease[]
// ... for EAP
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -1154,9 +1038,6 @@ ifndef::EAPXPRelease[]
----
-<<<<<<< HEAD
-You may note that it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-=======
endif::[]
ifdef::EAPXPRelease[]
// ... for EAP XP
@@ -1210,10 +1091,8 @@ ifdef::EAPXPRelease[]
====
Previous {productName} releases used the WildFly JAR Maven Plugin to package the quickstart in a Bootable JAR, when deploying it on OpenShift, and while that's still supported it's no longer recommended.
====
->>>>>>> upstream/main
endif::[]
-
:leveloffset: 1
// Getting Started with Helm
:leveloffset: +1
@@ -1319,11 +1198,7 @@ ifndef::useHelmChartDir[]
----
build:
uri: https://github.com/wildfly/quickstart.git
-<<<<<<< HEAD
- ref: 31.x-glow-preview
-=======
ref: main
->>>>>>> upstream/main
contextDir: kitchensink
deploy:
replicas: 1
diff --git a/logging/README.adoc b/logging/README.adoc
index 00a5299667..e74733768c 100644
--- a/logging/README.adoc
+++ b/logging/README.adoc
@@ -66,7 +66,7 @@ ifndef::ProductRelease,EAPXPRelease[]
:productImageVersion: 31.0
:githubRepoUrl: https://github.com/wildfly/quickstart/
:githubRepoCodeUrl: https://github.com/wildfly/quickstart.git
-:WildFlyQuickStartRepoTag: 31.0.0.Final-glow-preview
+:WildFlyQuickStartRepoTag: 31.0.0.Final
:DocInfoProductName: Red Hat JBoss Enterprise Application Platform
:DocInfoProductNameURL: red_hat_jboss_enterprise_application_platform
:DocInfoProductNumber: 8.0
@@ -196,14 +196,10 @@ endif::[]
:LinkJBDSGettingStarted: https://access.redhat.com/documentation/en-us/red_hat_codeready_studio/{JBDSVersion}/html-single/getting_started_with_codeready_studio_tools/
:JBDSGettingStartedBookName: Getting Started with CodeReady Studio Tools
-// Enable Rendering of Glow configuration in plugin examples
-:portedToGlow: true
-
= logging: Example That Sets Up Different Logging Levels
:author: Joel Tosi
:level: Intermediate
:technologies: Logging
-:portedToGlow: true
[abstract]
The `logging` quickstart demonstrates how to configure different logging levels in {productName}.
@@ -911,7 +907,7 @@ For Windows, use the `__{jbossHomeName}__\bin\add-user.bat` script.
endif::[]
The server provisioning functionality is provided by the WildFly Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
-ifndef::portedToGlow[]
+
[source,xml,subs="attributes+"]
----
@@ -944,55 +940,6 @@ ifndef::portedToGlow[]
----
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- provisioned-server
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases/tag[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
[NOTE]
====
@@ -1190,14 +1137,9 @@ ifdef::ProductRelease,EAPXPRelease[]
The server provisioning functionality is provided by the EAP Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
endif::[]
-<<<<<<< HEAD
-ifndef::ProductRelease,EAPXPRelease[]
-ifndef::portedToGlow[]
-=======
// Render XML Snippet of openshift Maven profile...
ifndef::ProductRelease[]
// ... for WildFly
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -1232,68 +1174,10 @@ ifndef::ProductRelease[]
----
-<<<<<<< HEAD
-You may note that unlike the `provisioned-server` profile it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- openshift
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
- cloud
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-You may note that unlike the `provisioned-server` profile it uses the cloud context which enables a configuration tuned for OpenShift environment.
-
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
-endif::ProductRelease,EAPXPRelease[]
-
-ifdef::ProductRelease,EAPXPRelease[]
-=======
endif::[]
ifdef::ProductRelease[]
ifndef::EAPXPRelease[]
// ... for EAP
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -1329,9 +1213,6 @@ ifndef::EAPXPRelease[]
----
-<<<<<<< HEAD
-You may note that it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-=======
endif::[]
ifdef::EAPXPRelease[]
// ... for EAP XP
@@ -1385,10 +1266,8 @@ ifdef::EAPXPRelease[]
====
Previous {productName} releases used the WildFly JAR Maven Plugin to package the quickstart in a Bootable JAR, when deploying it on OpenShift, and while that's still supported it's no longer recommended.
====
->>>>>>> upstream/main
endif::[]
-
:leveloffset: 1
// Getting Started with Helm
:leveloffset: +1
diff --git a/mail/README.adoc b/mail/README.adoc
index acc1bbe075..6c6001679d 100644
--- a/mail/README.adoc
+++ b/mail/README.adoc
@@ -66,7 +66,7 @@ ifndef::ProductRelease,EAPXPRelease[]
:productImageVersion: 31.0
:githubRepoUrl: https://github.com/wildfly/quickstart/
:githubRepoCodeUrl: https://github.com/wildfly/quickstart.git
-:WildFlyQuickStartRepoTag: 31.0.0.Final-glow-preview
+:WildFlyQuickStartRepoTag: 31.0.0.Final
:DocInfoProductName: Red Hat JBoss Enterprise Application Platform
:DocInfoProductNameURL: red_hat_jboss_enterprise_application_platform
:DocInfoProductNumber: 8.0
@@ -196,14 +196,10 @@ endif::[]
:LinkJBDSGettingStarted: https://access.redhat.com/documentation/en-us/red_hat_codeready_studio/{JBDSVersion}/html-single/getting_started_with_codeready_studio_tools/
:JBDSGettingStartedBookName: Getting Started with CodeReady Studio Tools
-// Enable Rendering of Glow configuration in plugin examples
-:portedToGlow: true
-
= mail: E-Mail Example using CDI and JSF
:author: Joel Tosi
:level: Beginner
:technologies: JavaMail, CDI, JSF
-:portedToGlow: true
[abstract]
The `mail` quickstart demonstrates how to send and receive emails using CDI and JSF and with custom Mail provider configured in {productName}.
@@ -988,7 +984,7 @@ For Windows, use the `__{jbossHomeName}__\bin\add-user.bat` script.
endif::[]
The server provisioning functionality is provided by the WildFly Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
-ifndef::portedToGlow[]
+
[source,xml,subs="attributes+"]
----
@@ -1021,55 +1017,6 @@ ifndef::portedToGlow[]
----
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- provisioned-server
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases/tag[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
[NOTE]
====
diff --git a/messaging-clustering-singleton/README.adoc b/messaging-clustering-singleton/README.adoc
index ecd59caf70..528ac72de7 100644
--- a/messaging-clustering-singleton/README.adoc
+++ b/messaging-clustering-singleton/README.adoc
@@ -66,7 +66,7 @@ ifndef::ProductRelease,EAPXPRelease[]
:productImageVersion: 31.0
:githubRepoUrl: https://github.com/wildfly/quickstart/
:githubRepoCodeUrl: https://github.com/wildfly/quickstart.git
-:WildFlyQuickStartRepoTag: 31.0.0.Final-glow-preview
+:WildFlyQuickStartRepoTag: 31.0.0.Final
:DocInfoProductName: Red Hat JBoss Enterprise Application Platform
:DocInfoProductNameURL: red_hat_jboss_enterprise_application_platform
:DocInfoProductNumber: 8.0
@@ -196,9 +196,6 @@ endif::[]
:LinkJBDSGettingStarted: https://access.redhat.com/documentation/en-us/red_hat_codeready_studio/{JBDSVersion}/html-single/getting_started_with_codeready_studio_tools/
:JBDSGettingStartedBookName: Getting Started with CodeReady Studio Tools
-// Enable Rendering of Glow configuration in plugin examples
-:portedToGlow: true
-
= messaging-clustering-singleton: Messaging Example that Demonstrates Clustering
:author: Flavia Rainone, Jess Sightler
:level: Advanced
diff --git a/micrometer/README.adoc b/micrometer/README.adoc
index d1f8d4f4a8..baf04676a6 100644
--- a/micrometer/README.adoc
+++ b/micrometer/README.adoc
@@ -66,7 +66,7 @@ ifndef::ProductRelease,EAPXPRelease[]
:productImageVersion: 31.0
:githubRepoUrl: https://github.com/wildfly/quickstart/
:githubRepoCodeUrl: https://github.com/wildfly/quickstart.git
-:WildFlyQuickStartRepoTag: 31.0.0.Final-glow-preview
+:WildFlyQuickStartRepoTag: 31.0.0.Final
:DocInfoProductName: Red Hat JBoss Enterprise Application Platform
:DocInfoProductNameURL: red_hat_jboss_enterprise_application_platform
:DocInfoProductNumber: 8.0
@@ -196,15 +196,11 @@ endif::[]
:LinkJBDSGettingStarted: https://access.redhat.com/documentation/en-us/red_hat_codeready_studio/{JBDSVersion}/html-single/getting_started_with_codeready_studio_tools/
:JBDSGettingStartedBookName: Getting Started with CodeReady Studio Tools
-// Enable Rendering of Glow configuration in plugin examples
-:portedToGlow: true
-
= micrometer: Micrometer QuickStart
:author: Jason Lee
:level: Beginner
:technologies: Micrometer
:openshift: true
-:portedToGlow: true
[abstract]
The `micrometer` quickstart demonstrates the use of the Micrometer library in {productName}.
@@ -960,7 +956,7 @@ For Windows, use the `__{jbossHomeName}__\bin\add-user.bat` script.
endif::[]
The server provisioning functionality is provided by the WildFly Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
-ifndef::portedToGlow[]
+
[source,xml,subs="attributes+"]
----
@@ -993,55 +989,6 @@ ifndef::portedToGlow[]
----
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- provisioned-server
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases/tag[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
[NOTE]
====
@@ -1225,13 +1172,9 @@ You can use the WildFly JAR Maven plug-in to build a {productName} bootable JAR
The quickstart `pom.xml` file contains a Maven profile named *bootable-jar* which configures the bootable JAR building:
-<<<<<<< HEAD
-ifndef::portedToGlow[]
-=======
// Render XML Snippet of openshift Maven profile...
ifndef::ProductRelease[]
// ... for WildFly
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -1300,63 +1243,10 @@ ifdef::EAPXPRelease[]
----
-<<<<<<< HEAD
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- bootable-jar
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
-
- true
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases/tag[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
-=======
endif::[]
endif::[]
->>>>>>> upstream/main
.Procedure
@@ -1515,14 +1405,9 @@ ifdef::ProductRelease,EAPXPRelease[]
The server provisioning functionality is provided by the EAP Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
endif::[]
-<<<<<<< HEAD
-ifndef::ProductRelease,EAPXPRelease[]
-ifndef::portedToGlow[]
-=======
// Render XML Snippet of openshift Maven profile...
ifndef::ProductRelease[]
// ... for WildFly
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -1557,68 +1442,10 @@ ifndef::ProductRelease[]
----
-<<<<<<< HEAD
-You may note that unlike the `provisioned-server` profile it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- openshift
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
- cloud
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-You may note that unlike the `provisioned-server` profile it uses the cloud context which enables a configuration tuned for OpenShift environment.
-
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
-endif::ProductRelease,EAPXPRelease[]
-
-ifdef::ProductRelease,EAPXPRelease[]
-=======
endif::[]
ifdef::ProductRelease[]
ifndef::EAPXPRelease[]
// ... for EAP
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -1654,9 +1481,6 @@ ifndef::EAPXPRelease[]
----
-<<<<<<< HEAD
-You may note that it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-=======
endif::[]
ifdef::EAPXPRelease[]
// ... for EAP XP
@@ -1710,10 +1534,8 @@ ifdef::EAPXPRelease[]
====
Previous {productName} releases used the WildFly JAR Maven Plugin to package the quickstart in a Bootable JAR, when deploying it on OpenShift, and while that's still supported it's no longer recommended.
====
->>>>>>> upstream/main
endif::[]
-
:leveloffset: 1
// Getting Started with Helm
:leveloffset: +1
@@ -1970,15 +1792,7 @@ ifndef::useHelmChartDir[]
----
build:
uri: https://github.com/wildfly/quickstart.git
-<<<<<<< HEAD
-<<<<<<< HEAD
- ref: main
-=======
- ref: 31.x-glow-preview
->>>>>>> b4ca9a43b66d96aff01d3da9f9714b65b9bb38b0
-=======
ref: main
->>>>>>> upstream/main
contextDir: micrometer
deploy:
replicas: 1
diff --git a/microprofile-config/README.adoc b/microprofile-config/README.adoc
index 0951a4d1a0..6cc5f2dcc9 100644
--- a/microprofile-config/README.adoc
+++ b/microprofile-config/README.adoc
@@ -66,7 +66,7 @@ ifndef::ProductRelease,EAPXPRelease[]
:productImageVersion: 31.0
:githubRepoUrl: https://github.com/wildfly/quickstart/
:githubRepoCodeUrl: https://github.com/wildfly/quickstart.git
-:WildFlyQuickStartRepoTag: 31.0.0.Final-glow-preview
+:WildFlyQuickStartRepoTag: 31.0.0.Final
:DocInfoProductName: Red Hat JBoss Enterprise Application Platform
:DocInfoProductNameURL: red_hat_jboss_enterprise_application_platform
:DocInfoProductNumber: 8.0
@@ -196,14 +196,10 @@ endif::[]
:LinkJBDSGettingStarted: https://access.redhat.com/documentation/en-us/red_hat_codeready_studio/{JBDSVersion}/html-single/getting_started_with_codeready_studio_tools/
:JBDSGettingStartedBookName: Getting Started with CodeReady Studio Tools
-// Enable Rendering of Glow configuration in plugin examples
-:portedToGlow: true
-
= microprofile-config: MicroProfile Config QuickStart
:author: Martin Stefanko
:level: Beginner
:technologies: MicroProfile Config
-:portedToGlow: true
[abstract]
The `microprofile-config` quickstart demonstrates the use of the MicroProfile Config specification in {productName}.
@@ -1375,13 +1371,9 @@ You can use the WildFly JAR Maven plug-in to build a {productName} bootable JAR
The quickstart `pom.xml` file contains a Maven profile named *bootable-jar* which configures the bootable JAR building:
-<<<<<<< HEAD
-ifndef::portedToGlow[]
-=======
// Render XML Snippet of openshift Maven profile...
ifndef::ProductRelease[]
// ... for WildFly
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -1450,63 +1442,10 @@ ifdef::EAPXPRelease[]
----
-<<<<<<< HEAD
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- bootable-jar
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
-
- true
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases/tag[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
-=======
endif::[]
endif::[]
->>>>>>> upstream/main
.Procedure
@@ -1666,14 +1605,9 @@ ifdef::ProductRelease,EAPXPRelease[]
The server provisioning functionality is provided by the EAP Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
endif::[]
-<<<<<<< HEAD
-ifndef::ProductRelease,EAPXPRelease[]
-ifndef::portedToGlow[]
-=======
// Render XML Snippet of openshift Maven profile...
ifndef::ProductRelease[]
// ... for WildFly
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -1708,68 +1642,10 @@ ifndef::ProductRelease[]
----
-<<<<<<< HEAD
-You may note that unlike the `provisioned-server` profile it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- openshift
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
- cloud
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-You may note that unlike the `provisioned-server` profile it uses the cloud context which enables a configuration tuned for OpenShift environment.
-
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
-endif::ProductRelease,EAPXPRelease[]
-
-ifdef::ProductRelease,EAPXPRelease[]
-=======
endif::[]
ifdef::ProductRelease[]
ifndef::EAPXPRelease[]
// ... for EAP
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -1805,9 +1681,6 @@ ifndef::EAPXPRelease[]
----
-<<<<<<< HEAD
-You may note that it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-=======
endif::[]
ifdef::EAPXPRelease[]
// ... for EAP XP
@@ -1861,10 +1734,8 @@ ifdef::EAPXPRelease[]
====
Previous {productName} releases used the WildFly JAR Maven Plugin to package the quickstart in a Bootable JAR, when deploying it on OpenShift, and while that's still supported it's no longer recommended.
====
->>>>>>> upstream/main
endif::[]
-
:leveloffset: 1
// Getting Started with Helm
:leveloffset: +1
@@ -1970,11 +1841,7 @@ ifndef::useHelmChartDir[]
----
build:
uri: https://github.com/wildfly/quickstart.git
-<<<<<<< HEAD
- ref: 31.x-glow-preview
-=======
ref: main
->>>>>>> upstream/main
contextDir: microprofile-config
deploy:
replicas: 1
diff --git a/microprofile-fault-tolerance/README.adoc b/microprofile-fault-tolerance/README.adoc
index 930fab9b2d..4f367d079e 100644
--- a/microprofile-fault-tolerance/README.adoc
+++ b/microprofile-fault-tolerance/README.adoc
@@ -75,7 +75,7 @@ ifndef::ProductRelease,EAPXPRelease[]
:productImageVersion: 31.0
:githubRepoUrl: https://github.com/wildfly/quickstart/
:githubRepoCodeUrl: https://github.com/wildfly/quickstart.git
-:WildFlyQuickStartRepoTag: 31.0.0.Final-glow-preview
+:WildFlyQuickStartRepoTag: 31.0.0.Final
:DocInfoProductName: Red Hat JBoss Enterprise Application Platform
:DocInfoProductNameURL: red_hat_jboss_enterprise_application_platform
:DocInfoProductNumber: 8.0
@@ -205,14 +205,10 @@ endif::[]
:LinkJBDSGettingStarted: https://access.redhat.com/documentation/en-us/red_hat_codeready_studio/{JBDSVersion}/html-single/getting_started_with_codeready_studio_tools/
:JBDSGettingStartedBookName: Getting Started with CodeReady Studio Tools
-// Enable Rendering of Glow configuration in plugin examples
-:portedToGlow: true
-
= microprofile-fault-tolerance: MicroProfile Fault Tolerance
:author: Radoslav Husar, Tomas Hofman
:level: Intermediate
:technologies: MicroProfile, Fault Tolerance
-:portedToGlow: true
[abstract]
The `microprofile-fault-tolerance` quickstart demonstrates how to use Eclipse MicroProfile Fault Tolerance in {productName}.
@@ -1206,13 +1202,9 @@ You can use the WildFly JAR Maven plug-in to build a {productName} bootable JAR
The quickstart `pom.xml` file contains a Maven profile named *bootable-jar* which configures the bootable JAR building:
-<<<<<<< HEAD
-ifndef::portedToGlow[]
-=======
// Render XML Snippet of openshift Maven profile...
ifndef::ProductRelease[]
// ... for WildFly
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -1281,63 +1273,10 @@ ifdef::EAPXPRelease[]
----
-<<<<<<< HEAD
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- bootable-jar
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
-
- true
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases/tag[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
-=======
endif::[]
endif::[]
->>>>>>> upstream/main
.Procedure
@@ -1497,14 +1436,9 @@ ifdef::ProductRelease,EAPXPRelease[]
The server provisioning functionality is provided by the EAP Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
endif::[]
-<<<<<<< HEAD
-ifndef::ProductRelease,EAPXPRelease[]
-ifndef::portedToGlow[]
-=======
// Render XML Snippet of openshift Maven profile...
ifndef::ProductRelease[]
// ... for WildFly
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -1539,68 +1473,10 @@ ifndef::ProductRelease[]
----
-<<<<<<< HEAD
-You may note that unlike the `provisioned-server` profile it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- openshift
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
- cloud
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-You may note that unlike the `provisioned-server` profile it uses the cloud context which enables a configuration tuned for OpenShift environment.
-
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
-endif::ProductRelease,EAPXPRelease[]
-
-ifdef::ProductRelease,EAPXPRelease[]
-=======
endif::[]
ifdef::ProductRelease[]
ifndef::EAPXPRelease[]
// ... for EAP
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -1636,9 +1512,6 @@ ifndef::EAPXPRelease[]
----
-<<<<<<< HEAD
-You may note that it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-=======
endif::[]
ifdef::EAPXPRelease[]
// ... for EAP XP
@@ -1692,10 +1565,8 @@ ifdef::EAPXPRelease[]
====
Previous {productName} releases used the WildFly JAR Maven Plugin to package the quickstart in a Bootable JAR, when deploying it on OpenShift, and while that's still supported it's no longer recommended.
====
->>>>>>> upstream/main
endif::[]
-
:leveloffset: 1
// Getting Started with Helm
:leveloffset: +1
@@ -1801,11 +1672,7 @@ ifndef::useHelmChartDir[]
----
build:
uri: https://github.com/wildfly/quickstart.git
-<<<<<<< HEAD
- ref: 31.x-glow-preview
-=======
ref: main
->>>>>>> upstream/main
contextDir: microprofile-fault-tolerance
deploy:
replicas: 1
diff --git a/microprofile-health/README.adoc b/microprofile-health/README.adoc
index b96ae21d0c..e5bf8875b8 100644
--- a/microprofile-health/README.adoc
+++ b/microprofile-health/README.adoc
@@ -66,7 +66,7 @@ ifndef::ProductRelease,EAPXPRelease[]
:productImageVersion: 31.0
:githubRepoUrl: https://github.com/wildfly/quickstart/
:githubRepoCodeUrl: https://github.com/wildfly/quickstart.git
-:WildFlyQuickStartRepoTag: 31.0.0.Final-glow-preview
+:WildFlyQuickStartRepoTag: 31.0.0.Final
:DocInfoProductName: Red Hat JBoss Enterprise Application Platform
:DocInfoProductNameURL: red_hat_jboss_enterprise_application_platform
:DocInfoProductNumber: 8.0
@@ -196,9 +196,6 @@ endif::[]
:LinkJBDSGettingStarted: https://access.redhat.com/documentation/en-us/red_hat_codeready_studio/{JBDSVersion}/html-single/getting_started_with_codeready_studio_tools/
:JBDSGettingStartedBookName: Getting Started with CodeReady Studio Tools
-// Enable Rendering of Glow configuration in plugin examples
-:portedToGlow: true
-
= microprofile-health: MicroProfile Health QuickStart
:author: Martin Stefanko
:level: Beginner
@@ -215,7 +212,6 @@ The `microprofile-health` quickstart demonstrates the use of the MicroProfile He
:archiveType: war
:archiveName: {artifactId}
:include-management-port: http://localhost:9990/health/live
-:portedToGlow: true
== What is it?
@@ -1048,13 +1044,9 @@ You can use the WildFly JAR Maven plug-in to build a {productName} bootable JAR
The quickstart `pom.xml` file contains a Maven profile named *bootable-jar* which configures the bootable JAR building:
-<<<<<<< HEAD
-ifndef::portedToGlow[]
-=======
// Render XML Snippet of openshift Maven profile...
ifndef::ProductRelease[]
// ... for WildFly
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -1123,63 +1115,10 @@ ifdef::EAPXPRelease[]
----
-<<<<<<< HEAD
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- bootable-jar
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
-
- true
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases/tag[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
-=======
endif::[]
endif::[]
->>>>>>> upstream/main
.Procedure
@@ -1339,14 +1278,9 @@ ifdef::ProductRelease,EAPXPRelease[]
The server provisioning functionality is provided by the EAP Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
endif::[]
-<<<<<<< HEAD
-ifndef::ProductRelease,EAPXPRelease[]
-ifndef::portedToGlow[]
-=======
// Render XML Snippet of openshift Maven profile...
ifndef::ProductRelease[]
// ... for WildFly
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -1381,68 +1315,10 @@ ifndef::ProductRelease[]
----
-<<<<<<< HEAD
-You may note that unlike the `provisioned-server` profile it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- openshift
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
- cloud
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-You may note that unlike the `provisioned-server` profile it uses the cloud context which enables a configuration tuned for OpenShift environment.
-
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
-endif::ProductRelease,EAPXPRelease[]
-
-ifdef::ProductRelease,EAPXPRelease[]
-=======
endif::[]
ifdef::ProductRelease[]
ifndef::EAPXPRelease[]
// ... for EAP
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -1478,9 +1354,6 @@ ifndef::EAPXPRelease[]
----
-<<<<<<< HEAD
-You may note that it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-=======
endif::[]
ifdef::EAPXPRelease[]
// ... for EAP XP
@@ -1534,10 +1407,8 @@ ifdef::EAPXPRelease[]
====
Previous {productName} releases used the WildFly JAR Maven Plugin to package the quickstart in a Bootable JAR, when deploying it on OpenShift, and while that's still supported it's no longer recommended.
====
->>>>>>> upstream/main
endif::[]
-
:leveloffset: 1
// Getting Started with Helm
:leveloffset: +1
@@ -1643,11 +1514,7 @@ ifndef::useHelmChartDir[]
----
build:
uri: https://github.com/wildfly/quickstart.git
-<<<<<<< HEAD
- ref: 31.x-glow-preview
-=======
ref: main
->>>>>>> upstream/main
contextDir: microprofile-health
deploy:
replicas: 1
diff --git a/microprofile-jwt/README.adoc b/microprofile-jwt/README.adoc
index 466c2b2e53..c984e84525 100644
--- a/microprofile-jwt/README.adoc
+++ b/microprofile-jwt/README.adoc
@@ -66,7 +66,7 @@ ifndef::ProductRelease,EAPXPRelease[]
:productImageVersion: 31.0
:githubRepoUrl: https://github.com/wildfly/quickstart/
:githubRepoCodeUrl: https://github.com/wildfly/quickstart.git
-:WildFlyQuickStartRepoTag: 31.0.0.Final-glow-preview
+:WildFlyQuickStartRepoTag: 31.0.0.Final
:DocInfoProductName: Red Hat JBoss Enterprise Application Platform
:DocInfoProductNameURL: red_hat_jboss_enterprise_application_platform
:DocInfoProductNumber: 8.0
@@ -196,9 +196,6 @@ endif::[]
:LinkJBDSGettingStarted: https://access.redhat.com/documentation/en-us/red_hat_codeready_studio/{JBDSVersion}/html-single/getting_started_with_codeready_studio_tools/
:JBDSGettingStartedBookName: Getting Started with CodeReady Studio Tools
-// Enable Rendering of Glow configuration in plugin examples
-:portedToGlow: true
-
= micro-profile-jwt: MicroProfile JWT QuickStart
:author: Darran Lofthouse
:level: Intermediate
@@ -210,7 +207,6 @@ The `microprofile-jwt` quickstart demonstrates the use of the MicroProfile JWT s
:standalone-server-type: microprofile
:archiveType: war
:archiveName: microprofile-jwt.war
-:portedToGlow: true
== What is it?
@@ -1137,13 +1133,9 @@ You can use the WildFly JAR Maven plug-in to build a {productName} bootable JAR
The quickstart `pom.xml` file contains a Maven profile named *bootable-jar* which configures the bootable JAR building:
-<<<<<<< HEAD
-ifndef::portedToGlow[]
-=======
// Render XML Snippet of openshift Maven profile...
ifndef::ProductRelease[]
// ... for WildFly
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -1212,63 +1204,10 @@ ifdef::EAPXPRelease[]
----
-<<<<<<< HEAD
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- bootable-jar
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
-
- true
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases/tag[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
-=======
endif::[]
endif::[]
->>>>>>> upstream/main
.Procedure
@@ -1428,14 +1367,9 @@ ifdef::ProductRelease,EAPXPRelease[]
The server provisioning functionality is provided by the EAP Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
endif::[]
-<<<<<<< HEAD
-ifndef::ProductRelease,EAPXPRelease[]
-ifndef::portedToGlow[]
-=======
// Render XML Snippet of openshift Maven profile...
ifndef::ProductRelease[]
// ... for WildFly
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -1470,68 +1404,10 @@ ifndef::ProductRelease[]
----
-<<<<<<< HEAD
-You may note that unlike the `provisioned-server` profile it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- openshift
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
- cloud
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-You may note that unlike the `provisioned-server` profile it uses the cloud context which enables a configuration tuned for OpenShift environment.
-
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
-endif::ProductRelease,EAPXPRelease[]
-
-ifdef::ProductRelease,EAPXPRelease[]
-=======
endif::[]
ifdef::ProductRelease[]
ifndef::EAPXPRelease[]
// ... for EAP
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -1567,9 +1443,6 @@ ifndef::EAPXPRelease[]
----
-<<<<<<< HEAD
-You may note that it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-=======
endif::[]
ifdef::EAPXPRelease[]
// ... for EAP XP
@@ -1623,10 +1496,8 @@ ifdef::EAPXPRelease[]
====
Previous {productName} releases used the WildFly JAR Maven Plugin to package the quickstart in a Bootable JAR, when deploying it on OpenShift, and while that's still supported it's no longer recommended.
====
->>>>>>> upstream/main
endif::[]
-
:leveloffset: 1
// Getting Started with Helm
:leveloffset: +1
@@ -1732,11 +1603,7 @@ ifndef::useHelmChartDir[]
----
build:
uri: https://github.com/wildfly/quickstart.git
-<<<<<<< HEAD
- ref: 31.x-glow-preview
-=======
ref: main
->>>>>>> upstream/main
contextDir: microprofile-jwt
deploy:
replicas: 1
diff --git a/microprofile-lra/README.adoc b/microprofile-lra/README.adoc
index 41970e9234..cc3690e7b7 100644
--- a/microprofile-lra/README.adoc
+++ b/microprofile-lra/README.adoc
@@ -66,7 +66,7 @@ ifndef::ProductRelease,EAPXPRelease[]
:productImageVersion: 31.0
:githubRepoUrl: https://github.com/wildfly/quickstart/
:githubRepoCodeUrl: https://github.com/wildfly/quickstart.git
-:WildFlyQuickStartRepoTag: 31.0.0.Final-glow-preview
+:WildFlyQuickStartRepoTag: 31.0.0.Final
:DocInfoProductName: Red Hat JBoss Enterprise Application Platform
:DocInfoProductNameURL: red_hat_jboss_enterprise_application_platform
:DocInfoProductNumber: 8.0
@@ -196,9 +196,6 @@ endif::[]
:LinkJBDSGettingStarted: https://access.redhat.com/documentation/en-us/red_hat_codeready_studio/{JBDSVersion}/html-single/getting_started_with_codeready_studio_tools/
:JBDSGettingStartedBookName: Getting Started with CodeReady Studio Tools
-// Enable Rendering of Glow configuration in plugin examples
-:portedToGlow: true
-
= microprofile-lra: MicroProfile LRA QuickStart
:author: Martin Stefanko
:level: Beginner
@@ -218,7 +215,6 @@ The `microprofile-lra` quickstart demonstrates the use of the MicroProfile LRA s
:custom-openshift-layers:
:extra-openshift-test-arguments:
:requires-http-route:
-:portedToGlow: true
== What is it?
@@ -865,13 +861,9 @@ You can use the WildFly JAR Maven plug-in to build a {productName} bootable JAR
The quickstart `pom.xml` file contains a Maven profile named *bootable-jar* which configures the bootable JAR building:
-<<<<<<< HEAD
-ifndef::portedToGlow[]
-=======
// Render XML Snippet of openshift Maven profile...
ifndef::ProductRelease[]
// ... for WildFly
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -940,63 +932,10 @@ ifdef::EAPXPRelease[]
----
-<<<<<<< HEAD
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- bootable-jar
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
-
- true
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases/tag[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
-=======
endif::[]
endif::[]
->>>>>>> upstream/main
.Procedure
@@ -1156,14 +1095,9 @@ ifdef::ProductRelease,EAPXPRelease[]
The server provisioning functionality is provided by the EAP Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
endif::[]
-<<<<<<< HEAD
-ifndef::ProductRelease,EAPXPRelease[]
-ifndef::portedToGlow[]
-=======
// Render XML Snippet of openshift Maven profile...
ifndef::ProductRelease[]
// ... for WildFly
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -1198,68 +1132,10 @@ ifndef::ProductRelease[]
----
-<<<<<<< HEAD
-You may note that unlike the `provisioned-server` profile it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- openshift
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
- cloud
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-You may note that unlike the `provisioned-server` profile it uses the cloud context which enables a configuration tuned for OpenShift environment.
-
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
-endif::ProductRelease,EAPXPRelease[]
-
-ifdef::ProductRelease,EAPXPRelease[]
-=======
endif::[]
ifdef::ProductRelease[]
ifndef::EAPXPRelease[]
// ... for EAP
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -1295,9 +1171,6 @@ ifndef::EAPXPRelease[]
----
-<<<<<<< HEAD
-You may note that it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-=======
endif::[]
ifdef::EAPXPRelease[]
// ... for EAP XP
@@ -1351,10 +1224,8 @@ ifdef::EAPXPRelease[]
====
Previous {productName} releases used the WildFly JAR Maven Plugin to package the quickstart in a Bootable JAR, when deploying it on OpenShift, and while that's still supported it's no longer recommended.
====
->>>>>>> upstream/main
endif::[]
-
:leveloffset: 1
// Getting Started with Helm
:leveloffset: +1
diff --git a/microprofile-openapi/README.adoc b/microprofile-openapi/README.adoc
index 09cd51da78..fe0236ee5e 100644
--- a/microprofile-openapi/README.adoc
+++ b/microprofile-openapi/README.adoc
@@ -66,7 +66,7 @@ ifndef::ProductRelease,EAPXPRelease[]
:productImageVersion: 31.0
:githubRepoUrl: https://github.com/wildfly/quickstart/
:githubRepoCodeUrl: https://github.com/wildfly/quickstart.git
-:WildFlyQuickStartRepoTag: 31.0.0.Final-glow-preview
+:WildFlyQuickStartRepoTag: 31.0.0.Final
:DocInfoProductName: Red Hat JBoss Enterprise Application Platform
:DocInfoProductNameURL: red_hat_jboss_enterprise_application_platform
:DocInfoProductNumber: 8.0
@@ -196,14 +196,10 @@ endif::[]
:LinkJBDSGettingStarted: https://access.redhat.com/documentation/en-us/red_hat_codeready_studio/{JBDSVersion}/html-single/getting_started_with_codeready_studio_tools/
:JBDSGettingStartedBookName: Getting Started with CodeReady Studio Tools
-// Enable Rendering of Glow configuration in plugin examples
-:portedToGlow: true
-
= microprofile-openapi: MicroProfile OpenAPI QuickStart
:author: Paul Ferraro
:level: Beginner
:technologies: MicroProfile OpenAPI
-:portedToGlow: true
[abstract]
This guide demonstrate how to use the MicroProfile OpenAPI functionality in {productName} to expose an OpenAPI document for a simple REST application.
@@ -652,13 +648,9 @@ You can use the WildFly JAR Maven plug-in to build a {productName} bootable JAR
The quickstart `pom.xml` file contains a Maven profile named *bootable-jar* which configures the bootable JAR building:
-<<<<<<< HEAD
-ifndef::portedToGlow[]
-=======
// Render XML Snippet of openshift Maven profile...
ifndef::ProductRelease[]
// ... for WildFly
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -727,63 +719,10 @@ ifdef::EAPXPRelease[]
----
-<<<<<<< HEAD
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- bootable-jar
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
-
- true
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases/tag[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
-=======
endif::[]
endif::[]
->>>>>>> upstream/main
.Procedure
@@ -943,14 +882,9 @@ ifdef::ProductRelease,EAPXPRelease[]
The server provisioning functionality is provided by the EAP Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
endif::[]
-<<<<<<< HEAD
-ifndef::ProductRelease,EAPXPRelease[]
-ifndef::portedToGlow[]
-=======
// Render XML Snippet of openshift Maven profile...
ifndef::ProductRelease[]
// ... for WildFly
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -985,68 +919,10 @@ ifndef::ProductRelease[]
----
-<<<<<<< HEAD
-You may note that unlike the `provisioned-server` profile it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- openshift
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
- cloud
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-You may note that unlike the `provisioned-server` profile it uses the cloud context which enables a configuration tuned for OpenShift environment.
-
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
-endif::ProductRelease,EAPXPRelease[]
-
-ifdef::ProductRelease,EAPXPRelease[]
-=======
endif::[]
ifdef::ProductRelease[]
ifndef::EAPXPRelease[]
// ... for EAP
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -1082,9 +958,6 @@ ifndef::EAPXPRelease[]
----
-<<<<<<< HEAD
-You may note that it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-=======
endif::[]
ifdef::EAPXPRelease[]
// ... for EAP XP
@@ -1138,10 +1011,8 @@ ifdef::EAPXPRelease[]
====
Previous {productName} releases used the WildFly JAR Maven Plugin to package the quickstart in a Bootable JAR, when deploying it on OpenShift, and while that's still supported it's no longer recommended.
====
->>>>>>> upstream/main
endif::[]
-
:leveloffset: 1
// Getting Started with Helm
:leveloffset: +1
@@ -1247,11 +1118,7 @@ ifndef::useHelmChartDir[]
----
build:
uri: https://github.com/wildfly/quickstart.git
-<<<<<<< HEAD
- ref: 31.x-glow-preview
-=======
ref: main
->>>>>>> upstream/main
contextDir: microprofile-openapi
deploy:
replicas: 1
diff --git a/microprofile-reactive-messaging-kafka/README.adoc b/microprofile-reactive-messaging-kafka/README.adoc
index e629bd2aaa..08616ae4d5 100644
--- a/microprofile-reactive-messaging-kafka/README.adoc
+++ b/microprofile-reactive-messaging-kafka/README.adoc
@@ -66,7 +66,7 @@ ifndef::ProductRelease,EAPXPRelease[]
:productImageVersion: 31.0
:githubRepoUrl: https://github.com/wildfly/quickstart/
:githubRepoCodeUrl: https://github.com/wildfly/quickstart.git
-:WildFlyQuickStartRepoTag: 31.0.0.Final-glow-preview
+:WildFlyQuickStartRepoTag: 31.0.0.Final
:DocInfoProductName: Red Hat JBoss Enterprise Application Platform
:DocInfoProductNameURL: red_hat_jboss_enterprise_application_platform
:DocInfoProductNumber: 8.0
@@ -196,9 +196,6 @@ endif::[]
:LinkJBDSGettingStarted: https://access.redhat.com/documentation/en-us/red_hat_codeready_studio/{JBDSVersion}/html-single/getting_started_with_codeready_studio_tools/
:JBDSGettingStartedBookName: Getting Started with CodeReady Studio Tools
-// Enable Rendering of Glow configuration in plugin examples
-:portedToGlow: true
-
= microprofile-reactive-messaging-kafka: MicroProfile Reactive Messaging with Kafka QuickStart
:author: Kabir Khan
:level: Beginner
@@ -213,7 +210,6 @@ The `microprofile-reactive-messaging-kafka` quickstart demonstrates the use of t
:helm-install-prerequisites: ../microprofile-reactive-messaging-kafka/helm-install-prerequisites.adoc
:helm-app-name: mp-rm-qs
:strimzi-version: v1beta2
-:portedToGlow: true
== What is it?
@@ -1566,13 +1562,9 @@ You can use the WildFly JAR Maven plug-in to build a {productName} bootable JAR
The quickstart `pom.xml` file contains a Maven profile named *bootable-jar* which configures the bootable JAR building:
-<<<<<<< HEAD
-ifndef::portedToGlow[]
-=======
// Render XML Snippet of openshift Maven profile...
ifndef::ProductRelease[]
// ... for WildFly
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -1641,63 +1633,10 @@ ifdef::EAPXPRelease[]
----
-<<<<<<< HEAD
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- bootable-jar
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
-
- true
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases/tag[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
-=======
endif::[]
endif::[]
->>>>>>> upstream/main
.Procedure
@@ -1857,14 +1796,9 @@ ifdef::ProductRelease,EAPXPRelease[]
The server provisioning functionality is provided by the EAP Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
endif::[]
-<<<<<<< HEAD
-ifndef::ProductRelease,EAPXPRelease[]
-ifndef::portedToGlow[]
-=======
// Render XML Snippet of openshift Maven profile...
ifndef::ProductRelease[]
// ... for WildFly
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -1899,68 +1833,10 @@ ifndef::ProductRelease[]
----
-<<<<<<< HEAD
-You may note that unlike the `provisioned-server` profile it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- openshift
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
- cloud
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-You may note that unlike the `provisioned-server` profile it uses the cloud context which enables a configuration tuned for OpenShift environment.
-
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
-endif::ProductRelease,EAPXPRelease[]
-
-ifdef::ProductRelease,EAPXPRelease[]
-=======
endif::[]
ifdef::ProductRelease[]
ifndef::EAPXPRelease[]
// ... for EAP
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -1996,9 +1872,6 @@ ifndef::EAPXPRelease[]
----
-<<<<<<< HEAD
-You may note that it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-=======
endif::[]
ifdef::EAPXPRelease[]
// ... for EAP XP
@@ -2052,10 +1925,8 @@ ifdef::EAPXPRelease[]
====
Previous {productName} releases used the WildFly JAR Maven Plugin to package the quickstart in a Bootable JAR, when deploying it on OpenShift, and while that's still supported it's no longer recommended.
====
->>>>>>> upstream/main
endif::[]
-
:leveloffset: 1
// Getting Started with Helm
:leveloffset: +1
@@ -2240,11 +2111,7 @@ ifndef::useHelmChartDir[]
# Will need a diff commit in the upstream-to-product repository
build:
uri: https://github.com/wildfly/quickstart.git
-<<<<<<< HEAD
- ref: 31.x-glow-preview
-=======
ref: main
->>>>>>> upstream/main
contextDir: microprofile-reactive-messaging-kafka
deploy:
replicas: 1
diff --git a/microprofile-rest-client/README.adoc b/microprofile-rest-client/README.adoc
index 5773e15feb..5b3d575d90 100644
--- a/microprofile-rest-client/README.adoc
+++ b/microprofile-rest-client/README.adoc
@@ -66,7 +66,7 @@ ifndef::ProductRelease,EAPXPRelease[]
:productImageVersion: 31.0
:githubRepoUrl: https://github.com/wildfly/quickstart/
:githubRepoCodeUrl: https://github.com/wildfly/quickstart.git
-:WildFlyQuickStartRepoTag: 31.0.0.Final-glow-preview
+:WildFlyQuickStartRepoTag: 31.0.0.Final
:DocInfoProductName: Red Hat JBoss Enterprise Application Platform
:DocInfoProductNameURL: red_hat_jboss_enterprise_application_platform
:DocInfoProductNumber: 8.0
@@ -196,9 +196,6 @@ endif::[]
:LinkJBDSGettingStarted: https://access.redhat.com/documentation/en-us/red_hat_codeready_studio/{JBDSVersion}/html-single/getting_started_with_codeready_studio_tools/
:JBDSGettingStartedBookName: Getting Started with CodeReady Studio Tools
-// Enable Rendering of Glow configuration in plugin examples
-:portedToGlow: true
-
= microprofile-rest-client: MicroProfile REST Client QuickStart
:author: Martin Stefanko
:level: Beginner
@@ -211,7 +208,6 @@ The `microprofile-rest-client` quickstart demonstrates the use of the MicroProfi
:archiveType: jar
:archiveName: {artifactId}
:rest-client-qs:
-:portedToGlow: true
== What is it?
@@ -685,13 +681,9 @@ You can use the WildFly JAR Maven plug-in to build a {productName} bootable JAR
The quickstart `pom.xml` file contains a Maven profile named *bootable-jar* which configures the bootable JAR building:
-<<<<<<< HEAD
-ifndef::portedToGlow[]
-=======
// Render XML Snippet of openshift Maven profile...
ifndef::ProductRelease[]
// ... for WildFly
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -760,63 +752,10 @@ ifdef::EAPXPRelease[]
----
-<<<<<<< HEAD
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- bootable-jar
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
-
- true
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases/tag[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
-=======
endif::[]
endif::[]
->>>>>>> upstream/main
.Procedure
@@ -975,14 +914,9 @@ ifdef::ProductRelease,EAPXPRelease[]
The server provisioning functionality is provided by the EAP Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
endif::[]
-<<<<<<< HEAD
-ifndef::ProductRelease,EAPXPRelease[]
-ifndef::portedToGlow[]
-=======
// Render XML Snippet of openshift Maven profile...
ifndef::ProductRelease[]
// ... for WildFly
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -1017,68 +951,10 @@ ifndef::ProductRelease[]
----
-<<<<<<< HEAD
-You may note that unlike the `provisioned-server` profile it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- openshift
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
- cloud
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-You may note that unlike the `provisioned-server` profile it uses the cloud context which enables a configuration tuned for OpenShift environment.
-
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
-endif::ProductRelease,EAPXPRelease[]
-
-ifdef::ProductRelease,EAPXPRelease[]
-=======
endif::[]
ifdef::ProductRelease[]
ifndef::EAPXPRelease[]
// ... for EAP
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -1114,9 +990,6 @@ ifndef::EAPXPRelease[]
----
-<<<<<<< HEAD
-You may note that it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-=======
endif::[]
ifdef::EAPXPRelease[]
// ... for EAP XP
@@ -1170,10 +1043,8 @@ ifdef::EAPXPRelease[]
====
Previous {productName} releases used the WildFly JAR Maven Plugin to package the quickstart in a Bootable JAR, when deploying it on OpenShift, and while that's still supported it's no longer recommended.
====
->>>>>>> upstream/main
endif::[]
-
:leveloffset: 1
// Getting Started with Helm
:leveloffset: +1
@@ -1279,11 +1150,7 @@ ifndef::useHelmChartDir[]
----
build:
uri: https://github.com/wildfly/quickstart.git
-<<<<<<< HEAD
- ref: 31.x-glow-preview
-=======
ref: main
->>>>>>> upstream/main
contextDir: microprofile-rest-client
deploy:
replicas: 1
diff --git a/numberguess/README.adoc b/numberguess/README.adoc
index 7470293c81..38e780dbd7 100644
--- a/numberguess/README.adoc
+++ b/numberguess/README.adoc
@@ -66,7 +66,7 @@ ifndef::ProductRelease,EAPXPRelease[]
:productImageVersion: 31.0
:githubRepoUrl: https://github.com/wildfly/quickstart/
:githubRepoCodeUrl: https://github.com/wildfly/quickstart.git
-:WildFlyQuickStartRepoTag: 31.0.0.Final-glow-preview
+:WildFlyQuickStartRepoTag: 31.0.0.Final
:DocInfoProductName: Red Hat JBoss Enterprise Application Platform
:DocInfoProductNameURL: red_hat_jboss_enterprise_application_platform
:DocInfoProductNumber: 8.0
@@ -196,15 +196,11 @@ endif::[]
:LinkJBDSGettingStarted: https://access.redhat.com/documentation/en-us/red_hat_codeready_studio/{JBDSVersion}/html-single/getting_started_with_codeready_studio_tools/
:JBDSGettingStartedBookName: Getting Started with CodeReady Studio Tools
-// Enable Rendering of Glow configuration in plugin examples
-:portedToGlow: true
-
= numberguess: Example Using CDI and JSF
:author: Pete Muir
:level: Beginner
:technologies: CDI, JSF
:openshift: true
-:portedToGlow: true
[abstract]
The `numberguess` quickstart demonstrates the use of CDI (Contexts and Dependency Injection) and JSF (JavaServer Faces) in {productName}.
@@ -605,7 +601,7 @@ For Windows, use the `__{jbossHomeName}__\bin\add-user.bat` script.
endif::[]
The server provisioning functionality is provided by the WildFly Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
-ifndef::portedToGlow[]
+
[source,xml,subs="attributes+"]
----
@@ -638,55 +634,6 @@ ifndef::portedToGlow[]
----
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- provisioned-server
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases/tag[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
[NOTE]
====
@@ -883,14 +830,9 @@ ifdef::ProductRelease,EAPXPRelease[]
The server provisioning functionality is provided by the EAP Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
endif::[]
-<<<<<<< HEAD
-ifndef::ProductRelease,EAPXPRelease[]
-ifndef::portedToGlow[]
-=======
// Render XML Snippet of openshift Maven profile...
ifndef::ProductRelease[]
// ... for WildFly
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -925,68 +867,10 @@ ifndef::ProductRelease[]
----
-<<<<<<< HEAD
-You may note that unlike the `provisioned-server` profile it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- openshift
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
- cloud
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-You may note that unlike the `provisioned-server` profile it uses the cloud context which enables a configuration tuned for OpenShift environment.
-
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
-endif::ProductRelease,EAPXPRelease[]
-
-ifdef::ProductRelease,EAPXPRelease[]
-=======
endif::[]
ifdef::ProductRelease[]
ifndef::EAPXPRelease[]
// ... for EAP
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -1022,9 +906,6 @@ ifndef::EAPXPRelease[]
----
-<<<<<<< HEAD
-You may note that it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-=======
endif::[]
ifdef::EAPXPRelease[]
// ... for EAP XP
@@ -1078,10 +959,8 @@ ifdef::EAPXPRelease[]
====
Previous {productName} releases used the WildFly JAR Maven Plugin to package the quickstart in a Bootable JAR, when deploying it on OpenShift, and while that's still supported it's no longer recommended.
====
->>>>>>> upstream/main
endif::[]
-
:leveloffset: 1
// Getting Started with Helm
:leveloffset: +1
@@ -1187,11 +1066,7 @@ ifndef::useHelmChartDir[]
----
build:
uri: https://github.com/wildfly/quickstart.git
-<<<<<<< HEAD
- ref: 31.x-glow-preview
-=======
ref: main
->>>>>>> upstream/main
contextDir: numberguess
deploy:
replicas: 1
diff --git a/opentelemetry-tracing/README.adoc b/opentelemetry-tracing/README.adoc
index dc20b69dcd..dfae0d90f0 100644
--- a/opentelemetry-tracing/README.adoc
+++ b/opentelemetry-tracing/README.adoc
@@ -66,7 +66,7 @@ ifndef::ProductRelease,EAPXPRelease[]
:productImageVersion: 31.0
:githubRepoUrl: https://github.com/wildfly/quickstart/
:githubRepoCodeUrl: https://github.com/wildfly/quickstart.git
-:WildFlyQuickStartRepoTag: 31.0.0.Final-glow-preview
+:WildFlyQuickStartRepoTag: 31.0.0.Final
:DocInfoProductName: Red Hat JBoss Enterprise Application Platform
:DocInfoProductNameURL: red_hat_jboss_enterprise_application_platform
:DocInfoProductNumber: 8.0
@@ -196,9 +196,6 @@ endif::[]
:LinkJBDSGettingStarted: https://access.redhat.com/documentation/en-us/red_hat_codeready_studio/{JBDSVersion}/html-single/getting_started_with_codeready_studio_tools/
:JBDSGettingStartedBookName: Getting Started with CodeReady Studio Tools
-// Enable Rendering of Glow configuration in plugin examples
-:portedToGlow: true
-
= opentelemetry-tracing: OpenTelemetry Tracing QuickStart
:author: Jason Lee
:level: Beginner
@@ -212,11 +209,7 @@ The `opentelemetry-tracing` quickstart demonstrates the use of the OpenTelemetry
:archiveType: war
:archiveName: {artifactId}
:restoreScriptName: restore-configuration.cli
-<<<<<<< HEAD
-:portedToGlow: true
-=======
:helm-install-prerequisites: ../opentelemetry-tracing/helm-install-prerequisites.adoc
->>>>>>> upstream/main
== What is it?
@@ -986,7 +979,7 @@ For Windows, use the `__{jbossHomeName}__\bin\add-user.bat` script.
endif::[]
The server provisioning functionality is provided by the WildFly Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
-ifndef::portedToGlow[]
+
[source,xml,subs="attributes+"]
----
@@ -1019,55 +1012,6 @@ ifndef::portedToGlow[]
----
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- provisioned-server
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases/tag[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
[NOTE]
====
@@ -1251,13 +1195,9 @@ You can use the WildFly JAR Maven plug-in to build a {productName} bootable JAR
The quickstart `pom.xml` file contains a Maven profile named *bootable-jar* which configures the bootable JAR building:
-<<<<<<< HEAD
-ifndef::portedToGlow[]
-=======
// Render XML Snippet of openshift Maven profile...
ifndef::ProductRelease[]
// ... for WildFly
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -1326,63 +1266,10 @@ ifdef::EAPXPRelease[]
----
-<<<<<<< HEAD
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- bootable-jar
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
-
- true
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases/tag[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
-=======
endif::[]
endif::[]
->>>>>>> upstream/main
.Procedure
@@ -1541,14 +1428,9 @@ ifdef::ProductRelease,EAPXPRelease[]
The server provisioning functionality is provided by the EAP Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
endif::[]
-<<<<<<< HEAD
-ifndef::ProductRelease,EAPXPRelease[]
-ifndef::portedToGlow[]
-=======
// Render XML Snippet of openshift Maven profile...
ifndef::ProductRelease[]
// ... for WildFly
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -1583,68 +1465,10 @@ ifndef::ProductRelease[]
----
-<<<<<<< HEAD
-You may note that unlike the `provisioned-server` profile it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- openshift
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
- cloud
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-You may note that unlike the `provisioned-server` profile it uses the cloud context which enables a configuration tuned for OpenShift environment.
-
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
-endif::ProductRelease,EAPXPRelease[]
-
-ifdef::ProductRelease,EAPXPRelease[]
-=======
endif::[]
ifdef::ProductRelease[]
ifndef::EAPXPRelease[]
// ... for EAP
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -1680,9 +1504,6 @@ ifndef::EAPXPRelease[]
----
-<<<<<<< HEAD
-You may note that it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-=======
endif::[]
ifdef::EAPXPRelease[]
// ... for EAP XP
@@ -1736,10 +1557,8 @@ ifdef::EAPXPRelease[]
====
Previous {productName} releases used the WildFly JAR Maven Plugin to package the quickstart in a Bootable JAR, when deploying it on OpenShift, and while that's still supported it's no longer recommended.
====
->>>>>>> upstream/main
endif::[]
-
:leveloffset: 1
// Getting Started with Helm
:leveloffset: +1
@@ -1976,15 +1795,7 @@ ifndef::useHelmChartDir[]
----
build:
uri: https://github.com/wildfly/quickstart.git
-<<<<<<< HEAD
-<<<<<<< HEAD
- ref: main
-=======
- ref: 31.x-glow-preview
->>>>>>> b4ca9a43b66d96aff01d3da9f9714b65b9bb38b0
-=======
ref: main
->>>>>>> upstream/main
contextDir: opentelemetry-tracing
deploy:
replicas: 1
diff --git a/remote-helloworld-mdb/README.adoc b/remote-helloworld-mdb/README.adoc
index 2f78b5a7b9..bf0a8bd05f 100644
--- a/remote-helloworld-mdb/README.adoc
+++ b/remote-helloworld-mdb/README.adoc
@@ -66,7 +66,7 @@ ifndef::ProductRelease,EAPXPRelease[]
:productImageVersion: 31.0
:githubRepoUrl: https://github.com/wildfly/quickstart/
:githubRepoCodeUrl: https://github.com/wildfly/quickstart.git
-:WildFlyQuickStartRepoTag: 31.0.0.Final-glow-preview
+:WildFlyQuickStartRepoTag: 31.0.0.Final
:DocInfoProductName: Red Hat JBoss Enterprise Application Platform
:DocInfoProductNameURL: red_hat_jboss_enterprise_application_platform
:DocInfoProductNumber: 8.0
@@ -196,15 +196,11 @@ endif::[]
:LinkJBDSGettingStarted: https://access.redhat.com/documentation/en-us/red_hat_codeready_studio/{JBDSVersion}/html-single/getting_started_with_codeready_studio_tools/
:JBDSGettingStartedBookName: Getting Started with CodeReady Studio Tools
-// Enable Rendering of Glow configuration in plugin examples
-:portedToGlow: true
-
= remote-helloworld-mdb: Helloworld Using an MDB (Message-Driven Bean) and a Remote Artemis broker
:author: Serge Pagop, Andy Taylor, Jeff Mesnil
:level: Intermediate
:technologies: JMS, EJB, MDB
:openshift: true
-:portedToGlow: true
:standalone-server-type: full
:archiveType: war
@@ -787,7 +783,7 @@ For Windows, use the `__{jbossHomeName}__\bin\add-user.bat` script.
endif::[]
The server provisioning functionality is provided by the WildFly Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
-ifndef::portedToGlow[]
+
[source,xml,subs="attributes+"]
----
@@ -820,55 +816,6 @@ ifndef::portedToGlow[]
----
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- provisioned-server
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases/tag[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
[NOTE]
====
@@ -1067,14 +1014,9 @@ ifdef::ProductRelease,EAPXPRelease[]
The server provisioning functionality is provided by the EAP Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
endif::[]
-<<<<<<< HEAD
-ifndef::ProductRelease,EAPXPRelease[]
-ifndef::portedToGlow[]
-=======
// Render XML Snippet of openshift Maven profile...
ifndef::ProductRelease[]
// ... for WildFly
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -1109,68 +1051,10 @@ ifndef::ProductRelease[]
----
-<<<<<<< HEAD
-You may note that unlike the `provisioned-server` profile it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- openshift
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
- cloud
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-You may note that unlike the `provisioned-server` profile it uses the cloud context which enables a configuration tuned for OpenShift environment.
-
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
-endif::ProductRelease,EAPXPRelease[]
-
-ifdef::ProductRelease,EAPXPRelease[]
-=======
endif::[]
ifdef::ProductRelease[]
ifndef::EAPXPRelease[]
// ... for EAP
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -1206,9 +1090,6 @@ ifndef::EAPXPRelease[]
----
-<<<<<<< HEAD
-You may note that it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-=======
endif::[]
ifdef::EAPXPRelease[]
// ... for EAP XP
@@ -1262,10 +1143,8 @@ ifdef::EAPXPRelease[]
====
Previous {productName} releases used the WildFly JAR Maven Plugin to package the quickstart in a Bootable JAR, when deploying it on OpenShift, and while that's still supported it's no longer recommended.
====
->>>>>>> upstream/main
endif::[]
-
:leveloffset: 1
// Getting Started with Helm
:leveloffset: +1
@@ -1371,11 +1250,7 @@ ifndef::useHelmChartDir[]
----
build:
uri: https://github.com/wildfly/quickstart.git
-<<<<<<< HEAD
- ref: 31.x-glow-preview
-=======
ref: main
->>>>>>> upstream/main
contextDir: remote-helloworld-mdb
deploy:
replicas: 1
@@ -1517,14 +1392,9 @@ ifdef::ProductRelease,EAPXPRelease[]
The server provisioning functionality is provided by the EAP Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
endif::[]
-<<<<<<< HEAD
-ifndef::ProductRelease,EAPXPRelease[]
-ifndef::portedToGlow[]
-=======
// Render XML Snippet of openshift Maven profile...
ifndef::ProductRelease[]
// ... for WildFly
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -1559,68 +1429,10 @@ ifndef::ProductRelease[]
----
-<<<<<<< HEAD
-You may note that unlike the `provisioned-server` profile it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- openshift
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
- cloud
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-You may note that unlike the `provisioned-server` profile it uses the cloud context which enables a configuration tuned for OpenShift environment.
-
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
-endif::ProductRelease,EAPXPRelease[]
-
-ifdef::ProductRelease,EAPXPRelease[]
-=======
endif::[]
ifdef::ProductRelease[]
ifndef::EAPXPRelease[]
// ... for EAP
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -1656,9 +1468,6 @@ ifndef::EAPXPRelease[]
----
-<<<<<<< HEAD
-You may note that it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-=======
endif::[]
ifdef::EAPXPRelease[]
// ... for EAP XP
@@ -1712,10 +1521,8 @@ ifdef::EAPXPRelease[]
====
Previous {productName} releases used the WildFly JAR Maven Plugin to package the quickstart in a Bootable JAR, when deploying it on OpenShift, and while that's still supported it's no longer recommended.
====
->>>>>>> upstream/main
endif::[]
-
:leveloffset: 1
// Getting Started with Helm
:leveloffset: +1
@@ -1821,11 +1628,7 @@ ifndef::useHelmChartDir[]
----
build:
uri: https://github.com/wildfly/quickstart.git
-<<<<<<< HEAD
- ref: 31.x-glow-preview
-=======
ref: main
->>>>>>> upstream/main
contextDir: remote-helloworld-mdb
deploy:
replicas: 1
diff --git a/security-domain-to-domain/README.adoc b/security-domain-to-domain/README.adoc
index c7ce4ca033..5c980a9fa5 100644
--- a/security-domain-to-domain/README.adoc
+++ b/security-domain-to-domain/README.adoc
@@ -66,7 +66,7 @@ ifndef::ProductRelease,EAPXPRelease[]
:productImageVersion: 31.0
:githubRepoUrl: https://github.com/wildfly/quickstart/
:githubRepoCodeUrl: https://github.com/wildfly/quickstart.git
-:WildFlyQuickStartRepoTag: 31.0.0.Final-glow-preview
+:WildFlyQuickStartRepoTag: 31.0.0.Final
:DocInfoProductName: Red Hat JBoss Enterprise Application Platform
:DocInfoProductNameURL: red_hat_jboss_enterprise_application_platform
:DocInfoProductNumber: 8.0
@@ -196,9 +196,6 @@ endif::[]
:LinkJBDSGettingStarted: https://access.redhat.com/documentation/en-us/red_hat_codeready_studio/{JBDSVersion}/html-single/getting_started_with_codeready_studio_tools/
:JBDSGettingStartedBookName: Getting Started with CodeReady Studio Tools
-// Enable Rendering of Glow configuration in plugin examples
-:portedToGlow: true
-
= security-domain-to-domain: Identity propagation to an EJB using different security domains
:author: Darran Lofthouse
:level: Advanced
diff --git a/servlet-async/README.adoc b/servlet-async/README.adoc
index d8dccc8f66..74354d199d 100644
--- a/servlet-async/README.adoc
+++ b/servlet-async/README.adoc
@@ -66,7 +66,7 @@ ifndef::ProductRelease,EAPXPRelease[]
:productImageVersion: 31.0
:githubRepoUrl: https://github.com/wildfly/quickstart/
:githubRepoCodeUrl: https://github.com/wildfly/quickstart.git
-:WildFlyQuickStartRepoTag: 31.0.0.Final-glow-preview
+:WildFlyQuickStartRepoTag: 31.0.0.Final
:DocInfoProductName: Red Hat JBoss Enterprise Application Platform
:DocInfoProductNameURL: red_hat_jboss_enterprise_application_platform
:DocInfoProductNumber: 8.0
@@ -196,15 +196,11 @@ endif::[]
:LinkJBDSGettingStarted: https://access.redhat.com/documentation/en-us/red_hat_codeready_studio/{JBDSVersion}/html-single/getting_started_with_codeready_studio_tools/
:JBDSGettingStartedBookName: Getting Started with CodeReady Studio Tools
-// Enable Rendering of Glow configuration in plugin examples
-:portedToGlow: true
-
= servlet-async: How to Write an Asynchronous Servlet
:author: Christian Sadilek
:level: Intermediate
:technologies: Asynchronous Servlet, CDI, EJB
:openshift: true
-:portedToGlow: true
[abstract]
The `servlet-async` quickstart demonstrates how to use asynchronous servlets to detach long-running tasks and free up the request processing thread.
@@ -609,7 +605,7 @@ For Windows, use the `__{jbossHomeName}__\bin\add-user.bat` script.
endif::[]
The server provisioning functionality is provided by the WildFly Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
-ifndef::portedToGlow[]
+
[source,xml,subs="attributes+"]
----
@@ -642,55 +638,6 @@ ifndef::portedToGlow[]
----
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- provisioned-server
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases/tag[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
[NOTE]
====
@@ -887,14 +834,9 @@ ifdef::ProductRelease,EAPXPRelease[]
The server provisioning functionality is provided by the EAP Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
endif::[]
-<<<<<<< HEAD
-ifndef::ProductRelease,EAPXPRelease[]
-ifndef::portedToGlow[]
-=======
// Render XML Snippet of openshift Maven profile...
ifndef::ProductRelease[]
// ... for WildFly
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -929,68 +871,10 @@ ifndef::ProductRelease[]
----
-<<<<<<< HEAD
-You may note that unlike the `provisioned-server` profile it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- openshift
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
- cloud
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-You may note that unlike the `provisioned-server` profile it uses the cloud context which enables a configuration tuned for OpenShift environment.
-
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
-endif::ProductRelease,EAPXPRelease[]
-
-ifdef::ProductRelease,EAPXPRelease[]
-=======
endif::[]
ifdef::ProductRelease[]
ifndef::EAPXPRelease[]
// ... for EAP
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -1026,9 +910,6 @@ ifndef::EAPXPRelease[]
----
-<<<<<<< HEAD
-You may note that it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-=======
endif::[]
ifdef::EAPXPRelease[]
// ... for EAP XP
@@ -1082,10 +963,8 @@ ifdef::EAPXPRelease[]
====
Previous {productName} releases used the WildFly JAR Maven Plugin to package the quickstart in a Bootable JAR, when deploying it on OpenShift, and while that's still supported it's no longer recommended.
====
->>>>>>> upstream/main
endif::[]
-
:leveloffset: 1
// Getting Started with Helm
:leveloffset: +1
@@ -1191,11 +1070,7 @@ ifndef::useHelmChartDir[]
----
build:
uri: https://github.com/wildfly/quickstart.git
-<<<<<<< HEAD
- ref: 31.x-glow-preview
-=======
ref: main
->>>>>>> upstream/main
contextDir: servlet-async
deploy:
replicas: 2
diff --git a/servlet-filterlistener/README.adoc b/servlet-filterlistener/README.adoc
index 89af9eee10..8bbe65db63 100644
--- a/servlet-filterlistener/README.adoc
+++ b/servlet-filterlistener/README.adoc
@@ -66,7 +66,7 @@ ifndef::ProductRelease,EAPXPRelease[]
:productImageVersion: 31.0
:githubRepoUrl: https://github.com/wildfly/quickstart/
:githubRepoCodeUrl: https://github.com/wildfly/quickstart.git
-:WildFlyQuickStartRepoTag: 31.0.0.Final-glow-preview
+:WildFlyQuickStartRepoTag: 31.0.0.Final
:DocInfoProductName: Red Hat JBoss Enterprise Application Platform
:DocInfoProductNameURL: red_hat_jboss_enterprise_application_platform
:DocInfoProductNumber: 8.0
@@ -196,15 +196,11 @@ endif::[]
:LinkJBDSGettingStarted: https://access.redhat.com/documentation/en-us/red_hat_codeready_studio/{JBDSVersion}/html-single/getting_started_with_codeready_studio_tools/
:JBDSGettingStartedBookName: Getting Started with CodeReady Studio Tools
-// Enable Rendering of Glow configuration in plugin examples
-:portedToGlow: true
-
= servlet-filterlistener: How to Write Servlet Filters and Listeners
:author: Jonathan Fuerth
:level: Intermediate
:technologies: Servlet Filter, Servlet Listener
:openshift: true
-:portedToGlow: true
[abstract]
The `servlet-filterlistener` quickstart demonstrates how to use Servlet filters and listeners in an application.
@@ -656,7 +652,7 @@ For Windows, use the `__{jbossHomeName}__\bin\add-user.bat` script.
endif::[]
The server provisioning functionality is provided by the WildFly Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
-ifndef::portedToGlow[]
+
[source,xml,subs="attributes+"]
----
@@ -689,55 +685,6 @@ ifndef::portedToGlow[]
----
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- provisioned-server
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases/tag[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
[NOTE]
====
@@ -934,14 +881,9 @@ ifdef::ProductRelease,EAPXPRelease[]
The server provisioning functionality is provided by the EAP Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
endif::[]
-<<<<<<< HEAD
-ifndef::ProductRelease,EAPXPRelease[]
-ifndef::portedToGlow[]
-=======
// Render XML Snippet of openshift Maven profile...
ifndef::ProductRelease[]
// ... for WildFly
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -976,68 +918,10 @@ ifndef::ProductRelease[]
----
-<<<<<<< HEAD
-You may note that unlike the `provisioned-server` profile it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- openshift
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
- cloud
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-You may note that unlike the `provisioned-server` profile it uses the cloud context which enables a configuration tuned for OpenShift environment.
-
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
-endif::ProductRelease,EAPXPRelease[]
-
-ifdef::ProductRelease,EAPXPRelease[]
-=======
endif::[]
ifdef::ProductRelease[]
ifndef::EAPXPRelease[]
// ... for EAP
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -1073,9 +957,6 @@ ifndef::EAPXPRelease[]
----
-<<<<<<< HEAD
-You may note that it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-=======
endif::[]
ifdef::EAPXPRelease[]
// ... for EAP XP
@@ -1129,10 +1010,8 @@ ifdef::EAPXPRelease[]
====
Previous {productName} releases used the WildFly JAR Maven Plugin to package the quickstart in a Bootable JAR, when deploying it on OpenShift, and while that's still supported it's no longer recommended.
====
->>>>>>> upstream/main
endif::[]
-
:leveloffset: 1
// Getting Started with Helm
:leveloffset: +1
@@ -1238,11 +1117,7 @@ ifndef::useHelmChartDir[]
----
build:
uri: https://github.com/wildfly/quickstart.git
-<<<<<<< HEAD
- ref: 31.x-glow-preview
-=======
ref: main
->>>>>>> upstream/main
contextDir: servlet-filterlistener
deploy:
replicas: 2
diff --git a/servlet-security/README.adoc b/servlet-security/README.adoc
index 02a31c046c..5acdde5427 100644
--- a/servlet-security/README.adoc
+++ b/servlet-security/README.adoc
@@ -66,7 +66,7 @@ ifndef::ProductRelease,EAPXPRelease[]
:productImageVersion: 31.0
:githubRepoUrl: https://github.com/wildfly/quickstart/
:githubRepoCodeUrl: https://github.com/wildfly/quickstart.git
-:WildFlyQuickStartRepoTag: 31.0.0.Final-glow-preview
+:WildFlyQuickStartRepoTag: 31.0.0.Final
:DocInfoProductName: Red Hat JBoss Enterprise Application Platform
:DocInfoProductNameURL: red_hat_jboss_enterprise_application_platform
:DocInfoProductNumber: 8.0
@@ -196,15 +196,11 @@ endif::[]
:LinkJBDSGettingStarted: https://access.redhat.com/documentation/en-us/red_hat_codeready_studio/{JBDSVersion}/html-single/getting_started_with_codeready_studio_tools/
:JBDSGettingStartedBookName: Getting Started with CodeReady Studio Tools
-// Enable Rendering of Glow configuration in plugin examples
-:portedToGlow: true
-
= servlet-security: Using Jakarta EE Declarative Security to Control Servlet Access
:author: Sherif F. Makary, Pedro Igor, Stefan Guilhen
:level: Intermediate
:technologies: Servlet, Security
:openshift: true
-:portedToGlow: true
[abstract]
The `servlet-security` quickstart demonstrates the use of Jakarta EE declarative security to control access to Servlets and Security in {productName}.
@@ -1000,7 +996,7 @@ For Windows, use the `__{jbossHomeName}__\bin\add-user.bat` script.
endif::[]
The server provisioning functionality is provided by the WildFly Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
-ifndef::portedToGlow[]
+
[source,xml,subs="attributes+"]
----
@@ -1033,55 +1029,6 @@ ifndef::portedToGlow[]
----
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- provisioned-server
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases/tag[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
[NOTE]
====
@@ -1278,14 +1225,9 @@ ifdef::ProductRelease,EAPXPRelease[]
The server provisioning functionality is provided by the EAP Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
endif::[]
-<<<<<<< HEAD
-ifndef::ProductRelease,EAPXPRelease[]
-ifndef::portedToGlow[]
-=======
// Render XML Snippet of openshift Maven profile...
ifndef::ProductRelease[]
// ... for WildFly
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -1320,68 +1262,10 @@ ifndef::ProductRelease[]
----
-<<<<<<< HEAD
-You may note that unlike the `provisioned-server` profile it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- openshift
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
- cloud
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-You may note that unlike the `provisioned-server` profile it uses the cloud context which enables a configuration tuned for OpenShift environment.
-
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
-endif::ProductRelease,EAPXPRelease[]
-
-ifdef::ProductRelease,EAPXPRelease[]
-=======
endif::[]
ifdef::ProductRelease[]
ifndef::EAPXPRelease[]
// ... for EAP
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -1417,9 +1301,6 @@ ifndef::EAPXPRelease[]
----
-<<<<<<< HEAD
-You may note that it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-=======
endif::[]
ifdef::EAPXPRelease[]
// ... for EAP XP
@@ -1473,10 +1354,8 @@ ifdef::EAPXPRelease[]
====
Previous {productName} releases used the WildFly JAR Maven Plugin to package the quickstart in a Bootable JAR, when deploying it on OpenShift, and while that's still supported it's no longer recommended.
====
->>>>>>> upstream/main
endif::[]
-
:leveloffset: 1
// Getting Started with Helm
:leveloffset: +1
@@ -1582,11 +1461,7 @@ ifndef::useHelmChartDir[]
----
build:
uri: https://github.com/wildfly/quickstart.git
-<<<<<<< HEAD
- ref: 31.x-glow-preview
-=======
ref: main
->>>>>>> upstream/main
contextDir: servlet-security
deploy:
replicas: 1
diff --git a/spring-resteasy/README.adoc b/spring-resteasy/README.adoc
index 19bca31e6f..8e2196bdf0 100644
--- a/spring-resteasy/README.adoc
+++ b/spring-resteasy/README.adoc
@@ -66,7 +66,7 @@ ifndef::ProductRelease,EAPXPRelease[]
:productImageVersion: 31.0
:githubRepoUrl: https://github.com/wildfly/quickstart/
:githubRepoCodeUrl: https://github.com/wildfly/quickstart.git
-:WildFlyQuickStartRepoTag: 31.0.0.Final-glow-preview
+:WildFlyQuickStartRepoTag: 31.0.0.Final
:DocInfoProductName: Red Hat JBoss Enterprise Application Platform
:DocInfoProductNameURL: red_hat_jboss_enterprise_application_platform
:DocInfoProductNumber: 8.0
@@ -196,16 +196,12 @@ endif::[]
:LinkJBDSGettingStarted: https://access.redhat.com/documentation/en-us/red_hat_codeready_studio/{JBDSVersion}/html-single/getting_started_with_codeready_studio_tools/
:JBDSGettingStartedBookName: Getting Started with CodeReady Studio Tools
-// Enable Rendering of Glow configuration in plugin examples
-:portedToGlow: true
-
= spring-resteasy: Example Using Resteasy Spring Integration
:author: Weinan Li , Paul Gier
:level: Beginner
:technologies: Resteasy, Spring
:openshift: true
:buildRequirements: Java 17 (Java SDK 17) or later and Maven 3.3.1 or later
-:portedToGlow: true
[abstract]
The `spring-resteasy` quickstart demonstrates how to package and deploy a web application that includes resteasy-spring integration.
@@ -635,7 +631,7 @@ For Windows, use the `__{jbossHomeName}__\bin\add-user.bat` script.
endif::[]
The server provisioning functionality is provided by the WildFly Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
-ifndef::portedToGlow[]
+
[source,xml,subs="attributes+"]
----
@@ -668,55 +664,6 @@ ifndef::portedToGlow[]
----
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- provisioned-server
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases/tag[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
[NOTE]
====
@@ -913,14 +860,9 @@ ifdef::ProductRelease,EAPXPRelease[]
The server provisioning functionality is provided by the EAP Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
endif::[]
-<<<<<<< HEAD
-ifndef::ProductRelease,EAPXPRelease[]
-ifndef::portedToGlow[]
-=======
// Render XML Snippet of openshift Maven profile...
ifndef::ProductRelease[]
// ... for WildFly
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -955,68 +897,10 @@ ifndef::ProductRelease[]
----
-<<<<<<< HEAD
-You may note that unlike the `provisioned-server` profile it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- openshift
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
- cloud
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-You may note that unlike the `provisioned-server` profile it uses the cloud context which enables a configuration tuned for OpenShift environment.
-
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
-endif::ProductRelease,EAPXPRelease[]
-
-ifdef::ProductRelease,EAPXPRelease[]
-=======
endif::[]
ifdef::ProductRelease[]
ifndef::EAPXPRelease[]
// ... for EAP
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -1052,9 +936,6 @@ ifndef::EAPXPRelease[]
----
-<<<<<<< HEAD
-You may note that it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-=======
endif::[]
ifdef::EAPXPRelease[]
// ... for EAP XP
@@ -1108,10 +989,8 @@ ifdef::EAPXPRelease[]
====
Previous {productName} releases used the WildFly JAR Maven Plugin to package the quickstart in a Bootable JAR, when deploying it on OpenShift, and while that's still supported it's no longer recommended.
====
->>>>>>> upstream/main
endif::[]
-
:leveloffset: 1
// Getting Started with Helm
:leveloffset: +1
@@ -1217,11 +1096,7 @@ ifndef::useHelmChartDir[]
----
build:
uri: https://github.com/wildfly/quickstart.git
-<<<<<<< HEAD
- ref: 31.x-glow-preview
-=======
ref: main
->>>>>>> upstream/main
contextDir: spring-resteasy
deploy:
replicas: 1
diff --git a/tasks-jsf/README.adoc b/tasks-jsf/README.adoc
index 3d11a15b13..3f8b3ed21b 100644
--- a/tasks-jsf/README.adoc
+++ b/tasks-jsf/README.adoc
@@ -66,7 +66,7 @@ ifndef::ProductRelease,EAPXPRelease[]
:productImageVersion: 31.0
:githubRepoUrl: https://github.com/wildfly/quickstart/
:githubRepoCodeUrl: https://github.com/wildfly/quickstart.git
-:WildFlyQuickStartRepoTag: 31.0.0.Final-glow-preview
+:WildFlyQuickStartRepoTag: 31.0.0.Final
:DocInfoProductName: Red Hat JBoss Enterprise Application Platform
:DocInfoProductNameURL: red_hat_jboss_enterprise_application_platform
:DocInfoProductNumber: 8.0
@@ -196,9 +196,6 @@ endif::[]
:LinkJBDSGettingStarted: https://access.redhat.com/documentation/en-us/red_hat_codeready_studio/{JBDSVersion}/html-single/getting_started_with_codeready_studio_tools/
:JBDSGettingStartedBookName: Getting Started with CodeReady Studio Tools
-// Enable Rendering of Glow configuration in plugin examples
-:portedToGlow: true
-
= tasks-jsf: JSF, JPA quickstart
:author: Lukas Fryc
:level: Intermediate
diff --git a/temperature-converter/README.adoc b/temperature-converter/README.adoc
index b0b9c9fb91..86f2ebed57 100644
--- a/temperature-converter/README.adoc
+++ b/temperature-converter/README.adoc
@@ -66,7 +66,7 @@ ifndef::ProductRelease,EAPXPRelease[]
:productImageVersion: 31.0
:githubRepoUrl: https://github.com/wildfly/quickstart/
:githubRepoCodeUrl: https://github.com/wildfly/quickstart.git
-:WildFlyQuickStartRepoTag: 31.0.0.Final-glow-preview
+:WildFlyQuickStartRepoTag: 31.0.0.Final
:DocInfoProductName: Red Hat JBoss Enterprise Application Platform
:DocInfoProductNameURL: red_hat_jboss_enterprise_application_platform
:DocInfoProductNumber: 8.0
@@ -196,15 +196,11 @@ endif::[]
:LinkJBDSGettingStarted: https://access.redhat.com/documentation/en-us/red_hat_codeready_studio/{JBDSVersion}/html-single/getting_started_with_codeready_studio_tools/
:JBDSGettingStartedBookName: Getting Started with CodeReady Studio Tools
-// Enable Rendering of Glow configuration in plugin examples
-:portedToGlow: true
-
= temperature-converter: Stateless Session EJB (SLSB)
:author: Bruce Wolfe
:level: Beginner
:technologies: CDI, JSF, SLSB EJB
:openshift: true
-:portedToGlow: true
[abstract]
The `temperature-converter` quickstart does temperature conversion using an EJB Stateless Session Bean (SLSB), CDI, and a JSF front-end client.
@@ -619,7 +615,7 @@ For Windows, use the `__{jbossHomeName}__\bin\add-user.bat` script.
endif::[]
The server provisioning functionality is provided by the WildFly Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
-ifndef::portedToGlow[]
+
[source,xml,subs="attributes+"]
----
@@ -652,55 +648,6 @@ ifndef::portedToGlow[]
----
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- provisioned-server
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases/tag[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
[NOTE]
====
@@ -897,14 +844,9 @@ ifdef::ProductRelease,EAPXPRelease[]
The server provisioning functionality is provided by the EAP Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
endif::[]
-<<<<<<< HEAD
-ifndef::ProductRelease,EAPXPRelease[]
-ifndef::portedToGlow[]
-=======
// Render XML Snippet of openshift Maven profile...
ifndef::ProductRelease[]
// ... for WildFly
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -939,68 +881,10 @@ ifndef::ProductRelease[]
----
-<<<<<<< HEAD
-You may note that unlike the `provisioned-server` profile it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- openshift
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
- cloud
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-You may note that unlike the `provisioned-server` profile it uses the cloud context which enables a configuration tuned for OpenShift environment.
-
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
-endif::ProductRelease,EAPXPRelease[]
-
-ifdef::ProductRelease,EAPXPRelease[]
-=======
endif::[]
ifdef::ProductRelease[]
ifndef::EAPXPRelease[]
// ... for EAP
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -1036,9 +920,6 @@ ifndef::EAPXPRelease[]
----
-<<<<<<< HEAD
-You may note that it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-=======
endif::[]
ifdef::EAPXPRelease[]
// ... for EAP XP
@@ -1092,10 +973,8 @@ ifdef::EAPXPRelease[]
====
Previous {productName} releases used the WildFly JAR Maven Plugin to package the quickstart in a Bootable JAR, when deploying it on OpenShift, and while that's still supported it's no longer recommended.
====
->>>>>>> upstream/main
endif::[]
-
:leveloffset: 1
// Getting Started with Helm
:leveloffset: +1
@@ -1201,11 +1080,7 @@ ifndef::useHelmChartDir[]
----
build:
uri: https://github.com/wildfly/quickstart.git
-<<<<<<< HEAD
- ref: 31.x-glow-preview
-=======
ref: main
->>>>>>> upstream/main
contextDir: temperature-converter
deploy:
replicas: 1
diff --git a/template/README.adoc b/template/README.adoc
index 0691c36709..604be9e01a 100644
--- a/template/README.adoc
+++ b/template/README.adoc
@@ -66,7 +66,7 @@ ifndef::ProductRelease,EAPXPRelease[]
:productImageVersion: 31.0
:githubRepoUrl: https://github.com/wildfly/quickstart/
:githubRepoCodeUrl: https://github.com/wildfly/quickstart.git
-:WildFlyQuickStartRepoTag: 31.0.0.Final-glow-preview
+:WildFlyQuickStartRepoTag: 31.0.0.Final
:DocInfoProductName: Red Hat JBoss Enterprise Application Platform
:DocInfoProductNameURL: red_hat_jboss_enterprise_application_platform
:DocInfoProductNumber: 8.0
@@ -196,9 +196,6 @@ endif::[]
:LinkJBDSGettingStarted: https://access.redhat.com/documentation/en-us/red_hat_codeready_studio/{JBDSVersion}/html-single/getting_started_with_codeready_studio_tools/
:JBDSGettingStartedBookName: Getting Started with CodeReady Studio Tools
-// Enable Rendering of Glow configuration in plugin examples
-:portedToGlow: true
-
= How to Structure and Write a Quickstart README.adoc File
== Introduction
diff --git a/thread-racing/README.adoc b/thread-racing/README.adoc
index fd166734db..69848f5643 100644
--- a/thread-racing/README.adoc
+++ b/thread-racing/README.adoc
@@ -66,7 +66,7 @@ ifndef::ProductRelease,EAPXPRelease[]
:productImageVersion: 31.0
:githubRepoUrl: https://github.com/wildfly/quickstart/
:githubRepoCodeUrl: https://github.com/wildfly/quickstart.git
-:WildFlyQuickStartRepoTag: 31.0.0.Final-glow-preview
+:WildFlyQuickStartRepoTag: 31.0.0.Final
:DocInfoProductName: Red Hat JBoss Enterprise Application Platform
:DocInfoProductNameURL: red_hat_jboss_enterprise_application_platform
:DocInfoProductNumber: 8.0
@@ -196,15 +196,11 @@ endif::[]
:LinkJBDSGettingStarted: https://access.redhat.com/documentation/en-us/red_hat_codeready_studio/{JBDSVersion}/html-single/getting_started_with_codeready_studio_tools/
:JBDSGettingStartedBookName: Getting Started with CodeReady Studio Tools
-// Enable Rendering of Glow configuration in plugin examples
-:portedToGlow: true
-
= thread-racing: A Jakarta EE thread racing web application
:author: Eduardo Martins
:level: Beginner
:technologies: Batch, CDI, EE Concurrency, JAX-RS, JMS, JPA, JSON, Web Sockets
:openshift: true
-:portedToGlow: true
[abstract]
A thread racing web application that demonstrates technologies introduced or updated in the latest Jakarta EE specification.
@@ -661,7 +657,7 @@ For Windows, use the `__{jbossHomeName}__\bin\add-user.bat` script.
endif::[]
The server provisioning functionality is provided by the WildFly Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
-ifndef::portedToGlow[]
+
[source,xml,subs="attributes+"]
----
@@ -694,55 +690,6 @@ ifndef::portedToGlow[]
----
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- provisioned-server
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases/tag[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
[NOTE]
====
@@ -939,14 +886,9 @@ ifdef::ProductRelease,EAPXPRelease[]
The server provisioning functionality is provided by the EAP Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
endif::[]
-<<<<<<< HEAD
-ifndef::ProductRelease,EAPXPRelease[]
-ifndef::portedToGlow[]
-=======
// Render XML Snippet of openshift Maven profile...
ifndef::ProductRelease[]
// ... for WildFly
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -981,68 +923,10 @@ ifndef::ProductRelease[]
----
-<<<<<<< HEAD
-You may note that unlike the `provisioned-server` profile it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- openshift
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
- cloud
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-You may note that unlike the `provisioned-server` profile it uses the cloud context which enables a configuration tuned for OpenShift environment.
-
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
-endif::ProductRelease,EAPXPRelease[]
-
-ifdef::ProductRelease,EAPXPRelease[]
-=======
endif::[]
ifdef::ProductRelease[]
ifndef::EAPXPRelease[]
// ... for EAP
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -1078,9 +962,6 @@ ifndef::EAPXPRelease[]
----
-<<<<<<< HEAD
-You may note that it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-=======
endif::[]
ifdef::EAPXPRelease[]
// ... for EAP XP
@@ -1134,10 +1015,8 @@ ifdef::EAPXPRelease[]
====
Previous {productName} releases used the WildFly JAR Maven Plugin to package the quickstart in a Bootable JAR, when deploying it on OpenShift, and while that's still supported it's no longer recommended.
====
->>>>>>> upstream/main
endif::[]
-
:leveloffset: 1
// Getting Started with Helm
:leveloffset: +1
@@ -1243,11 +1122,7 @@ ifndef::useHelmChartDir[]
----
build:
uri: https://github.com/wildfly/quickstart.git
-<<<<<<< HEAD
- ref: 31.x-glow-preview
-=======
ref: main
->>>>>>> upstream/main
contextDir: thread-racing
deploy:
replicas: 1
diff --git a/todo-backend/README.adoc b/todo-backend/README.adoc
index 2aac9669ac..5cae7d8e3b 100644
--- a/todo-backend/README.adoc
+++ b/todo-backend/README.adoc
@@ -66,7 +66,7 @@ ifndef::ProductRelease,EAPXPRelease[]
:productImageVersion: 31.0
:githubRepoUrl: https://github.com/wildfly/quickstart/
:githubRepoCodeUrl: https://github.com/wildfly/quickstart.git
-:WildFlyQuickStartRepoTag: 31.0.0.Final-glow-preview
+:WildFlyQuickStartRepoTag: 31.0.0.Final
:DocInfoProductName: Red Hat JBoss Enterprise Application Platform
:DocInfoProductNameURL: red_hat_jboss_enterprise_application_platform
:DocInfoProductNumber: 8.0
@@ -196,9 +196,6 @@ endif::[]
:LinkJBDSGettingStarted: https://access.redhat.com/documentation/en-us/red_hat_codeready_studio/{JBDSVersion}/html-single/getting_started_with_codeready_studio_tools/
:JBDSGettingStartedBookName: Getting Started with CodeReady Studio Tools
-// Enable Rendering of Glow configuration in plugin examples
-:portedToGlow: true
-
= todo-backend: quickstart for backend deployment on OpenShift
:toc: left
:icons: font
@@ -211,7 +208,6 @@ endif::[]
:archiveType: war
:useHelmChartDir: true
:helm-install-prerequisites: ../todo-backend/helm-install-prerequisites.adoc
-:portedToGlow: true
[abstract]
The `todo-backend` quickstart demonstrates how to implement a backend that exposes a HTTP API with JAX-RS
@@ -619,14 +615,9 @@ ifdef::ProductRelease,EAPXPRelease[]
The server provisioning functionality is provided by the EAP Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
endif::[]
-<<<<<<< HEAD
-ifndef::ProductRelease,EAPXPRelease[]
-ifndef::portedToGlow[]
-=======
// Render XML Snippet of openshift Maven profile...
ifndef::ProductRelease[]
// ... for WildFly
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -661,68 +652,10 @@ ifndef::ProductRelease[]
----
-<<<<<<< HEAD
-You may note that unlike the `provisioned-server` profile it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- openshift
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
- cloud
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-You may note that unlike the `provisioned-server` profile it uses the cloud context which enables a configuration tuned for OpenShift environment.
-
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
-endif::ProductRelease,EAPXPRelease[]
-
-ifdef::ProductRelease,EAPXPRelease[]
-=======
endif::[]
ifdef::ProductRelease[]
ifndef::EAPXPRelease[]
// ... for EAP
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -758,9 +691,6 @@ ifndef::EAPXPRelease[]
----
-<<<<<<< HEAD
-You may note that it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-=======
endif::[]
ifdef::EAPXPRelease[]
// ... for EAP XP
@@ -814,10 +744,8 @@ ifdef::EAPXPRelease[]
====
Previous {productName} releases used the WildFly JAR Maven Plugin to package the quickstart in a Bootable JAR, when deploying it on OpenShift, and while that's still supported it's no longer recommended.
====
->>>>>>> upstream/main
endif::[]
-
:leveloffset: 1
// Getting Started with Helm
:leveloffset: +1
diff --git a/websocket-endpoint/README.adoc b/websocket-endpoint/README.adoc
index 9a711a41c3..9de58cee9d 100644
--- a/websocket-endpoint/README.adoc
+++ b/websocket-endpoint/README.adoc
@@ -66,7 +66,7 @@ ifndef::ProductRelease,EAPXPRelease[]
:productImageVersion: 31.0
:githubRepoUrl: https://github.com/wildfly/quickstart/
:githubRepoCodeUrl: https://github.com/wildfly/quickstart.git
-:WildFlyQuickStartRepoTag: 31.0.0.Final-glow-preview
+:WildFlyQuickStartRepoTag: 31.0.0.Final
:DocInfoProductName: Red Hat JBoss Enterprise Application Platform
:DocInfoProductNameURL: red_hat_jboss_enterprise_application_platform
:DocInfoProductNumber: 8.0
@@ -196,15 +196,11 @@ endif::[]
:LinkJBDSGettingStarted: https://access.redhat.com/documentation/en-us/red_hat_codeready_studio/{JBDSVersion}/html-single/getting_started_with_codeready_studio_tools/
:JBDSGettingStartedBookName: Getting Started with CodeReady Studio Tools
-// Enable Rendering of Glow configuration in plugin examples
-:portedToGlow: true
-
= websocket-endpoint: Web application using WebSockets and JSON-P
:author: Rafael Benevides
:level: Beginner
:technologies: CDI, WebSocket, JSON-P
:openshift: true
-:portedToGlow: true
[abstract]
Shows how to use WebSockets with JSON to broadcast information to all open WebSocket sessions in {productName}.
@@ -617,7 +613,7 @@ For Windows, use the `__{jbossHomeName}__\bin\add-user.bat` script.
endif::[]
The server provisioning functionality is provided by the WildFly Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
-ifndef::portedToGlow[]
+
[source,xml,subs="attributes+"]
----
@@ -650,55 +646,6 @@ ifndef::portedToGlow[]
----
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- provisioned-server
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases/tag[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
[NOTE]
====
@@ -895,14 +842,9 @@ ifdef::ProductRelease,EAPXPRelease[]
The server provisioning functionality is provided by the EAP Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
endif::[]
-<<<<<<< HEAD
-ifndef::ProductRelease,EAPXPRelease[]
-ifndef::portedToGlow[]
-=======
// Render XML Snippet of openshift Maven profile...
ifndef::ProductRelease[]
// ... for WildFly
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -937,68 +879,10 @@ ifndef::ProductRelease[]
----
-<<<<<<< HEAD
-You may note that unlike the `provisioned-server` profile it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- openshift
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
- cloud
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-You may note that unlike the `provisioned-server` profile it uses the cloud context which enables a configuration tuned for OpenShift environment.
-
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
-endif::ProductRelease,EAPXPRelease[]
-
-ifdef::ProductRelease,EAPXPRelease[]
-=======
endif::[]
ifdef::ProductRelease[]
ifndef::EAPXPRelease[]
// ... for EAP
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -1034,9 +918,6 @@ ifndef::EAPXPRelease[]
----
-<<<<<<< HEAD
-You may note that it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-=======
endif::[]
ifdef::EAPXPRelease[]
// ... for EAP XP
@@ -1090,10 +971,8 @@ ifdef::EAPXPRelease[]
====
Previous {productName} releases used the WildFly JAR Maven Plugin to package the quickstart in a Bootable JAR, when deploying it on OpenShift, and while that's still supported it's no longer recommended.
====
->>>>>>> upstream/main
endif::[]
-
:leveloffset: 1
// Getting Started with Helm
:leveloffset: +1
@@ -1199,11 +1078,7 @@ ifndef::useHelmChartDir[]
----
build:
uri: https://github.com/wildfly/quickstart.git
-<<<<<<< HEAD
- ref: 31.x-glow-preview
-=======
ref: main
->>>>>>> upstream/main
contextDir: websocket-endpoint
deploy:
replicas: 2
diff --git a/websocket-hello/README.adoc b/websocket-hello/README.adoc
index 4b00ae3ee9..7fd7b6e9b6 100644
--- a/websocket-hello/README.adoc
+++ b/websocket-hello/README.adoc
@@ -66,7 +66,7 @@ ifndef::ProductRelease,EAPXPRelease[]
:productImageVersion: 31.0
:githubRepoUrl: https://github.com/wildfly/quickstart/
:githubRepoCodeUrl: https://github.com/wildfly/quickstart.git
-:WildFlyQuickStartRepoTag: 31.0.0.Final-glow-preview
+:WildFlyQuickStartRepoTag: 31.0.0.Final
:DocInfoProductName: Red Hat JBoss Enterprise Application Platform
:DocInfoProductNameURL: red_hat_jboss_enterprise_application_platform
:DocInfoProductNumber: 8.0
@@ -196,15 +196,11 @@ endif::[]
:LinkJBDSGettingStarted: https://access.redhat.com/documentation/en-us/red_hat_codeready_studio/{JBDSVersion}/html-single/getting_started_with_codeready_studio_tools/
:JBDSGettingStartedBookName: Getting Started with CodeReady Studio Tools
-// Enable Rendering of Glow configuration in plugin examples
-:portedToGlow: true
-
= websocket-hello: A simple WebSocket application
:author: Sande Gilda, Emmanuel Hugonett
:level: Beginner
:technologies: WebSocket, CDI, JSF
:openshift: true
-:portedToGlow: true
[abstract]
The `websocket-hello` quickstart demonstrates how to create a simple WebSocket application.
@@ -623,7 +619,7 @@ For Windows, use the `__{jbossHomeName}__\bin\add-user.bat` script.
endif::[]
The server provisioning functionality is provided by the WildFly Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
-ifndef::portedToGlow[]
+
[source,xml,subs="attributes+"]
----
@@ -656,55 +652,6 @@ ifndef::portedToGlow[]
----
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- provisioned-server
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases/tag[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
[NOTE]
====
@@ -901,14 +848,9 @@ ifdef::ProductRelease,EAPXPRelease[]
The server provisioning functionality is provided by the EAP Maven Plugin, and you may find its configuration in the quickstart `pom.xml`:
endif::[]
-<<<<<<< HEAD
-ifndef::ProductRelease,EAPXPRelease[]
-ifndef::portedToGlow[]
-=======
// Render XML Snippet of openshift Maven profile...
ifndef::ProductRelease[]
// ... for WildFly
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -943,68 +885,10 @@ ifndef::ProductRelease[]
----
-<<<<<<< HEAD
-You may note that unlike the `provisioned-server` profile it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-endif::portedToGlow[]
-ifdef::portedToGlow[]
-[source,xml,subs="attributes+"]
-----
-
- openshift
-
-
-
- org.wildfly.plugins
- wildfly-maven-plugin
-
-
- ${version.server}
- cloud
-
-
- ROOT.war
- ...
-
-
-
-
- package
-
-
-
-
- ...
-
-
-
-----
-You may note that unlike the `provisioned-server` profile it uses the cloud context which enables a configuration tuned for OpenShift environment.
-
-The plugin uses https://github.com/wildfly/wildfly-glow[WildFly Glow] to discover the feature packs and layers required to run the application, and provisions a server containing those layers.
-
-[NOTE]
-====
-This uses a pre-release of version 5.0.0 of the wildfly-maven-plugin providing the Glow functionality. The version is set in the pom's `pluginManagement` section.
-====
-
-If you get an error or the server is missing some functionality which cannot be auto-discovered, you can download the https://github.com/wildfly/wildfly-glow/releases[WildFly Glow CLI] and run the following command to see more information about what add-ons are available:
-[source,shell]
-----
-wildfly-glow show-add-ons
-----
-endif::portedToGlow[]
-endif::ProductRelease,EAPXPRelease[]
-
-ifdef::ProductRelease,EAPXPRelease[]
-=======
endif::[]
ifdef::ProductRelease[]
ifndef::EAPXPRelease[]
// ... for EAP
->>>>>>> upstream/main
[source,xml,subs="attributes+"]
----
@@ -1040,9 +924,6 @@ ifndef::EAPXPRelease[]
----
-<<<<<<< HEAD
-You may note that it uses the cloud feature pack which enables a configuration tuned for OpenShift environment.
-=======
endif::[]
ifdef::EAPXPRelease[]
// ... for EAP XP
@@ -1096,10 +977,8 @@ ifdef::EAPXPRelease[]
====
Previous {productName} releases used the WildFly JAR Maven Plugin to package the quickstart in a Bootable JAR, when deploying it on OpenShift, and while that's still supported it's no longer recommended.
====
->>>>>>> upstream/main
endif::[]
-
:leveloffset: 1
// Getting Started with Helm
:leveloffset: +1
@@ -1205,11 +1084,7 @@ ifndef::useHelmChartDir[]
----
build:
uri: https://github.com/wildfly/quickstart.git
-<<<<<<< HEAD
- ref: 31.x-glow-preview
-=======
ref: main
->>>>>>> upstream/main
contextDir: websocket-hello
deploy:
replicas: 2