diff --git a/.github/workflows/project_ci.yml b/.github/workflows/project_ci.yml index 1c6a1c9fa0..3594e675c2 100644 --- a/.github/workflows/project_ci.yml +++ b/.github/workflows/project_ci.yml @@ -76,7 +76,7 @@ jobs: - name: Build Quickstarts Release with Server and BOMs Versions run: | cd quickstarts - mvn -U -B -fae clean install -Drelease -Dversion.server.bom=${{ needs.wildfly-build.outputs.wildfly-version }} -Dversion.microprofile.bom=${{ needs.wildfly-build.outputs.wildfly-version }} -Dversion.server.bootable-jar=${{ needs.wildfly-build.outputs.wildfly-version }} -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} + mvn -U -B -fae clean install -Drelease -Dversion.server.bom=${{ needs.wildfly-build.outputs.wildfly-version }} -Dversion.microprofile.bom=${{ needs.wildfly-build.outputs.wildfly-version }} -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} shell: bash - uses: actions/upload-artifact@v4 if: failure() diff --git a/.github/workflows/quickstart_ci.yml b/.github/workflows/quickstart_ci.yml index 5e6db1e158..0fada63be5 100644 --- a/.github/workflows/quickstart_ci.yml +++ b/.github/workflows/quickstart_ci.yml @@ -58,6 +58,10 @@ concurrency: group: '${{ github.workflow }} @ ${{ github.ref || github.run_id }}' cancel-in-progress: true +env: + WILDFLY_SNAPSHOT_EXTRA_PACKAGE_ARGUMENTS: '-Dwildfly-glow-galleon-feature-packs-url=https://raw.githubusercontent.com/wildfly/wildfly-galleon-feature-packs/main/' + WILDFLY_GLOW_SNAPSHOT_REGISTRY: '-Dwildfly-glow-galleon-feature-packs-url=https://raw.githubusercontent.com/wildfly/wildfly-galleon-feature-packs/main/' + jobs: Matrix-Setup: runs-on: ubuntu-latest @@ -103,6 +107,7 @@ jobs: run: | cd quickstarts cd ${{ inputs.QUICKSTART_PATH }} + # Make sure it builds mvn -fae clean package -Drelease shell: bash - name: Build, run & test ${{ inputs.QUICKSTART_PATH }} Quickstart with provisioned-server profile @@ -112,10 +117,12 @@ jobs: cd ${{ inputs.QUICKSTART_PATH }} echo "Building provisioned server..." mvn -fae clean ${{ inputs.MVN_COMMAND }} -Pprovisioned-server - echo "Add quickstartUser..." - ${{ inputs.DEPLOYMENT_DIR }}/target/server/bin/add-user.sh -a -u 'quickstartUser' -p 'quickstartPwd1!' -g 'guest,user,JBossAdmin,Users' - echo "Add quickstartAdmin..." - ${{ inputs.DEPLOYMENT_DIR }}/target/server/bin/add-user.sh -a -u 'quickstartAdmin' -p 'adminPwd1!' -g 'guest,user,admin' + if [ -f ${{ inputs.DEPLOYMENT_DIR }}/target/server/bin/add-user.sh ]; then + echo "Add quickstartUser..." + ${{ inputs.DEPLOYMENT_DIR }}/target/server/bin/add-user.sh -a -u 'quickstartUser' -p 'quickstartPwd1!' -g 'guest,user,JBossAdmin,Users' + echo "Add quickstartAdmin..." + ${{ inputs.DEPLOYMENT_DIR }}/target/server/bin/add-user.sh -a -u 'quickstartAdmin' -p 'adminPwd1!' -g 'guest,user,admin' + fi echo "Starting provisioned server..." mvn -f ${{ inputs.DEPLOYMENT_DIR }}/pom.xml wildfly:start -DjbossHome=${{ inputs.DEPLOYMENT_DIR }}/target/server -Dstartup-timeout=120 ${{ inputs.EXTRA_RUN_ARGS }} echo "Testing provisioned server..." @@ -131,11 +138,11 @@ jobs: echo "Building bootable jar..." mvn -fae clean ${{ inputs.MVN_COMMAND }} -Pbootable-jar echo "Starting bootable jar..." - mvn -f ${{ inputs.DEPLOYMENT_DIR }}/pom.xml wildfly-jar:start -Djar-file-name=${{ inputs.DEPLOYMENT_DIR }}/target/${{ inputs.QUICKSTART_PATH }}-bootable.jar -Dstartup-timeout=120 ${{ inputs.EXTRA_RUN_ARGS }} + mvn -f ${{ inputs.DEPLOYMENT_DIR }}/pom.xml wildfly:start-jar -Dstartup-timeout=120 ${{ inputs.EXTRA_RUN_ARGS }} echo "Testing bootable jar..." mvn -fae verify -Dserver.host=${{ inputs.SERVER_PROVISIONING_SERVER_HOST }} -Pintegration-testing echo "Shutting down bootable jar..." - mvn -f ${{ inputs.DEPLOYMENT_DIR }}/pom.xml wildfly-jar:shutdown + mvn -f ${{ inputs.DEPLOYMENT_DIR }}/pom.xml wildfly:shutdown shell: bash - name: Build ${{ inputs.QUICKSTART_PATH }} Quickstart with openshift profile if: ${{ inputs.TEST_OPENSHIFT }} @@ -208,7 +215,7 @@ jobs: run: | cd quickstarts cd ${{ inputs.QUICKSTART_PATH }} - mvn -fae clean package -Drelease -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} + mvn -fae clean package -Drelease -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} ${{ env.WILDFLY_SNAPSHOT_EXTRA_PACKAGE_ARGUMENTS }} shell: bash - name: Build, run & test ${{ inputs.QUICKSTART_PATH }} Quickstart with provisioned-server profile, and built Server version if: ${{ inputs.TEST_PROVISIONED_SERVER }} @@ -216,11 +223,13 @@ jobs: cd quickstarts cd ${{ inputs.QUICKSTART_PATH }} echo "Building provisioned server..." - mvn -fae clean ${{ inputs.MVN_COMMAND }} -Pprovisioned-server -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} - echo "Add quickstartUser..." - ${{ inputs.DEPLOYMENT_DIR }}/target/server/bin/add-user.sh -a -u 'quickstartUser' -p 'quickstartPwd1!' -g 'guest,user,JBossAdmin,Users' - echo "Add quickstartAdmin..." - ${{ inputs.DEPLOYMENT_DIR }}/target/server/bin/add-user.sh -a -u 'quickstartAdmin' -p 'adminPwd1!' -g 'guest,user,admin' + mvn -fae clean ${{ inputs.MVN_COMMAND }} -Pprovisioned-server -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} ${{ env.WILDFLY_SNAPSHOT_EXTRA_PACKAGE_ARGUMENTS }} ${{ env.WILDFLY_GLOW_SNAPSHOT_REGISTRY }} + if [ -f ${{ inputs.DEPLOYMENT_DIR }}/target/server/bin/add-user.sh ]; then + echo "Add quickstartUser..." + ${{ inputs.DEPLOYMENT_DIR }}/target/server/bin/add-user.sh -a -u 'quickstartUser' -p 'quickstartPwd1!' -g 'guest,user,JBossAdmin,Users' + echo "Add quickstartAdmin..." + ${{ inputs.DEPLOYMENT_DIR }}/target/server/bin/add-user.sh -a -u 'quickstartAdmin' -p 'adminPwd1!' -g 'guest,user,admin' + fi echo "Starting provisioned server..." mvn -f ${{ inputs.DEPLOYMENT_DIR }}/pom.xml wildfly:start -DjbossHome=${{ inputs.DEPLOYMENT_DIR }}/target/server -Dstartup-timeout=120 ${{ inputs.EXTRA_RUN_ARGS }} echo "Testing provisioned server..." @@ -234,20 +243,20 @@ jobs: cd quickstarts cd ${{ inputs.QUICKSTART_PATH }} echo "Building bootable jar..." - mvn -fae clean ${{ inputs.MVN_COMMAND }} -Pbootable-jar -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} + mvn -fae clean ${{ inputs.MVN_COMMAND }} -Pbootable-jar -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} ${{ env.WILDFLY_SNAPSHOT_EXTRA_PACKAGE_ARGUMENTS }} ${{ env.WILDFLY_GLOW_SNAPSHOT_REGISTRY }} echo "Starting bootable jar..." - mvn -f ${{ inputs.DEPLOYMENT_DIR }}/pom.xml wildfly-jar:start -Djar-file-name=${{ inputs.DEPLOYMENT_DIR }}/target/${{ inputs.QUICKSTART_PATH }}-bootable.jar -Dstartup-timeout=120 ${{ inputs.EXTRA_RUN_ARGS }} + mvn -f ${{ inputs.DEPLOYMENT_DIR }}/pom.xml wildfly:start-jar -Dstartup-timeout=120 ${{ inputs.EXTRA_RUN_ARGS }} echo "Testing bootable jar..." mvn -fae verify -Dserver.host=${{ inputs.SERVER_PROVISIONING_SERVER_HOST }} -Pintegration-testing - echo "Shutting down bootable jar..." - mvn -f ${{ inputs.DEPLOYMENT_DIR }}/pom.xml wildfly-jar:shutdown + echo "Shutting down bootable jar..." + mvn -f ${{ inputs.DEPLOYMENT_DIR }}/pom.xml wildfly:shutdown shell: bash - name: Build ${{ inputs.QUICKSTART_PATH }} Quickstart with openshift profile, and built Server version if: ${{ inputs.TEST_OPENSHIFT }} run: | cd quickstarts cd ${{ inputs.QUICKSTART_PATH }} - mvn -fae clean package -Popenshift -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} + mvn -fae clean package -Popenshift -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} ${{ env.WILDFLY_SNAPSHOT_EXTRA_PACKAGE_ARGUMENTS }} ${{ env.WILDFLY_GLOW_SNAPSHOT_REGISTRY }} shell: bash - name: Run after script env: @@ -263,4 +272,5 @@ jobs: if: failure() with: name: surefire-reports-JDK${{ matrix.jdk }}-${{ matrix.os }} - path: 'quickstarts/**/surefire-reports/*.txt' \ No newline at end of file + path: 'quickstarts/**/surefire-reports/*.txt' + diff --git a/.github/workflows/quickstart_ejb-txn-remote-call_ci.yml b/.github/workflows/quickstart_ejb-txn-remote-call_ci.yml index c3165e0082..e0babd25a6 100644 --- a/.github/workflows/quickstart_ejb-txn-remote-call_ci.yml +++ b/.github/workflows/quickstart_ejb-txn-remote-call_ci.yml @@ -20,7 +20,8 @@ env: MATRIX_JDK: '"11", "17"' MATRIX_OS: '"ubuntu-latest"' SERVER_PROVISIONING_SERVER_HOST: 'http://localhost' - + EXTRA_RUN_ARGS: '-DpostgresqlUsername="test" -DpostgresqlPassword="test"' + WILDFLY_SNAPSHOT_EXTRA_PACKAGE_ARGUMENTS: '-Dwildfly-glow-galleon-feature-packs-url=https://raw.githubusercontent.com/wildfly/wildfly-galleon-feature-packs/main/' jobs: Matrix-Setup: runs-on: ubuntu-latest @@ -74,27 +75,27 @@ jobs: cd quickstarts cd ${{ env.QUICKSTART_PATH }}/client echo "Building 'client' provisioned server..." - mvn -fae clean package -Pprovisioned-server -DremoteServerUsername="quickstartUser" -DremoteServerPassword="quickstartPwd1!" -DpostgresqlUsername="test" -DpostgresqlPassword="test" - mvn wildfly:start -Djboss-as.home=target/server -Dwildfly.javaOpts="-Djboss.tx.node.id=server1 -Djboss.node.name=server1" -Dstartup-timeout=120 + mvn -fae clean package -Pprovisioned-server -DremoteServerUsername="quickstartUser" -DremoteServerPassword="quickstartPwd1!" + mvn wildfly:start -Djboss-as.home=target/server -Dwildfly.javaOpts="-Djboss.tx.node.id=server1 -Djboss.node.name=server1" -Dstartup-timeout=120 ${{env.EXTRA_RUN_ARGS}} cd ../server echo "Building 'server' provisioned server..." - mvn -fae clean package -Pprovisioned-server -Dwildfly.provisioning.dir=server2 -Djboss-as.home=target/server2 -DpostgresqlUsername="test" -DpostgresqlPassword="test" - mvn -fae package -Pprovisioned-server -Dwildfly.provisioning.dir=server3 -Djboss-as.home=target/server3 -DpostgresqlUsername="test" -DpostgresqlPassword="test" + mvn -fae clean package -Pprovisioned-server -Dwildfly.provisioning.dir=server2 -Djboss-as.home=target/server2 + mvn -fae package -Pprovisioned-server -Dwildfly.provisioning.dir=server3 -Djboss-as.home=target/server3 echo "Add quickstartUser to both 'server' builds..." - ./target/server2/bin/add-user.sh -a -u 'quickstartUser' -p 'quickstartPwd1!' -g 'guest,user,JBossAdmin,Users' + ./target/server2/bin/add-user.sh -a -u 'quickstartUser' -p 'quickstartPwd1!' -g 'guest,user,JBossAdmin,Users' ./target/server3/bin/add-user.sh -a -u 'quickstartUser' -p 'quickstartPwd1!' -g 'guest,user,JBossAdmin,Users' echo "Add quickstartAdmin to both 'server' builds..." ./target/server2/bin/add-user.sh -a -u 'quickstartAdmin' -p 'adminPwd1!' -g 'guest,user,admin' - ./target/server2/bin/add-user.sh -a -u 'quickstartAdmin' -p 'adminPwd1!' -g 'guest,user,admin' + ./target/server3/bin/add-user.sh -a -u 'quickstartAdmin' -p 'adminPwd1!' -g 'guest,user,admin' echo "Starting provisioned server..." - mvn wildfly:start -Djboss-as.home=target/server2 -Dwildfly.port=10090 -Dwildfly.serverConfig=standalone-ha.xml -Dwildfly.javaOpts="-Djboss.socket.binding.port-offset=100 -Djboss.tx.node.id=server2 -Djboss.node.name=server2" -Dstartup-timeout=120 - mvn wildfly:start -Djboss-as.home=target/server3 -Dwildfly.port=10190 -Dwildfly.serverConfig=standalone-ha.xml -Dwildfly.javaOpts="-Djboss.socket.binding.port-offset=200 -Djboss.tx.node.id=server3 -Djboss.node.name=server3" -Dstartup-timeout=120 + mvn wildfly:start -Djboss-as.home=target/server2 -Dwildfly.port=10090 -Dwildfly.serverConfig=standalone-ha.xml -Dwildfly.javaOpts="-Djboss.socket.binding.port-offset=100 -Djboss.tx.node.id=server2 -Djboss.node.name=server2" -Dstartup-timeout=120 ${{env.EXTRA_RUN_ARGS}} + mvn wildfly:start -Djboss-as.home=target/server3 -Dwildfly.port=10190 -Dwildfly.serverConfig=standalone-ha.xml -Dwildfly.javaOpts="-Djboss.socket.binding.port-offset=200 -Djboss.tx.node.id=server3 -Djboss.node.name=server3" -Dstartup-timeout=120 ${{env.EXTRA_RUN_ARGS}} echo "Testing provisioned server..." cd ../client - mvn -fae verify -Dserver.host=${{ env.SERVER_PROVISIONING_SERVER_HOST }}:8080 -Pintegration-testing + mvn -fae verify -Dserver.host=${{ env.SERVER_PROVISIONING_SERVER_HOST }}:8080/client -Pintegration-testing cd ../server - mvn -fae verify -Dserver.host=${{ env.SERVER_PROVISIONING_SERVER_HOST }}:8180 -Pintegration-testing - mvn -fae verify -Dserver.host=${{ env.SERVER_PROVISIONING_SERVER_HOST }}:8280 -Pintegration-testing + mvn -fae verify -Dserver.host=${{ env.SERVER_PROVISIONING_SERVER_HOST }}:8180/server -Pintegration-testing + mvn -fae verify -Dserver.host=${{ env.SERVER_PROVISIONING_SERVER_HOST }}:8280/server -Pintegration-testing echo "Shutting down provisioned server..." cd ../client mvn wildfly:shutdown @@ -107,9 +108,9 @@ jobs: run: | cd quickstarts cd ${{ env.QUICKSTART_PATH }}/client - mvn -fae clean package -Popenshift -DremoteServerUsername="quickstartUser" -DremoteServerPassword="quickstartPwd1!" -DpostgresqlUsername="test" -DpostgresqlPassword="test" + mvn -fae clean package -Popenshift -DremoteServerUsername="quickstartUser" -DremoteServerPassword="quickstartPwd1!" cd ../server - mvn -fae clean package -Popenshift -DpostgresqlUsername="test" -DpostgresqlPassword="test" + mvn -fae clean package -Popenshift shell: bash - name: Run after script env: @@ -175,7 +176,7 @@ jobs: run: | cd quickstarts cd ${{ env.QUICKSTART_PATH }} - mvn -fae clean package -Drelease -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} + mvn -fae clean package -Drelease -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} ${{ env.WILDFLY_SNAPSHOT_EXTRA_PACKAGE_ARGUMENTS }} shell: bash - name: Build, run & test ${{ env.QUICKSTART_PATH }} Quickstart with provisioned-server profile, and built Server version if: ${{ env.TEST_PROVISIONED_SERVER }} @@ -183,27 +184,27 @@ jobs: cd quickstarts cd ${{ env.QUICKSTART_PATH }}/client echo "Building 'client' provisioned server..." - mvn -fae clean package -Pprovisioned-server -DremoteServerUsername="quickstartUser" -DremoteServerPassword="quickstartPwd1!" -DpostgresqlUsername="test" -DpostgresqlPassword="test" -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} - mvn wildfly:start -Djboss-as.home=target/server -Dwildfly.javaOpts="-Djboss.tx.node.id=server1 -Djboss.node.name=server1" -Dstartup-timeout=120 + mvn -fae clean package -Pprovisioned-server -DremoteServerUsername="quickstartUser" -DremoteServerPassword="quickstartPwd1!" -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} ${{ env.WILDFLY_SNAPSHOT_EXTRA_PACKAGE_ARGUMENTS }} + mvn wildfly:start -Djboss-as.home=target/server -Dwildfly.javaOpts="-Djboss.tx.node.id=server1 -Djboss.node.name=server1" -Dstartup-timeout=120 ${{env.EXTRA_RUN_ARGS}} cd ../server echo "Building 'server' provisioned server..." - mvn -fae clean package -Pprovisioned-server -Dwildfly.provisioning.dir=server2 -Djboss-as.home=target/server2 -DpostgresqlUsername="test" -DpostgresqlPassword="test" -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} - mvn -fae package -Pprovisioned-server -Dwildfly.provisioning.dir=server3 -Djboss-as.home=target/server3 -DpostgresqlUsername="test" -DpostgresqlPassword="test" -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} + mvn -fae clean package -Pprovisioned-server -Dwildfly.provisioning.dir=server2 -Djboss-as.home=target/server2 -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} ${{ env.WILDFLY_SNAPSHOT_EXTRA_PACKAGE_ARGUMENTS }} + mvn -fae package -Pprovisioned-server -Dwildfly.provisioning.dir=server3 -Djboss-as.home=target/server3 -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} ${{ env.WILDFLY_SNAPSHOT_EXTRA_PACKAGE_ARGUMENTS }} echo "Add quickstartUser to both 'server' builds..." ./target/server2/bin/add-user.sh -a -u 'quickstartUser' -p 'quickstartPwd1!' -g 'guest,user,JBossAdmin,Users' ./target/server3/bin/add-user.sh -a -u 'quickstartUser' -p 'quickstartPwd1!' -g 'guest,user,JBossAdmin,Users' echo "Add quickstartAdmin to both 'server' builds..." ./target/server2/bin/add-user.sh -a -u 'quickstartAdmin' -p 'adminPwd1!' -g 'guest,user,admin' - ./target/server2/bin/add-user.sh -a -u 'quickstartAdmin' -p 'adminPwd1!' -g 'guest,user,admin' + ./target/server3/bin/add-user.sh -a -u 'quickstartAdmin' -p 'adminPwd1!' -g 'guest,user,admin' echo "Starting provisioned server..." - mvn wildfly:start -Djboss-as.home=target/server2 -Dwildfly.port=10090 -Dwildfly.serverConfig=standalone-ha.xml -Dwildfly.javaOpts="-Djboss.socket.binding.port-offset=100 -Djboss.tx.node.id=server2 -Djboss.node.name=server2" -Dstartup-timeout=120 - mvn wildfly:start -Djboss-as.home=target/server3 -Dwildfly.port=10190 -Dwildfly.serverConfig=standalone-ha.xml -Dwildfly.javaOpts="-Djboss.socket.binding.port-offset=200 -Djboss.tx.node.id=server3 -Djboss.node.name=server3" -Dstartup-timeout=120 + mvn wildfly:start -Djboss-as.home=target/server2 -Dwildfly.port=10090 -Dwildfly.serverConfig=standalone-ha.xml -Dwildfly.javaOpts="-Djboss.socket.binding.port-offset=100 -Djboss.tx.node.id=server2 -Djboss.node.name=server2" -Dstartup-timeout=120 ${{env.EXTRA_RUN_ARGS}} + mvn wildfly:start -Djboss-as.home=target/server3 -Dwildfly.port=10190 -Dwildfly.serverConfig=standalone-ha.xml -Dwildfly.javaOpts="-Djboss.socket.binding.port-offset=200 -Djboss.tx.node.id=server3 -Djboss.node.name=server3" -Dstartup-timeout=120 ${{env.EXTRA_RUN_ARGS}} echo "Testing provisioned server..." cd ../client - mvn -fae verify -Dserver.host=${{ env.SERVER_PROVISIONING_SERVER_HOST }}:8080 -Pintegration-testing + mvn -fae verify -Dserver.host=${{ env.SERVER_PROVISIONING_SERVER_HOST }}:8080/client -Pintegration-testing cd ../server - mvn -fae verify -Dserver.host=${{ env.SERVER_PROVISIONING_SERVER_HOST }}:8180 -Pintegration-testing - mvn -fae verify -Dserver.host=${{ env.SERVER_PROVISIONING_SERVER_HOST }}:8280 -Pintegration-testing + mvn -fae verify -Dserver.host=${{ env.SERVER_PROVISIONING_SERVER_HOST }}:8180/server -Pintegration-testing + mvn -fae verify -Dserver.host=${{ env.SERVER_PROVISIONING_SERVER_HOST }}:8280/server -Pintegration-testing echo "Shutting down provisioned server..." cd ../client mvn wildfly:shutdown @@ -216,9 +217,9 @@ jobs: run: | cd quickstarts cd ${{ env.QUICKSTART_PATH }}/client - mvn -fae clean package -Popenshift -DremoteServerUsername="quickstartUser" -DremoteServerPassword="quickstartPwd1!" -DpostgresqlUsername="test" -DpostgresqlPassword="test" -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} + mvn -fae clean package -Popenshift -DremoteServerUsername="quickstartUser" -DremoteServerPassword="quickstartPwd1!" -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} ${{ env.WILDFLY_SNAPSHOT_EXTRA_PACKAGE_ARGUMENTS }} cd ../server - mvn -fae clean package -Popenshift -DpostgresqlUsername="test" -DpostgresqlPassword="test" -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} + mvn -fae clean package -Popenshift -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} ${{ env.WILDFLY_SNAPSHOT_EXTRA_PACKAGE_ARGUMENTS }} shell: bash - name: Run after script env: diff --git a/batch-processing/pom.xml b/batch-processing/pom.xml index de8e7266b2..3f98042c85 100644 --- a/batch-processing/pom.xml +++ b/batch-processing/pom.xml @@ -48,7 +48,6 @@ 32.0.0.Final ${version.server} - 7.0.0.Final 5.0.0.Final @@ -255,19 +254,16 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - - - batch-jberet - cloud-server - h2-default-datasource - jsf - - + + ${version.server} + + h2-database:default + + + ROOT.war @@ -289,20 +285,17 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} - - - - batch-jberet - cloud-server - h2-default-datasource - jsf - + + ${version.server} + cloud + + h2-database:default + + + ROOT.war diff --git a/bmt/pom.xml b/bmt/pom.xml index 48d0d37d7c..e519a229d9 100644 --- a/bmt/pom.xml +++ b/bmt/pom.xml @@ -48,7 +48,6 @@ 32.0.0.Final ${version.server} - 7.0.0.Final 5.0.0.Final @@ -195,18 +194,17 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - - cloud-server - ejb - jsf - embedded-activemq - h2-default-datasource - + + ${version.server} + + embedded-activemq + h2-database:default + + + ROOT.war @@ -228,21 +226,18 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} - - - - cloud-server - ejb - jsf - embedded-activemq - h2-default-datasource - + + ${version.server} + cloud + + embedded-activemq + h2-database:default + + + ROOT.war diff --git a/cmt/README-source.adoc b/cmt/README-source.adoc index 508f2c51d2..06c954fe75 100644 --- a/cmt/README-source.adoc +++ b/cmt/README-source.adoc @@ -5,6 +5,7 @@ include::../shared-doc/attributes.adoc[] :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. diff --git a/cmt/pom.xml b/cmt/pom.xml index a7b8083275..3a209353bc 100644 --- a/cmt/pom.xml +++ b/cmt/pom.xml @@ -47,7 +47,6 @@ 32.0.0.Final ${version.server} - 7.0.0.Final 5.0.0.Final @@ -199,18 +198,17 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - - cloud-server - ejb - jsf - embedded-activemq - h2-default-datasource - + + ${version.server} + + embedded-activemq + h2-database:default + + + ROOT.war @@ -232,21 +230,18 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} - - - - cloud-server - ejb - jsf - embedded-activemq - h2-default-datasource - + + ${version.server} + cloud + + embedded-activemq + h2-database:default + + + ROOT.war diff --git a/ee-security/pom.xml b/ee-security/pom.xml index 05e12bd406..d02d6be455 100644 --- a/ee-security/pom.xml +++ b/ee-security/pom.xml @@ -48,7 +48,6 @@ 32.0.0.Final ${version.server} - 7.0.0.Final 5.0.0.Final @@ -179,16 +178,13 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - - - cloud-server - - + + ${version.server} + + ROOT.war @@ -219,17 +215,14 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} - - - - cloud-server - + + ${version.server} + cloud + + ROOT.war diff --git a/ejb-remote/README-source.adoc b/ejb-remote/README-source.adoc index 88050aa579..40c45d529b 100644 --- a/ejb-remote/README-source.adoc +++ b/ejb-remote/README-source.adoc @@ -5,6 +5,7 @@ include::../shared-doc/attributes.adoc[] :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. diff --git a/ejb-remote/pom.xml b/ejb-remote/pom.xml index b2ec1e3cbd..ef17e3b3aa 100644 --- a/ejb-remote/pom.xml +++ b/ejb-remote/pom.xml @@ -47,7 +47,6 @@ 32.0.0.Final ${version.server} - 7.0.0.Final 5.0.0.Final @@ -168,17 +167,16 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - - - cloud-server - ejb - - + + ${version.server} + + wildfly-cli + + + ROOT.war @@ -200,18 +198,17 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} - - - - cloud-server - ejb - + + ${version.server} + + wildfly-cli + + cloud + + ROOT.war diff --git a/ejb-security-context-propagation/README-source.adoc b/ejb-security-context-propagation/README-source.adoc index edc9e6430a..5c3f2376b0 100644 --- a/ejb-security-context-propagation/README-source.adoc +++ b/ejb-security-context-propagation/README-source.adoc @@ -4,6 +4,7 @@ include::../shared-doc/attributes.adoc[] :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 diff --git a/ejb-security-context-propagation/pom.xml b/ejb-security-context-propagation/pom.xml index aa3744221c..854ae52fcd 100644 --- a/ejb-security-context-propagation/pom.xml +++ b/ejb-security-context-propagation/pom.xml @@ -47,7 +47,6 @@ 32.0.0.Final ${version.server} - 7.0.0.Final 5.0.0.Final @@ -191,16 +190,16 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - - - cloud-server - ejb - + + ${version.server} + + wildfly-cli + + + + * + + @@ -211,7 +210,10 @@ false - + ROOT.war diff --git a/ejb-security-programmatic-auth/README-source.adoc b/ejb-security-programmatic-auth/README-source.adoc index 2a7adda5b5..f85ce9729a 100644 --- a/ejb-security-programmatic-auth/README-source.adoc +++ b/ejb-security-programmatic-auth/README-source.adoc @@ -4,6 +4,7 @@ include::../shared-doc/attributes.adoc[] :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. diff --git a/ejb-security-programmatic-auth/pom.xml b/ejb-security-programmatic-auth/pom.xml index 15d6d0b437..d22d5c86f6 100644 --- a/ejb-security-programmatic-auth/pom.xml +++ b/ejb-security-programmatic-auth/pom.xml @@ -47,7 +47,6 @@ 32.0.0.Final ${version.server} - 7.0.0.Final 5.0.0.Final @@ -215,16 +214,21 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - - - cloud-server - ejb - + + ${version.server} + + false + + + * + + + wildfly-cli + + @@ -234,7 +238,10 @@ false - + ROOT.war diff --git a/ejb-throws-exception/README-source.adoc b/ejb-throws-exception/README-source.adoc index 8843eae81c..bd6a60b36c 100644 --- a/ejb-throws-exception/README-source.adoc +++ b/ejb-throws-exception/README-source.adoc @@ -5,6 +5,7 @@ include::../shared-doc/attributes.adoc[] :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. diff --git a/ejb-throws-exception/ear/pom.xml b/ejb-throws-exception/ear/pom.xml index 5aefd41d55..7713b90a76 100644 --- a/ejb-throws-exception/ear/pom.xml +++ b/ejb-throws-exception/ear/pom.xml @@ -94,17 +94,9 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - - - cloud-server - ejb - jsf - + + ${version.server} + ROOT.ear diff --git a/ejb-throws-exception/pom.xml b/ejb-throws-exception/pom.xml index e3a8372eda..a796285741 100644 --- a/ejb-throws-exception/pom.xml +++ b/ejb-throws-exception/pom.xml @@ -54,7 +54,6 @@ 32.0.0.Final ${version.server} - 7.0.0.Final 5.0.0.Final diff --git a/ejb-timer/README-source.adoc b/ejb-timer/README-source.adoc index 58783bdbc7..14946c6e32 100644 --- a/ejb-timer/README-source.adoc +++ b/ejb-timer/README-source.adoc @@ -5,6 +5,7 @@ include::../shared-doc/attributes.adoc[] :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}. diff --git a/ejb-timer/pom.xml b/ejb-timer/pom.xml index dfb590ccab..b1847cb722 100644 --- a/ejb-timer/pom.xml +++ b/ejb-timer/pom.xml @@ -46,7 +46,6 @@ 32.0.0.Final ${version.server} - 7.0.0.Final 5.0.0.Final @@ -180,17 +179,13 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - - - cloud-server - ejb - - + + ${version.server} + + ROOT.war @@ -212,18 +207,14 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} - - - - cloud-server - ejb - + + ${version.server} + cloud + + ROOT.war diff --git a/ejb-txn-remote-call/README-source.adoc b/ejb-txn-remote-call/README-source.adoc index 289c17ac0b..c9cb08b1a3 100644 --- a/ejb-txn-remote-call/README-source.adoc +++ b/ejb-txn-remote-call/README-source.adoc @@ -5,6 +5,7 @@ include::../shared-doc/attributes.adoc[] :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/ejb-txn-remote-call/charts/client.yaml b/ejb-txn-remote-call/charts/client.yaml index b505fc64db..7d2a2ddeae 100644 --- a/ejb-txn-remote-call/charts/client.yaml +++ b/ejb-txn-remote-call/charts/client.yaml @@ -4,7 +4,7 @@ build: contextDir: ejb-txn-remote-call/client env: - name: MAVEN_ARGS_APPEND - value: "-DremoteServerUsername=quickstartUser -DremoteServerPassword=quickstartPwd1! -DpostgresqlUsername=test -DpostgresqlPassword=test" + value: "-DremoteServerUsername=quickstartUser -DremoteServerPassword=quickstartPwd1!" deploy: enabled: false diff --git a/ejb-txn-remote-call/charts/server.yaml b/ejb-txn-remote-call/charts/server.yaml index 63ae0715be..3873e45900 100644 --- a/ejb-txn-remote-call/charts/server.yaml +++ b/ejb-txn-remote-call/charts/server.yaml @@ -2,9 +2,6 @@ build: uri: https://github.com/wildfly/quickstart.git ref: main contextDir: ejb-txn-remote-call/server - env: - - name: MAVEN_ARGS_APPEND - value: "-DpostgresqlUsername=test -DpostgresqlPassword=test" deploy: enabled: false diff --git a/ejb-txn-remote-call/client/client-cr.yaml b/ejb-txn-remote-call/client/client-cr.yaml index b5f2882323..f3cf259f26 100644 --- a/ejb-txn-remote-call/client/client-cr.yaml +++ b/ejb-txn-remote-call/client/client-cr.yaml @@ -3,5 +3,14 @@ kind: WildFlyServer metadata: name: client spec: + env: + - name: POSTGRESQL_DATABASE + value: test + - name: POSTGRESQL_JNDI + value: "java:jboss/datasources/ejbJtaDs" + - name: POSTGRESQL_PASSWORD + value: test + - name: POSTGRESQL_USER + value: test applicationImage: "client:latest" replicas: 1 \ No newline at end of file diff --git a/ejb-txn-remote-call/client/pom.xml b/ejb-txn-remote-call/client/pom.xml index 0fe05d3fb7..195c2243c7 100644 --- a/ejb-txn-remote-call/client/pom.xml +++ b/ejb-txn-remote-call/client/pom.xml @@ -28,6 +28,7 @@ 8 + ejb-txn-remote-call-client 33.0.0.Beta1-SNAPSHOT @@ -42,8 +43,6 @@ ${version.server} 5.0.0.Final 42.7.0 - 7.0.0.Final - 8.0.0.Final @@ -165,12 +164,14 @@ jakarta.jms jakarta.jms-api + provided org.postgresql postgresql ${version.postgresql} + provided @@ -214,6 +215,13 @@ client.war standalone.xml + + + test + java:jboss/datasources/ejbJtaDs + ${postgresqlUsername} + ${postgresqlPassword} + @@ -223,23 +231,14 @@ package - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - org.wildfly:wildfly-datasources-galleon-pack:${version.wildfly-datasources-galleon-pack} - - - - ee-core-profile-server - jaxrs - ejb - jpa - core-tools - - postgresql-driver - + + ${version.server} + + false + + postgresql + + @@ -253,7 +252,6 @@ target/server - scripts/cli.local.properties @@ -261,8 +259,6 @@ ${remoteServerUsername} ${remoteServerPassword} - ${postgresqlUsername} - ${postgresqlPassword} @@ -290,26 +286,15 @@ package - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - org.wildfly:wildfly-datasources-galleon-pack:${version.wildfly-datasources-galleon-pack} - - - org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.wildfly-cloud-galleon-pack} - - - - cloud-server - jaxrs - ejb - jpa - core-tools - - postgresql-driver - + + ${version.server} + + false + cloud + + postgresql + + @@ -323,7 +308,6 @@ target/server - scripts/cli.openshift.properties @@ -331,8 +315,6 @@ ${remoteServerUsername} ${remoteServerPassword} - ${postgresqlUsername} - ${postgresqlPassword} @@ -366,4 +348,4 @@ - + \ No newline at end of file diff --git a/ejb-txn-remote-call/client/src/test/java/org/jboss/as/quickstarts/ejb/BasicRuntimeIT.java b/ejb-txn-remote-call/client/src/test/java/org/jboss/as/quickstarts/ejb/BasicRuntimeIT.java index ab3810eba5..c812c147a6 100644 --- a/ejb-txn-remote-call/client/src/test/java/org/jboss/as/quickstarts/ejb/BasicRuntimeIT.java +++ b/ejb-txn-remote-call/client/src/test/java/org/jboss/as/quickstarts/ejb/BasicRuntimeIT.java @@ -34,8 +34,7 @@ */ public class BasicRuntimeIT { - private static final String DEFAULT_SERVER_HOST = "http://localhost:8080/"; - private static final String DEFAULT_APPLICATION = "/client"; + private static final String DEFAULT_SERVER_HOST = "http://localhost:8080/client"; @Test public void testHTTPEndpointIsAvailable() throws IOException, InterruptedException, URISyntaxException { @@ -46,17 +45,17 @@ public void testHTTPEndpointIsAvailable() throws IOException, InterruptedExcepti if (serverHost == null) { serverHost = DEFAULT_SERVER_HOST; } - testEndpoint(serverHost, DEFAULT_APPLICATION,"/remote-outbound-stateless",200); - testEndpoint(serverHost, DEFAULT_APPLICATION,"/remote-outbound-notx-stateless",200); - testEndpoint(serverHost, DEFAULT_APPLICATION,"/direct-stateless",200); - testEndpoint(serverHost, DEFAULT_APPLICATION,"/direct-stateless-http",200); - testEndpoint(serverHost, DEFAULT_APPLICATION,"/remote-outbound-notx-stateful",200); - testEndpoint(serverHost, DEFAULT_APPLICATION,"/remote-outbound-fail-stateless",200); + testEndpoint(serverHost, "/remote-outbound-stateless",200); + testEndpoint(serverHost, "/remote-outbound-notx-stateless",200); + testEndpoint(serverHost, "/direct-stateless",200); + testEndpoint(serverHost, "/direct-stateless-http",200); + testEndpoint(serverHost, "/remote-outbound-notx-stateful",200); + testEndpoint(serverHost, "/remote-outbound-fail-stateless",200); } - private void testEndpoint(String serverHost, String application, String endpoint, int expectedCode) throws URISyntaxException, IOException, InterruptedException { + private void testEndpoint(String serverHost, String endpoint, int expectedCode) throws URISyntaxException, IOException, InterruptedException { final HttpRequest request = HttpRequest.newBuilder() - .uri(new URI(serverHost + application + endpoint)) + .uri(new URI(serverHost + endpoint)) .GET() .build(); final HttpClient client = HttpClient.newBuilder() diff --git a/ejb-txn-remote-call/pom.xml b/ejb-txn-remote-call/pom.xml index e08c451a2f..9cddad5212 100644 --- a/ejb-txn-remote-call/pom.xml +++ b/ejb-txn-remote-call/pom.xml @@ -28,7 +28,7 @@ 8 - + ejb-txn-remote-call 33.0.0.Beta1-SNAPSHOT pom diff --git a/ejb-txn-remote-call/server/pom.xml b/ejb-txn-remote-call/server/pom.xml index d182646f22..e07bf91916 100644 --- a/ejb-txn-remote-call/server/pom.xml +++ b/ejb-txn-remote-call/server/pom.xml @@ -28,6 +28,7 @@ 8 + ejb-txn-remote-call-server 33.0.0.Beta1-SNAPSHOT @@ -42,8 +43,6 @@ ${version.server} 7.0.0.Final 5.0.0.Final - 7.0.0.Final - 8.0.0.Final @@ -202,6 +201,13 @@ server.war standalone-ha.xml + + + test + java:jboss/datasources/ejbJtaDs + ${postgresqlUsername} + ${postgresqlPassword} + @@ -211,50 +217,20 @@ package - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - org.wildfly:wildfly-datasources-galleon-pack:${version.wildfly-datasources-galleon-pack} - - - - ee-core-profile-server - jaxrs - ejb - ejb-dist-cache - jpa-distributed - core-tools - - postgresql-driver - - - ejb-local-cache - + true + + ${version.server} + + postgresql + wildfly-cli + + + false + ha + standalone-ha.xml - - run-script - package - - execute-commands - - - true - - - - - scripts/cli.local.properties - - - ${postgresqlUsername} - ${postgresqlPassword} - - - @@ -278,51 +254,16 @@ package - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - org.wildfly:wildfly-datasources-galleon-pack:${version.wildfly-datasources-galleon-pack} - - - org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.wildfly-cloud-galleon-pack} - - - - ee-core-profile-server - jaxrs - ejb - ejb-dist-cache - jpa-distributed - core-tools - - postgresql-driver - - - ejb-local-cache - - - - - run-script - package - - execute-commands - - - true - target/server - - - - - scripts/cli.openshift.properties - - - ${postgresqlUsername} - ${postgresqlPassword} - + + ${version.server} + + postgresql + + cloud + + false + ha + diff --git a/ejb-txn-remote-call/server/server-cr.yaml b/ejb-txn-remote-call/server/server-cr.yaml index 119c26e0a0..d7b82b20a0 100644 --- a/ejb-txn-remote-call/server/server-cr.yaml +++ b/ejb-txn-remote-call/server/server-cr.yaml @@ -3,5 +3,14 @@ kind: WildFlyServer metadata: name: server spec: + env: + - name: POSTGRESQL_DATABASE + value: test + - name: POSTGRESQL_JNDI + value: "java:jboss/datasources/ejbJtaDs" + - name: POSTGRESQL_PASSWORD + value: test + - name: POSTGRESQL_USER + value: test applicationImage: "server:latest" replicas: 2 \ No newline at end of file diff --git a/ejb-txn-remote-call/server/src/test/java/org/jboss/as/quickstarts/ejb/BasicRuntimeIT.java b/ejb-txn-remote-call/server/src/test/java/org/jboss/as/quickstarts/ejb/BasicRuntimeIT.java index 3d5d731fb5..a89b0f713f 100644 --- a/ejb-txn-remote-call/server/src/test/java/org/jboss/as/quickstarts/ejb/BasicRuntimeIT.java +++ b/ejb-txn-remote-call/server/src/test/java/org/jboss/as/quickstarts/ejb/BasicRuntimeIT.java @@ -35,7 +35,6 @@ public class BasicRuntimeIT { private static final String DEFAULT_SERVER_HOST = "http://localhost:8180/server"; - private static final String DEFAULT_APPLICATION = "/server"; @Test public void testHTTPEndpointIsAvailable() throws IOException, InterruptedException, URISyntaxException { @@ -46,12 +45,12 @@ public void testHTTPEndpointIsAvailable() throws IOException, InterruptedExcepti if (serverHost == null) { serverHost = DEFAULT_SERVER_HOST; } - testEndpoint(serverHost, DEFAULT_APPLICATION,"/commits",200); + testEndpoint(serverHost, "/commits",200); } - private void testEndpoint(String serverHost, String application, String endpoint, int expectedCode) throws URISyntaxException, IOException, InterruptedException { + private void testEndpoint(String serverHost, String endpoint, int expectedCode) throws URISyntaxException, IOException, InterruptedException { final HttpRequest request = HttpRequest.newBuilder() - .uri(new URI(serverHost + application + endpoint)) + .uri(new URI(serverHost + endpoint)) .GET() .build(); final HttpClient client = HttpClient.newBuilder() diff --git a/helloworld-jms/README-source.adoc b/helloworld-jms/README-source.adoc index ba96f23360..79dbfb37d9 100644 --- a/helloworld-jms/README-source.adoc +++ b/helloworld-jms/README-source.adoc @@ -4,6 +4,7 @@ include::../shared-doc/attributes.adoc[] :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-jms/pom.xml b/helloworld-jms/pom.xml index 87531829c7..9cb2d4abc7 100644 --- a/helloworld-jms/pom.xml +++ b/helloworld-jms/pom.xml @@ -47,7 +47,6 @@ 32.0.0.Final ${version.server} - 7.0.0.Final 5.0.0.Final 5.10.0 @@ -166,16 +165,17 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - - cloud-server - ejb - embedded-activemq - + + ${version.server} + + embedded-activemq + wildfly-cli + + + ROOT.war @@ -206,19 +206,17 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} - - - - cloud-server - ejb - embedded-activemq - + + ${version.server} + cloud + + embedded-activemq + + + ROOT.war diff --git a/helloworld-mdb/README-source.adoc b/helloworld-mdb/README-source.adoc index 32d9690b9c..64ea3624de 100644 --- a/helloworld-mdb/README-source.adoc +++ b/helloworld-mdb/README-source.adoc @@ -5,6 +5,7 @@ include::../shared-doc/attributes.adoc[] :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}. diff --git a/helloworld-mdb/pom.xml b/helloworld-mdb/pom.xml index 2e07989d76..8e6731142f 100644 --- a/helloworld-mdb/pom.xml +++ b/helloworld-mdb/pom.xml @@ -48,7 +48,6 @@ 32.0.0.Final ${version.server} - 7.0.0.Final 5.0.0.Final 5.10.0 @@ -183,16 +182,16 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - - cloud-server - ejb - embedded-activemq - + + ${version.server} + + embedded-activemq + + + ROOT.war @@ -214,19 +213,17 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} - - - - cloud-server - ejb - embedded-activemq - + + ${version.server} + cloud + + embedded-activemq + + + ROOT.war diff --git a/helloworld-singleton/README-source.adoc b/helloworld-singleton/README-source.adoc index 2e1bbfaeb0..0cf299d32f 100644 --- a/helloworld-singleton/README-source.adoc +++ b/helloworld-singleton/README-source.adoc @@ -5,6 +5,7 @@ include::../shared-doc/attributes.adoc[] :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. diff --git a/helloworld-singleton/pom.xml b/helloworld-singleton/pom.xml index 18000d27a9..a36a82b8e6 100644 --- a/helloworld-singleton/pom.xml +++ b/helloworld-singleton/pom.xml @@ -48,7 +48,6 @@ 32.0.0.Final ${version.server} - 7.0.0.Final 5.0.0.Final 5.9.1 @@ -167,16 +166,9 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - - cloud-server - ejb - jsf - + + ${version.server} + ROOT.war @@ -198,19 +190,10 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} - - - - cloud-server - ejb - jsf - + + ${version.server} + cloud + ROOT.war diff --git a/helloworld-ws/README-source.adoc b/helloworld-ws/README-source.adoc index 541e80271c..bb3037832c 100644 --- a/helloworld-ws/README-source.adoc +++ b/helloworld-ws/README-source.adoc @@ -5,6 +5,7 @@ include::../shared-doc/attributes.adoc[] :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. diff --git a/helloworld-ws/pom.xml b/helloworld-ws/pom.xml index bb51c0c534..ea04979f6b 100644 --- a/helloworld-ws/pom.xml +++ b/helloworld-ws/pom.xml @@ -47,7 +47,6 @@ 32.0.0.Final ${version.server} - 7.0.0.Final 5.0.0.Final @@ -186,15 +185,13 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - - cloud-server - webservices - + + ${version.server} + + ROOT.war @@ -217,18 +214,14 @@ wildfly-maven-plugin ${version.plugin.wildfly} - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} - - - - cloud-server - webservices - + + ${version.server} + cloud + + ROOT.war diff --git a/helloworld/README-source.adoc b/helloworld/README-source.adoc index 3ee136f9bd..8e8e2efe2b 100644 --- a/helloworld/README-source.adoc +++ b/helloworld/README-source.adoc @@ -5,6 +5,7 @@ include::../shared-doc/attributes.adoc[] :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. diff --git a/helloworld/pom.xml b/helloworld/pom.xml index 3cc7532722..90ff789023 100644 --- a/helloworld/pom.xml +++ b/helloworld/pom.xml @@ -47,7 +47,6 @@ 32.0.0.Final ${version.server} - 7.0.0.Final 5.0.0.Final @@ -156,16 +155,13 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - - - cloud-server - - + + ${version.server} + + ROOT.war @@ -187,17 +183,14 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} - - - - cloud-server - + + ${version.server} + cloud + + ROOT.war diff --git a/hibernate/README-source.adoc b/hibernate/README-source.adoc index e6c9fe1fc2..6cd4095312 100644 --- a/hibernate/README-source.adoc +++ b/hibernate/README-source.adoc @@ -5,6 +5,7 @@ include::../shared-doc/attributes.adoc[] :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. diff --git a/hibernate/pom.xml b/hibernate/pom.xml index ad8fdb4c47..b3e3de1ec5 100644 --- a/hibernate/pom.xml +++ b/hibernate/pom.xml @@ -48,8 +48,6 @@ 32.0.0.Final ${version.server} - 7.0.0.Final - 8.0.0.Final 5.0.0.Final 5.9.1 @@ -221,19 +219,18 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - org.wildfly:wildfly-datasources-galleon-pack:${version.pack.datasources} - - - - cloud-server - h2-datasource - jsf - + + ${version.server} + + false + + h2-database + + + ROOT.war @@ -264,22 +261,19 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} - - - org.wildfly:wildfly-datasources-galleon-pack:${version.pack.datasources} - - - - cloud-server - h2-datasource - jsf - + + ${version.server} + cloud + + false + + h2-database + + + ROOT.war diff --git a/http-custom-mechanism/README-source.adoc b/http-custom-mechanism/README-source.adoc index 0544977175..7e5fd2b0cd 100644 --- a/http-custom-mechanism/README-source.adoc +++ b/http-custom-mechanism/README-source.adoc @@ -4,6 +4,7 @@ include::../shared-doc/attributes.adoc[] :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. diff --git a/http-custom-mechanism/pom.xml b/http-custom-mechanism/pom.xml index 7928583251..643627fbff 100644 --- a/http-custom-mechanism/pom.xml +++ b/http-custom-mechanism/pom.xml @@ -53,7 +53,6 @@ 32.0.0.Final ${version.server} - 7.0.0.Final 5.0.0.Final diff --git a/http-custom-mechanism/webapp/pom.xml b/http-custom-mechanism/webapp/pom.xml index 179a47bb83..e3684c0c08 100644 --- a/http-custom-mechanism/webapp/pom.xml +++ b/http-custom-mechanism/webapp/pom.xml @@ -71,16 +71,16 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - - - cloud-server - - + + ${version.server} + + wildfly-cli + + + ROOT.war diff --git a/jaxrs-client/README-source.adoc b/jaxrs-client/README-source.adoc index cc5bf16906..1bbdbbe7cb 100644 --- a/jaxrs-client/README-source.adoc +++ b/jaxrs-client/README-source.adoc @@ -5,6 +5,7 @@ include::../shared-doc/attributes.adoc[] :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}. diff --git a/jaxrs-client/pom.xml b/jaxrs-client/pom.xml index 43a85e99e1..4010ea0c9a 100644 --- a/jaxrs-client/pom.xml +++ b/jaxrs-client/pom.xml @@ -48,7 +48,6 @@ 32.0.0.Final ${version.server} - 7.0.0.Final 5.0.0.Final 9.37.1 @@ -141,14 +140,6 @@ ${version.plugin.wildfly} ${jboss.home} - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - - jaxrs-server - @@ -170,12 +161,14 @@ org.wildfly.plugins wildfly-maven-plugin - + ROOT.war - - jaxrs-server - cloud-server - + + ${version.server} + @@ -196,12 +189,15 @@ org.wildfly.plugins wildfly-maven-plugin - + ROOT.war - - jaxrs-server - cloud-server - + + ${version.server} + cloud + diff --git a/jaxrs-jwt/README-source.adoc b/jaxrs-jwt/README-source.adoc index d543ddfc46..21b74b2f39 100644 --- a/jaxrs-jwt/README-source.adoc +++ b/jaxrs-jwt/README-source.adoc @@ -4,6 +4,7 @@ include::../shared-doc/attributes.adoc[] :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. diff --git a/jaxrs-jwt/pom.xml b/jaxrs-jwt/pom.xml index 121e6abd00..b88ee92144 100644 --- a/jaxrs-jwt/pom.xml +++ b/jaxrs-jwt/pom.xml @@ -47,7 +47,6 @@ 32.0.0.Final ${version.server} - 7.0.0.Final 5.0.0.Final 9.37.1 @@ -134,6 +133,7 @@ + @@ -142,14 +142,6 @@ ${version.plugin.wildfly} ${jboss.home} - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - - ee-core-profile-server - @@ -158,12 +150,6 @@ - - - org.wildfly.plugins - wildfly-maven-plugin - - @@ -175,12 +161,14 @@ org.wildfly.plugins wildfly-maven-plugin - + ROOT.war - - ee-core-profile-server - cloud-server - + + ${version.server} + @@ -211,12 +199,15 @@ org.wildfly.plugins wildfly-maven-plugin - - ROOT.war - - ee-core-profile-server - cloud-server - + + ROOT.war + + ${version.server} + cloud + diff --git a/jaxws-ejb/README-source.adoc b/jaxws-ejb/README-source.adoc index efd4e03e4e..9b87618fa1 100644 --- a/jaxws-ejb/README-source.adoc +++ b/jaxws-ejb/README-source.adoc @@ -4,6 +4,7 @@ include::../shared-doc/attributes.adoc[] :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. diff --git a/jaxws-ejb/pom.xml b/jaxws-ejb/pom.xml index 215bfc71c0..70fc984d5d 100644 --- a/jaxws-ejb/pom.xml +++ b/jaxws-ejb/pom.xml @@ -47,7 +47,6 @@ 32.0.0.Final ${version.server} - 7.0.0.Final 5.0.0.Final @@ -196,16 +195,13 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - - cloud-server - ejb - webservices - + + ${version.server} + + ROOT.war @@ -228,19 +224,14 @@ wildfly-maven-plugin ${version.plugin.wildfly} - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} - - - - cloud-server - webservices - ejb - + + ${version.server} + cloud + + ROOT.war diff --git a/jaxws-retail/README-source.adoc b/jaxws-retail/README-source.adoc index 03e2dc9d55..24a5279bbe 100644 --- a/jaxws-retail/README-source.adoc +++ b/jaxws-retail/README-source.adoc @@ -4,6 +4,7 @@ include::../shared-doc/attributes.adoc[] :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. diff --git a/jaxws-retail/pom.xml b/jaxws-retail/pom.xml index 87f084c06a..f98206b0fa 100644 --- a/jaxws-retail/pom.xml +++ b/jaxws-retail/pom.xml @@ -46,7 +46,6 @@ 32.0.0.Final ${version.server} - 7.0.0.Final 5.0.0.Final 1.3.0.Final @@ -223,16 +222,13 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - - cloud-server - ejb - webservices - + + ${version.server} + + ROOT.war @@ -255,19 +251,14 @@ wildfly-maven-plugin ${version.plugin.wildfly} - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} - - - - cloud-server - webservices - ejb - + + ${version.server} + cloud + + ROOT.war diff --git a/jsonp/README-source.adoc b/jsonp/README-source.adoc index f74ae52a82..c7ea1b6218 100644 --- a/jsonp/README-source.adoc +++ b/jsonp/README-source.adoc @@ -5,6 +5,7 @@ include::../shared-doc/attributes.adoc[] :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. diff --git a/jsonp/pom.xml b/jsonp/pom.xml index 2860513eee..b9d75b0df6 100644 --- a/jsonp/pom.xml +++ b/jsonp/pom.xml @@ -47,7 +47,6 @@ 32.0.0.Final ${version.server} - 7.0.0.Final 5.0.0.Final @@ -208,17 +207,13 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - - - jsf - cloud-server - - + + ${version.server} + + ROOT.war @@ -240,18 +235,14 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} - - - - jsf - cloud-server - + + ${version.server} + cloud + + ROOT.war diff --git a/kitchensink/README-source.adoc b/kitchensink/README-source.adoc index 5643a37f82..17edd0d02a 100644 --- a/kitchensink/README-source.adoc +++ b/kitchensink/README-source.adoc @@ -5,6 +5,7 @@ include::../shared-doc/attributes.adoc[] :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. diff --git a/kitchensink/pom.xml b/kitchensink/pom.xml index eabb6c4171..64438cf2da 100644 --- a/kitchensink/pom.xml +++ b/kitchensink/pom.xml @@ -47,7 +47,6 @@ 32.0.0.Final ${version.server} - 7.0.0.Final 5.0.0.Final @@ -289,17 +288,13 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - - cloud-server - h2-driver - ejb - jsf - + + ${version.server} + + ROOT.war @@ -321,20 +316,14 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} - - - - cloud-server - h2-driver - ejb - jsf - + + ${version.server} + cloud + + ROOT.war diff --git a/logging/README-source.adoc b/logging/README-source.adoc index 8e066f1331..717d39a31d 100644 --- a/logging/README-source.adoc +++ b/logging/README-source.adoc @@ -4,6 +4,7 @@ include::../shared-doc/attributes.adoc[] :author: Joel Tosi :level: Intermediate :technologies: Logging +:portedToGlow: true [abstract] The `logging` quickstart demonstrates how to configure different logging levels in {productName}. diff --git a/logging/cli-openshift.properties b/logging/cli-openshift.properties new file mode 100644 index 0000000000..23c5ac90c4 --- /dev/null +++ b/logging/cli-openshift.properties @@ -0,0 +1 @@ +formatter=OPENSHIFT \ No newline at end of file diff --git a/logging/cli.properties b/logging/cli.properties new file mode 100644 index 0000000000..d3c0192cd6 --- /dev/null +++ b/logging/cli.properties @@ -0,0 +1 @@ +formatter=PATTERN \ No newline at end of file diff --git a/logging/configure-logging.cli b/logging/configure-logging.cli index 816c0ef6ff..6fabba41c6 100644 --- a/logging/configure-logging.cli +++ b/logging/configure-logging.cli @@ -1,10 +1,10 @@ # Add the periodic rotating file handlers corresponding to those added to the logging properties file -/subsystem=logging/file-handler=FILE_QS_TRACE:add(append=false, level=TRACE, named-formatter=PATTERN, file={"path"=>"quickstart-trace.log", "relative-to"=>"jboss.server.log.dir"}) -/subsystem=logging/file-handler=FILE_QS_DEBUG:add(append=false, level=DEBUG, named-formatter=PATTERN, file={"path"=>"quickstart-debug.log", "relative-to"=>"jboss.server.log.dir"}) -/subsystem=logging/file-handler=FILE_QS_INFO:add(append=false, level=INFO, named-formatter=PATTERN, file={"path"=>"quickstart-info.log", "relative-to"=>"jboss.server.log.dir"}) -/subsystem=logging/file-handler=FILE_QS_WARN:add(append=false, level=WARN, named-formatter=PATTERN, file={"path"=>"quickstart-warn.log", "relative-to"=>"jboss.server.log.dir"}) -/subsystem=logging/file-handler=FILE_QS_ERROR:add(append=false, level=ERROR, named-formatter=PATTERN, file={"path"=>"quickstart-error.log", "relative-to"=>"jboss.server.log.dir"}) -/subsystem=logging/file-handler=FILE_QS_FATAL:add(append=false, level=FATAL, named-formatter=PATTERN, file={"path"=>"quickstart-fatal.log", "relative-to"=>"jboss.server.log.dir"}) +/subsystem=logging/file-handler=FILE_QS_TRACE:add(append=false, level=TRACE, named-formatter=${formatter}, file={"path"=>"quickstart-trace.log", "relative-to"=>"jboss.server.log.dir"}) +/subsystem=logging/file-handler=FILE_QS_DEBUG:add(append=false, level=DEBUG, named-formatter=${formatter}, file={"path"=>"quickstart-debug.log", "relative-to"=>"jboss.server.log.dir"}) +/subsystem=logging/file-handler=FILE_QS_INFO:add(append=false, level=INFO, named-formatter=${formatter}, file={"path"=>"quickstart-info.log", "relative-to"=>"jboss.server.log.dir"}) +/subsystem=logging/file-handler=FILE_QS_WARN:add(append=false, level=WARN, named-formatter=${formatter}, file={"path"=>"quickstart-warn.log", "relative-to"=>"jboss.server.log.dir"}) +/subsystem=logging/file-handler=FILE_QS_ERROR:add(append=false, level=ERROR, named-formatter=${formatter}, file={"path"=>"quickstart-error.log", "relative-to"=>"jboss.server.log.dir"}) +/subsystem=logging/file-handler=FILE_QS_FATAL:add(append=false, level=FATAL, named-formatter=${formatter}, file={"path"=>"quickstart-fatal.log", "relative-to"=>"jboss.server.log.dir"}) # Create the logger for our quickstart class and assign the handlers /subsystem=logging/logger=org.jboss.as.quickstarts.logging:add(handlers=[FILE_QS_TRACE,FILE_QS_DEBUG,FILE_QS_INFO,FILE_QS_WARN,FILE_QS_ERROR,FILE_QS_FATAL]) diff --git a/logging/pom.xml b/logging/pom.xml index d0d26d34b0..95802b7ffb 100644 --- a/logging/pom.xml +++ b/logging/pom.xml @@ -47,7 +47,6 @@ 32.0.0.Final ${version.server} - 7.0.0.Final 5.0.0.Final 5.10.1 @@ -138,15 +137,20 @@ - - - - org.wildfly.plugins - wildfly-maven-plugin - ${version.plugin.wildfly} - - - + + + org.wildfly.plugins + wildfly-maven-plugin + ${version.plugin.wildfly} + + ${jboss.home} + false + + + + + + @@ -157,24 +161,27 @@ org.wildfly.plugins wildfly-maven-plugin + ${version.plugin.wildfly} - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - - ee-core-profile-server - cloud-server - + + ROOT.war + + ${version.server} + + - - false + + ${project.basedir}${file.separator}cli.properties + + true @@ -198,23 +205,27 @@ org.wildfly.plugins wildfly-maven-plugin + ${version.plugin.wildfly} - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - - ee-core-profile-server - cloud-server - + + ROOT.war + + ${version.server} + cloud + + - - false + + ${project.basedir}${file.separator}cli-openshift.properties + + true ROOT.war diff --git a/logging/src/charts/helm.yaml b/logging/src/charts/helm.yaml index f3e9d294ce..80efbd5db8 100644 --- a/logging/src/charts/helm.yaml +++ b/logging/src/charts/helm.yaml @@ -1,6 +1,10 @@ build: uri: https://github.com/wildfly/quickstart.git +<<<<<<< HEAD + ref: 31.x-glow-preview +======= ref: main +>>>>>>> upstream/main contextDir: logging deploy: replicas: 1 \ No newline at end of file diff --git a/mail/README-source.adoc b/mail/README-source.adoc index 4e3fdd8375..15d2a3a308 100644 --- a/mail/README-source.adoc +++ b/mail/README-source.adoc @@ -4,6 +4,7 @@ include::../shared-doc/attributes.adoc[] :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}. diff --git a/mail/pom.xml b/mail/pom.xml index 6d09cfb1de..79128bd61b 100644 --- a/mail/pom.xml +++ b/mail/pom.xml @@ -48,7 +48,6 @@ 32.0.0.Final ${version.server} - 7.0.0.Final 5.0.0.Final 4.15.0 @@ -202,19 +201,13 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - - - core-tools - core-server - mail - jsf - - + + ${version.server} + + ROOT.war @@ -264,4 +257,4 @@ - + \ No newline at end of file diff --git a/micrometer/README-source.adoc b/micrometer/README-source.adoc index 38b7e9f8cd..d50ca6741f 100644 --- a/micrometer/README-source.adoc +++ b/micrometer/README-source.adoc @@ -5,6 +5,7 @@ include::../shared-doc/attributes.adoc[] :level: Beginner :technologies: Micrometer :openshift: true +:portedToGlow: true [abstract] The `micrometer` quickstart demonstrates the use of the Micrometer library in {productName}. diff --git a/micrometer/pom.xml b/micrometer/pom.xml index a130ebd2f3..dfccc3458e 100644 --- a/micrometer/pom.xml +++ b/micrometer/pom.xml @@ -27,8 +27,6 @@ ${version.server} ${version.server} 5.0.0.Final - 11.0.1.Final - 7.0.0.Final @@ -184,17 +182,13 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - - - cdi - jaxrs-server - micrometer - + + ${version.server} + + + micrometer + + @@ -226,24 +220,25 @@ org.wildfly.plugins - wildfly-jar-maven-plugin + wildfly-maven-plugin - wildfly@maven(org.jboss.universe:community-universe)#${version.server} - - cdi - jaxrs-server - micrometer - - - true - - - - + + ${version.server} + + + micrometer + + + true + + ROOT.war + + + - - - + + + @@ -265,19 +260,18 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} - - - - cdi - jaxrs-server - micrometer - + + ${version.server} + cloud + + + micrometer + + + ROOT.war diff --git a/microprofile-config/README-source.adoc b/microprofile-config/README-source.adoc index 45d8a6454f..59130ade08 100644 --- a/microprofile-config/README-source.adoc +++ b/microprofile-config/README-source.adoc @@ -4,6 +4,7 @@ include::../shared-doc/attributes.adoc[] :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}. diff --git a/microprofile-config/pom.xml b/microprofile-config/pom.xml index 213ed8b103..4ac9aa3ac1 100644 --- a/microprofile-config/pom.xml +++ b/microprofile-config/pom.xml @@ -24,9 +24,7 @@ ${version.server} ${version.server} - 7.0.0.Final 5.0.0.Final - 11.0.1.Final @@ -171,11 +169,6 @@ wildfly-maven-plugin ${version.plugin.wildfly} - - org.wildfly.plugins - wildfly-jar-maven-plugin - ${version.plugin.wildfly-jar} - @@ -199,16 +192,17 @@ org.wildfly.plugins - wildfly-jar-maven-plugin + wildfly-maven-plugin - wildfly@maven(org.jboss.universe:community-universe)#${version.server} - - jaxrs-server - microprofile-config - - - true - + + ${version.server} + + true + + ROOT.war @@ -229,18 +223,14 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} - - - - cloud-server - microprofile-config - + + ${version.server} + cloud + + ROOT.war diff --git a/microprofile-fault-tolerance/README-source.adoc b/microprofile-fault-tolerance/README-source.adoc index 9b4adef58d..e60b74a65e 100644 --- a/microprofile-fault-tolerance/README-source.adoc +++ b/microprofile-fault-tolerance/README-source.adoc @@ -13,6 +13,7 @@ include::../shared-doc/attributes.adoc[] :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}. diff --git a/microprofile-fault-tolerance/pom.xml b/microprofile-fault-tolerance/pom.xml index 7295f20548..d84137471c 100644 --- a/microprofile-fault-tolerance/pom.xml +++ b/microprofile-fault-tolerance/pom.xml @@ -57,9 +57,7 @@ ${version.server} ${version.server} - 7.0.0.Final 5.0.0.Final - 11.0.1.Final 4.3.1 @@ -211,11 +209,6 @@ wildfly-maven-plugin ${version.plugin.wildfly} - - org.wildfly.plugins - wildfly-jar-maven-plugin - ${version.plugin.wildfly-jar} - org.asciidoctor asciidoctor-maven-plugin @@ -238,16 +231,17 @@ org.wildfly.plugins - wildfly-jar-maven-plugin + wildfly-maven-plugin - wildfly@maven(org.jboss.universe:community-universe)#${version.server} - - jaxrs-server - microprofile-fault-tolerance - - - true - + + ${version.server} + + true + + ROOT.war @@ -268,18 +262,14 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} - - - - cloud-server - microprofile-fault-tolerance - + + ${version.server} + cloud + + ROOT.war diff --git a/microprofile-health/README-source.adoc b/microprofile-health/README-source.adoc index be7fdd02ab..6de3f1a95b 100644 --- a/microprofile-health/README-source.adoc +++ b/microprofile-health/README-source.adoc @@ -16,6 +16,7 @@ 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? diff --git a/microprofile-health/pom.xml b/microprofile-health/pom.xml index 6261e892c2..cd398cead5 100644 --- a/microprofile-health/pom.xml +++ b/microprofile-health/pom.xml @@ -23,9 +23,7 @@ ${version.server} ${version.server} - 7.0.0.Final 5.0.0.Final - 11.0.1.Final @@ -157,11 +155,6 @@ wildfly-maven-plugin ${version.plugin.wildfly} - - org.wildfly.plugins - wildfly-jar-maven-plugin - ${version.plugin.wildfly-jar} - @@ -186,16 +179,17 @@ org.wildfly.plugins - wildfly-jar-maven-plugin + wildfly-maven-plugin - wildfly@maven(org.jboss.universe:community-universe)#${version.server} - - jaxrs-server - microprofile-health - - - true - + + ${version.server} + + true + + ROOT.war @@ -216,18 +210,14 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} - - - - cloud-server - microprofile-health - + + ${version.server} + cloud + + ROOT.war diff --git a/microprofile-jwt/README-source.adoc b/microprofile-jwt/README-source.adoc index 1d6d702c2b..fffa5a51a2 100644 --- a/microprofile-jwt/README-source.adoc +++ b/microprofile-jwt/README-source.adoc @@ -11,6 +11,7 @@ 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? diff --git a/microprofile-jwt/pom.xml b/microprofile-jwt/pom.xml index 9c1d9fdd84..f4ee8b6ace 100644 --- a/microprofile-jwt/pom.xml +++ b/microprofile-jwt/pom.xml @@ -48,9 +48,7 @@ ${version.server} ${version.server} - 7.0.0.Final 5.0.0.Final - 11.0.1.Final 9.24.4.redhat-00001 1.1.6 @@ -217,11 +215,6 @@ wildfly-maven-plugin ${version.plugin.wildfly} - - org.wildfly.plugins - wildfly-jar-maven-plugin - ${version.plugin.wildfly-jar} - @@ -247,26 +240,27 @@ - org.wildfly.plugins - wildfly-jar-maven-plugin - - wildfly@maven(org.jboss.universe:community-universe)#${version.server} - - jaxrs-server - microprofile-jwt - - - true - - - - - - package - - - - + org.wildfly.plugins + wildfly-maven-plugin + + + ${version.server} + + true + + ROOT.war + + + + + package + + + + @@ -279,18 +273,14 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} - - - - cloud-server - microprofile-jwt - + + ${version.server} + cloud + + ROOT.war diff --git a/microprofile-lra/README-source.adoc b/microprofile-lra/README-source.adoc index 55e816f029..3405618ed1 100644 --- a/microprofile-lra/README-source.adoc +++ b/microprofile-lra/README-source.adoc @@ -19,6 +19,7 @@ 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? diff --git a/microprofile-lra/pom.xml b/microprofile-lra/pom.xml index 0b13e8bae8..b318d3dcf8 100644 --- a/microprofile-lra/pom.xml +++ b/microprofile-lra/pom.xml @@ -23,9 +23,7 @@ ${version.server} ${version.server} - 7.0.0.Final 5.0.0.Final - 11.0.1.Final @@ -152,11 +150,6 @@ wildfly-maven-plugin ${version.plugin.wildfly} - - org.wildfly.plugins - wildfly-jar-maven-plugin - ${version.plugin.wildfly-jar} - @@ -184,17 +177,20 @@ org.wildfly.plugins - wildfly-jar-maven-plugin + wildfly-maven-plugin - wildfly@maven(org.jboss.universe:community-universe)#${version.server} - - jaxrs-server - microprofile-lra-coordinator - microprofile-lra-participant - - - true - + + ${version.server} + + lra-coordinator + + + true + + ROOT.war @@ -215,19 +211,17 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} - - - - jaxrs-server - microprofile-lra-coordinator - microprofile-lra-participant - + + ${version.server} + cloud + + lra-coordinator + + + ROOT.war diff --git a/microprofile-openapi/README-source.adoc b/microprofile-openapi/README-source.adoc index 03432cc0d4..721cd30d0a 100644 --- a/microprofile-openapi/README-source.adoc +++ b/microprofile-openapi/README-source.adoc @@ -4,6 +4,7 @@ include::../shared-doc/attributes.adoc[] :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. diff --git a/microprofile-openapi/pom.xml b/microprofile-openapi/pom.xml index 72f9f696a7..de1f211183 100644 --- a/microprofile-openapi/pom.xml +++ b/microprofile-openapi/pom.xml @@ -25,9 +25,7 @@ ${version.server} ${version.server} - 7.0.0.Final 5.0.0.Final - 11.0.1.Final @@ -134,11 +132,6 @@ wildfly-maven-plugin ${version.plugin.wildfly} - - org.wildfly.plugins - wildfly-jar-maven-plugin - ${version.plugin.wildfly-jar} - @@ -150,25 +143,29 @@ org.wildfly.plugins - wildfly-jar-maven-plugin + wildfly-maven-plugin - wildfly@maven(org.jboss.universe:community-universe)#${version.server} - - jaxrs-server - microprofile-openapi - - - true - + + ${version.server} + + openapi + + + true + + ROOT.war - - - package - - + + + package + + - + @@ -180,18 +177,17 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} - - - - cloud-server - microprofile-openapi - + + ${version.server} + cloud + + openapi + + + ROOT.war diff --git a/microprofile-reactive-messaging-kafka/README-source.adoc b/microprofile-reactive-messaging-kafka/README-source.adoc index 9a65fc779a..742f04b53b 100644 --- a/microprofile-reactive-messaging-kafka/README-source.adoc +++ b/microprofile-reactive-messaging-kafka/README-source.adoc @@ -14,6 +14,7 @@ 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? diff --git a/microprofile-reactive-messaging-kafka/pom.xml b/microprofile-reactive-messaging-kafka/pom.xml index 56f85d4cc6..d36641c9fa 100644 --- a/microprofile-reactive-messaging-kafka/pom.xml +++ b/microprofile-reactive-messaging-kafka/pom.xml @@ -40,9 +40,7 @@ ${version.server} ${version.server} - 7.0.0.Final 5.0.0.Final - 11.0.1.Final 3.0.0 2.0.0.Final @@ -254,11 +252,6 @@ wildfly-maven-plugin ${version.plugin.wildfly} - - org.wildfly.plugins - wildfly-jar-maven-plugin - ${version.plugin.wildfly-jar} - @@ -283,26 +276,26 @@ org.wildfly.plugins - wildfly-jar-maven-plugin + wildfly-maven-plugin - wildfly@maven(org.jboss.universe:community-universe)#${version.server} - - cloud-server - h2-default-datasource - microprofile-reactive-messaging-kafka - - - true - + + ${version.server} + + true + + ROOT.war - - package - + + package + - + @@ -315,19 +308,14 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} - - - - cloud-server - h2-default-datasource - microprofile-reactive-messaging-kafka - + + ${version.server} + cloud + + ROOT.war diff --git a/microprofile-rest-client/README-source.adoc b/microprofile-rest-client/README-source.adoc index cf18b222af..65d67d0cbd 100644 --- a/microprofile-rest-client/README-source.adoc +++ b/microprofile-rest-client/README-source.adoc @@ -12,6 +12,7 @@ The `microprofile-rest-client` quickstart demonstrates the use of the MicroProfi :archiveType: jar :archiveName: {artifactId} :rest-client-qs: +:portedToGlow: true == What is it? diff --git a/microprofile-rest-client/pom.xml b/microprofile-rest-client/pom.xml index 96f0b214f0..0ad54a12b0 100644 --- a/microprofile-rest-client/pom.xml +++ b/microprofile-rest-client/pom.xml @@ -46,9 +46,7 @@ ${version.server} ${version.server} - 7.0.0.Final 5.0.0.Final - 11.0.1.Final 6.2.6.Final 5.10.1 @@ -188,34 +186,6 @@ ${version.plugin.wildfly} ${jboss.home} - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - - jaxrs-server - microprofile-platform - - - - - org.wildfly.plugins - wildfly-jar-maven-plugin - ${version.plugin.wildfly-jar} - - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - - jaxrs-server - microprofile-platform - - - true - @@ -229,7 +199,18 @@ org.wildfly.plugins - wildfly-jar-maven-plugin + wildfly-maven-plugin + + + ${version.server} + + true + + ROOT.war + @@ -250,22 +231,16 @@ org.wildfly.plugins wildfly-maven-plugin - - ROOT.war - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} - - - - jaxrs-server - microprofile-platform - cloud-server - - + + ${version.server} + cloud + + + ROOT.war + diff --git a/numberguess/README-source.adoc b/numberguess/README-source.adoc index 5ff1c57a3e..52e94537c2 100644 --- a/numberguess/README-source.adoc +++ b/numberguess/README-source.adoc @@ -5,6 +5,7 @@ include::../shared-doc/attributes.adoc[] :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}. diff --git a/numberguess/pom.xml b/numberguess/pom.xml index 26a9686a13..511f32b436 100644 --- a/numberguess/pom.xml +++ b/numberguess/pom.xml @@ -47,7 +47,6 @@ 32.0.0.Final ${version.server} - 7.0.0.Final 5.0.0.Final @@ -172,15 +171,13 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - - cloud-server - jsf - + + ${version.server} + + ROOT.war @@ -202,18 +199,14 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} - - - - cloud-server - jsf - + + ${version.server} + cloud + + ROOT.war diff --git a/opentelemetry-tracing/README-source.adoc b/opentelemetry-tracing/README-source.adoc index f01e010cb5..808aea589a 100644 --- a/opentelemetry-tracing/README-source.adoc +++ b/opentelemetry-tracing/README-source.adoc @@ -13,7 +13,11 @@ 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? diff --git a/opentelemetry-tracing/pom.xml b/opentelemetry-tracing/pom.xml index 7282d316bd..5b8c49bda7 100644 --- a/opentelemetry-tracing/pom.xml +++ b/opentelemetry-tracing/pom.xml @@ -25,8 +25,6 @@ ${version.server} ${version.server} 5.0.0.Final - 11.0.1.Final - 7.0.0.Final @@ -184,17 +182,9 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - - - cdi - jaxrs-server - opentelemetry - + + ${version.server} + @@ -223,24 +213,21 @@ org.wildfly.plugins - wildfly-jar-maven-plugin + wildfly-maven-plugin - wildfly@maven(org.jboss.universe:community-universe)#${version.server} - - cdi - jaxrs-server - opentelemetry - - - - + + ${version.server} + + true + + ROOT.war + + + - - - - - true - + + + @@ -262,20 +249,10 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} - - - - cdi - jaxrs-server - opentelemetry - - ROOT.war + + ${version.server} + cloud + @@ -284,6 +261,11 @@ false + + ROOT.war diff --git a/remote-helloworld-mdb/README-source.adoc b/remote-helloworld-mdb/README-source.adoc index 97bcd4aa06..419c1f884d 100644 --- a/remote-helloworld-mdb/README-source.adoc +++ b/remote-helloworld-mdb/README-source.adoc @@ -5,6 +5,7 @@ include::../shared-doc/attributes.adoc[] :level: Intermediate :technologies: JMS, EJB, MDB :openshift: true +:portedToGlow: true :standalone-server-type: full :archiveType: war diff --git a/remote-helloworld-mdb/pom.xml b/remote-helloworld-mdb/pom.xml index 6b7c99577b..375088c25f 100644 --- a/remote-helloworld-mdb/pom.xml +++ b/remote-helloworld-mdb/pom.xml @@ -47,8 +47,7 @@ 32.0.0.Final - ${version.server} - 7.0.0.Final + ${version.server} 5.0.0.Final 5.10.0 @@ -184,17 +183,16 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - - - cloud-server - ejb - remote-activemq - + + ${version.server} + + remote-activemq + + + ROOT.war @@ -216,19 +214,17 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} - - - - cloud-server - ejb - remote-activemq - + + ${version.server} + cloud + + remote-activemq + + + ROOT.war diff --git a/servlet-async/README-source.adoc b/servlet-async/README-source.adoc index bfbe219b74..b25d1f48f7 100644 --- a/servlet-async/README-source.adoc +++ b/servlet-async/README-source.adoc @@ -5,6 +5,7 @@ include::../shared-doc/attributes.adoc[] :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. diff --git a/servlet-async/pom.xml b/servlet-async/pom.xml index 80f3ab103c..859b6b2ddf 100644 --- a/servlet-async/pom.xml +++ b/servlet-async/pom.xml @@ -48,7 +48,6 @@ 32.0.0.Final ${version.server} - 7.0.0.Final 5.0.0.Final 5.9.1 @@ -183,14 +182,13 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - - cloud-server - + + ${version.server} + + ROOT.war @@ -212,17 +210,14 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} - - - - cloud-server - + + ${version.server} + cloud + + ROOT.war diff --git a/servlet-filterlistener/README-source.adoc b/servlet-filterlistener/README-source.adoc index 2322bd1ff7..53acc4f786 100644 --- a/servlet-filterlistener/README-source.adoc +++ b/servlet-filterlistener/README-source.adoc @@ -5,6 +5,7 @@ include::../shared-doc/attributes.adoc[] :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. diff --git a/servlet-filterlistener/pom.xml b/servlet-filterlistener/pom.xml index 93a3b6fe29..b45a293d29 100644 --- a/servlet-filterlistener/pom.xml +++ b/servlet-filterlistener/pom.xml @@ -48,7 +48,6 @@ 32.0.0.Final ${version.server} - 7.0.0.Final 5.0.0.Final 5.9.1 @@ -183,14 +182,13 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - - cloud-server - + + ${version.server} + + ROOT.war @@ -212,17 +210,14 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} - - - - cloud-server - + + ${version.server} + cloud + + ROOT.war diff --git a/servlet-security/README-source.adoc b/servlet-security/README-source.adoc index 234aae9d87..fad6e780c2 100644 --- a/servlet-security/README-source.adoc +++ b/servlet-security/README-source.adoc @@ -5,6 +5,7 @@ include::../shared-doc/attributes.adoc[] :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}. diff --git a/servlet-security/pom.xml b/servlet-security/pom.xml index a89bcff0e3..e930c5c2e5 100644 --- a/servlet-security/pom.xml +++ b/servlet-security/pom.xml @@ -48,8 +48,6 @@ 32.0.0.Final ${version.server} - 7.0.0.Final - 8.0.0.Final 5.0.0.Final 5.9.1 @@ -183,18 +181,18 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - org.wildfly:wildfly-datasources-galleon-pack:${version.pack.datasources} - - - - cloud-server - h2-datasource - + + ${version.server} + + false + + h2-database + + + ROOT.war @@ -225,21 +223,19 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} - - - org.wildfly:wildfly-datasources-galleon-pack:${version.pack.datasources} - - - - cloud-server - h2-datasource - + + ${version.server} + + false + + h2-database + + cloud + + ROOT.war diff --git a/shared-doc/attributes.adoc b/shared-doc/attributes.adoc index c47562e151..47efc3fd6f 100644 --- a/shared-doc/attributes.adoc +++ b/shared-doc/attributes.adoc @@ -190,4 +190,7 @@ endif::[] :LinkJBDSInstall: https://access.redhat.com/documentation/en-us/red_hat_codeready_studio/{JBDSVersion}/html-single/installation_guide/ :JBDSInstallBookName: Installation Guide :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 \ No newline at end of file +:JBDSGettingStartedBookName: Getting Started with CodeReady Studio Tools + +// Enable Rendering of Glow configuration in plugin examples +:portedToGlow: true \ No newline at end of file diff --git a/shared-doc/build-and-run-the-quickstart-with-bootable-jar.adoc b/shared-doc/build-and-run-the-quickstart-with-bootable-jar.adoc index 9e52892455..1ac1fc6c5d 100644 --- a/shared-doc/build-and-run-the-quickstart-with-bootable-jar.adoc +++ b/shared-doc/build-and-run-the-quickstart-with-bootable-jar.adoc @@ -5,9 +5,6 @@ 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: -// Render XML Snippet of openshift Maven profile... -ifndef::ProductRelease[] -// ... for WildFly [source,xml,subs="attributes+"] ---- @@ -16,16 +13,18 @@ ifndef::ProductRelease[] org.wildfly.plugins - wildfly-jar-maven-plugin + wildfly-maven-plugin - wildfly@maven(org.jboss.universe:community-universe)#${version.server} - - jaxrs-server - microprofile-config - - - true - + + ${version.server} + + true + + ROOT.war + ... @@ -35,51 +34,19 @@ ifndef::ProductRelease[] + ... ---- -endif::[] -ifdef::ProductRelease[] -ifndef::EAPXPRelease[] -// ... for EAP -// not supported -endif::[] -ifdef::EAPXPRelease[] -// ... for EAP XP -[source,xml,subs="attributes+"] ----- - - bootable-jar - - - - org.wildfly.plugins - wildfly-jar-maven-plugin - - ... - org.jboss.eap.xp:wildfly-galleon-pack - ... - - true - - - - - - package - - - - - - - ----- -endif::[] -endif::[] +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. +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 +---- .Procedure diff --git a/shared-doc/build-and-run-the-quickstart-with-provisioned-server.adoc b/shared-doc/build-and-run-the-quickstart-with-provisioned-server.adoc index 895039f529..e629caea08 100644 --- a/shared-doc/build-and-run-the-quickstart-with-provisioned-server.adoc +++ b/shared-doc/build-and-run-the-quickstart-with-provisioned-server.adoc @@ -63,14 +63,15 @@ The server provisioning functionality is provided by the WildFly Maven Plugin, a org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - ... - + + ${version.server} + + ROOT.war + ... @@ -85,6 +86,14 @@ The server provisioning functionality is provided by the WildFly Maven Plugin, a ---- +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. + +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 +---- [NOTE] ==== diff --git a/shared-doc/build-the-quickstart-for-openshift.adoc b/shared-doc/build-the-quickstart-for-openshift.adoc index 325dc0e5b2..50ba1441d6 100644 --- a/shared-doc/build-the-quickstart-for-openshift.adoc +++ b/shared-doc/build-the-quickstart-for-openshift.adoc @@ -10,9 +10,8 @@ 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::[] -// Render XML Snippet of openshift Maven profile... -ifndef::ProductRelease[] -// ... for WildFly +ifndef::ProductRelease,EAPXPRelease[] + [source,xml,subs="attributes+"] ---- @@ -23,16 +22,16 @@ ifndef::ProductRelease[] org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} - - - ... - ROOT.war + + ${version.server} + cloud + + + ROOT.war + ... @@ -47,48 +46,18 @@ ifndef::ProductRelease[] ---- -endif::[] -ifdef::ProductRelease[] -ifndef::EAPXPRelease[] -// ... for EAP -[source,xml,subs="attributes+"] +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. + +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] ---- - - openshift - - - - org.jboss.eap.plugins - eap-maven-plugin - - ... - - - org.jboss.eap:wildfly-ee-galleon-pack - - - org.jboss.eap.cloud:eap-cloud-galleon-pack - - - ... - ROOT.war - - - - - package - - - - - ... - - - +wildfly-glow show-add-ons ---- -endif::[] -ifdef::EAPXPRelease[] -// ... for EAP XP +endif::ProductRelease,EAPXPRelease[] + +ifdef::ProductRelease,EAPXPRelease[] [source,xml,subs="attributes+"] ---- @@ -102,7 +71,7 @@ ifdef::EAPXPRelease[] ... - org.jboss.eap.xp:wildfly-galleon-pack + org.jboss.eap:wildfly-ee-galleon-pack org.jboss.eap.cloud:eap-cloud-galleon-pack @@ -124,19 +93,5 @@ ifdef::EAPXPRelease[] ---- +You may note that it uses the cloud feature pack which enables a configuration tuned for OpenShift environment. endif::[] -endif::[] - -ifndef::ProductRelease,EAPXPRelease[] -You may note that unlike the `provisioned-server` profile it uses the cloud feature pack which enables a configuration tuned for OpenShift environment. -endif::[] -ifdef::ProductRelease,EAPXPRelease[] -You may note that the cloud feature pack is used, this enables a configuration tuned for OpenShift environment. -endif::[] - -ifdef::EAPXPRelease[] -[NOTE] -==== -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. -==== -endif::[] \ No newline at end of file diff --git a/spring-resteasy/README-source.adoc b/spring-resteasy/README-source.adoc index f2ddc0be25..ce8656365f 100644 --- a/spring-resteasy/README-source.adoc +++ b/spring-resteasy/README-source.adoc @@ -6,6 +6,7 @@ include::../shared-doc/attributes.adoc[] :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. diff --git a/spring-resteasy/pom.xml b/spring-resteasy/pom.xml index 3d1fe9f7aa..9d6c5d707b 100644 --- a/spring-resteasy/pom.xml +++ b/spring-resteasy/pom.xml @@ -52,7 +52,6 @@ 32.0.0.Final ${version.server} - 7.0.0.Final 5.0.0.Final @@ -88,6 +87,20 @@ default + + spring-repo + Spring Repository + https://repo.spring.io/milestone + + true + never + + + true + never + + default + @@ -212,12 +225,17 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - + + ${version.server} + + + * + + + ROOT.war @@ -239,15 +257,18 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} - - - + + ${version.server} + cloud + + + * + + + ROOT.war diff --git a/temperature-converter/README-source.adoc b/temperature-converter/README-source.adoc index b4f2750221..8b9b2d8e4f 100644 --- a/temperature-converter/README-source.adoc +++ b/temperature-converter/README-source.adoc @@ -5,6 +5,7 @@ include::../shared-doc/attributes.adoc[] :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. diff --git a/temperature-converter/pom.xml b/temperature-converter/pom.xml index f63853e9e2..93bc89a535 100644 --- a/temperature-converter/pom.xml +++ b/temperature-converter/pom.xml @@ -48,7 +48,6 @@ 32.0.0.Final ${version.server} - 7.0.0.Final 5.0.0.Final @@ -189,16 +188,13 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - - cloud-server - ejb - jsf - + + ${version.server} + + ROOT.war @@ -220,19 +216,14 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} - - - - cloud-server - ejb - jsf - + + ${version.server} + cloud + + ROOT.war diff --git a/thread-racing/README-source.adoc b/thread-racing/README-source.adoc index 0c489d72f0..63c6f5c0e6 100644 --- a/thread-racing/README-source.adoc +++ b/thread-racing/README-source.adoc @@ -5,6 +5,7 @@ include::../shared-doc/attributes.adoc[] :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. diff --git a/thread-racing/pom.xml b/thread-racing/pom.xml index 98c4222dea..7e33268dd1 100644 --- a/thread-racing/pom.xml +++ b/thread-racing/pom.xml @@ -48,7 +48,6 @@ 32.0.0.Final ${version.server} - 7.0.0.Final 5.0.0.Final @@ -238,18 +237,17 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - - cloud-server - ejb - batch-jberet - embedded-activemq - h2-default-datasource - + + ${version.server} + + embedded-activemq + h2-database:default + + + ROOT.war @@ -271,21 +269,18 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} - - - - cloud-server - ejb - batch-jberet - embedded-activemq - h2-default-datasource - + + ${version.server} + cloud + + embedded-activemq + h2-database:default + + + ROOT.war diff --git a/todo-backend/README-source.adoc b/todo-backend/README-source.adoc index 0684565431..ad5456cb9b 100644 --- a/todo-backend/README-source.adoc +++ b/todo-backend/README-source.adoc @@ -12,6 +12,7 @@ include::../shared-doc/attributes.adoc[] :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 diff --git a/todo-backend/pom.xml b/todo-backend/pom.xml index bc8cfbe7c1..813445f3c5 100644 --- a/todo-backend/pom.xml +++ b/todo-backend/pom.xml @@ -48,8 +48,6 @@ 32.0.0.Final ${version.server} - 7.0.0.Final - 8.0.0.Final 5.0.0.Final @@ -196,19 +194,16 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - org.wildfly:wildfly-datasources-galleon-pack:${version.pack.datasources} - - - - cloud-server - postgresql-datasource - - + + ${version.server} + + postgresql + + + ROOT.war @@ -239,21 +234,17 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - org.wildfly:wildfly-datasources-galleon-pack:${version.pack.datasources} - - - org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} - - - - cloud-server - postgresql-datasource - + + ${version.server} + cloud + + postgresql + + + ROOT.war @@ -283,7 +274,6 @@ org.apache.maven.plugins maven-failsafe-plugin - ${version.failsafe.plugin} diff --git a/websocket-endpoint/README-source.adoc b/websocket-endpoint/README-source.adoc index d71e5d1f34..1b9622ef1f 100644 --- a/websocket-endpoint/README-source.adoc +++ b/websocket-endpoint/README-source.adoc @@ -5,6 +5,7 @@ include::../shared-doc/attributes.adoc[] :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}. diff --git a/websocket-endpoint/pom.xml b/websocket-endpoint/pom.xml index ec7222d961..99da20f365 100644 --- a/websocket-endpoint/pom.xml +++ b/websocket-endpoint/pom.xml @@ -48,7 +48,6 @@ 32.0.0.Final ${version.server} - 7.0.0.Final 5.0.0.Final 5.9.1 @@ -209,14 +208,13 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - - cloud-server - + + ${version.server} + + ROOT.war @@ -238,17 +236,14 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} - - - - cloud-server - + + ${version.server} + cloud + + ROOT.war diff --git a/websocket-hello/README-source.adoc b/websocket-hello/README-source.adoc index 185033e45e..f64a5ea94c 100644 --- a/websocket-hello/README-source.adoc +++ b/websocket-hello/README-source.adoc @@ -5,6 +5,7 @@ include::../shared-doc/attributes.adoc[] :level: Beginner :technologies: WebSocket, CDI, JSF :openshift: true +:portedToGlow: true [abstract] The `websocket-hello` quickstart demonstrates how to create a simple WebSocket application. diff --git a/websocket-hello/pom.xml b/websocket-hello/pom.xml index 26bc869c92..9915483b58 100644 --- a/websocket-hello/pom.xml +++ b/websocket-hello/pom.xml @@ -48,7 +48,6 @@ 32.0.0.Final ${version.server} - 7.0.0.Final 5.0.0.Final @@ -160,14 +159,13 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - - cloud-server - + + ${version.server} + + ROOT.war @@ -189,17 +187,14 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - org.wildfly.cloud:wildfly-cloud-galleon-pack:${version.pack.cloud} - - - - cloud-server - + + ${version.server} + cloud + + ROOT.war