diff --git a/.github/workflows/project_ci.yml b/.github/workflows/project_ci.yml index 1c6a1c9fa0..e1219b5b26 100644 --- a/.github/workflows/project_ci.yml +++ b/.github/workflows/project_ci.yml @@ -51,6 +51,7 @@ jobs: name: BUILD WITH DEPS - JDK${{ matrix.jdk }} - ${{ matrix.os }} runs-on: ${{ matrix.os }} needs: WildFly-build + if: strategy: fail-fast: false matrix: @@ -76,7 +77,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 89df1ffc5d..0235a2251e 100644 --- a/.github/workflows/quickstart_ci.yml +++ b/.github/workflows/quickstart_ci.yml @@ -53,6 +53,9 @@ 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/' + jobs: Matrix-Setup: runs-on: ubuntu-latest @@ -107,10 +110,12 @@ jobs: cd ${{ inputs.QUICKSTART_PATH }} echo "Building provisioned server..." mvn -fae clean package -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..." @@ -126,11 +131,11 @@ jobs: echo "Building bootable jar..." mvn -fae clean package -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 }} @@ -203,7 +208,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 }} @@ -211,11 +216,13 @@ jobs: cd quickstarts cd ${{ inputs.QUICKSTART_PATH }} echo "Building provisioned server..." - mvn -fae clean package -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 package -Pprovisioned-server -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} ${{ env.WILDFLY_SNAPSHOT_EXTRA_PACKAGE_ARGUMENTS }} + 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..." @@ -229,20 +236,20 @@ jobs: cd quickstarts cd ${{ inputs.QUICKSTART_PATH }} echo "Building bootable jar..." - mvn -fae clean package -Pbootable-jar -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} + mvn -fae clean package -Pbootable-jar -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} ${{ env.WILDFLY_SNAPSHOT_EXTRA_PACKAGE_ARGUMENTS }} 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 }} shell: bash - name: Run after script env: @@ -258,4 +265,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..2ee2187a90 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: '-Pprovisioned-server -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 98af323ac9..acd9e4e1e3 100644 --- a/batch-processing/pom.xml +++ b/batch-processing/pom.xml @@ -48,8 +48,7 @@ 31.0.0.Beta1 ${version.server} - 5.0.0.Final - 4.2.1.Final + 5.0.0.Beta2 @@ -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 2711d78961..122472b7e1 100644 --- a/bmt/pom.xml +++ b/bmt/pom.xml @@ -48,8 +48,7 @@ 31.0.0.Beta1 ${version.server} - 5.0.0.Final - 4.2.1.Final + 5.0.0.Beta2 @@ -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/pom.xml b/cmt/pom.xml index c8365a27c4..5beaf47c04 100644 --- a/cmt/pom.xml +++ b/cmt/pom.xml @@ -47,8 +47,7 @@ 31.0.0.Beta1 ${version.server} - 5.0.0.Final - 4.2.1.Final + 5.0.0.Beta2 @@ -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 238097a9b3..d49b1346d5 100644 --- a/ee-security/pom.xml +++ b/ee-security/pom.xml @@ -48,8 +48,7 @@ 31.0.0.Beta1 ${version.server} - 5.0.0.Final - 4.2.1.Final + 5.0.0.Beta2 @@ -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/pom.xml b/ejb-remote/pom.xml index f4f60ada12..6d58f83e37 100644 --- a/ejb-remote/pom.xml +++ b/ejb-remote/pom.xml @@ -47,8 +47,7 @@ 31.0.0.Beta1 ${version.server} - 5.0.0.Final - 4.2.1.Final + 5.0.0.Beta2 @@ -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/pom.xml b/ejb-security-context-propagation/pom.xml index 1a50d38757..b439f27d1b 100644 --- a/ejb-security-context-propagation/pom.xml +++ b/ejb-security-context-propagation/pom.xml @@ -47,8 +47,7 @@ 31.0.0.Beta1 ${version.server} - 5.0.0.Final - 4.2.1.Final + 5.0.0.Beta2 @@ -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/pom.xml b/ejb-security-programmatic-auth/pom.xml index fb1f8acce4..c659805430 100644 --- a/ejb-security-programmatic-auth/pom.xml +++ b/ejb-security-programmatic-auth/pom.xml @@ -47,8 +47,7 @@ 31.0.0.Beta1 ${version.server} - 5.0.0.Final - 4.2.1.Final + 5.0.0.Beta2 @@ -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-timer/pom.xml b/ejb-timer/pom.xml index f23c5120d0..d241f4d508 100644 --- a/ejb-timer/pom.xml +++ b/ejb-timer/pom.xml @@ -46,8 +46,7 @@ 31.0.0.Beta1 ${version.server} - 5.0.0.Final - 4.2.1.Final + 5.0.0.Beta2 @@ -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.adoc b/ejb-txn-remote-call/README.adoc index 289c17ac0b..ac25d0958a 100644 --- a/ejb-txn-remote-call/README.adoc +++ b/ejb-txn-remote-call/README.adoc @@ -553,18 +553,15 @@ Instead of using a standard {productName} server distribution, the three {produc ---- cd ${PATH_TO_QUICKSTART_DIR}/ejb-txn-remote-call/client; mvn clean package -Pprovisioned-server \ - -DremoteServerUsername="quickstartUser" -DremoteServerPassword="quickstartPwd1!" \ - -DpostgresqlUsername="test" -DpostgresqlPassword="test" + -DremoteServerUsername="quickstartUser" -DremoteServerPassword="quickstartPwd1!" ---- [source,sh,subs="+quotes,attributes+",options="nowrap"] ---- cd ${PATH_TO_QUICKSTART_DIR}/ejb-txn-remote-call/server; mvn clean package -Pprovisioned-server \ - -Dwildfly.provisioning.dir=server2 -Djboss-as.home=target/server2 \ - -DpostgresqlUsername="test" -DpostgresqlPassword="test"; + -Dwildfly.provisioning.dir=server2 -Djboss-as.home=target/server2 ; mvn package -Pprovisioned-server \ - -Dwildfly.provisioning.dir=server3 -Djboss-as.home=target/server3 \ - -DpostgresqlUsername="test" -DpostgresqlPassword="test" + -Dwildfly.provisioning.dir=server3 -Djboss-as.home=target/server3 ---- The provisioned {productName} servers, with the quickstart deployed, can then be found in the `target/server` directory, and their usage is similar to a standard server distribution, with the simplification that there is never the need to specify the server configuration to be started. @@ -606,7 +603,8 @@ podman run -p 5432:5432 --rm -ePOSTGRES_DB=test -ePOSTGRES_USER=test -ePOSTGRES ---- cd ${PATH_TO_QUICKSTART_DIR}/ejb-txn-remote-call/client; mvn wildfly:start -Djboss-as.home=target/server \ - -Dwildfly.javaOpts="-Djboss.tx.node.id=server1 -Djboss.node.name=server1" + -Dwildfly.javaOpts="-Djboss.tx.node.id=server1 -Djboss.node.name=server1" \ + -Pprovisioned-server -DpostgresqlUsername="test" -DpostgresqlPassword="test" ---- + [source,subs="attributes+",options="nowrap"] @@ -615,7 +613,8 @@ cd ${PATH_TO_QUICKSTART_DIR}/ejb-txn-remote-call/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" + -Dwildfly.javaOpts="-Djboss.socket.binding.port-offset=100 -Djboss.tx.node.id=server2 -Djboss.node.name=server2" \ + -Pprovisioned-server -DpostgresqlUsername="test" -DpostgresqlPassword="test" ---- + [source,subs="attributes+",options="nowrap"] @@ -624,7 +623,8 @@ cd ${PATH_TO_QUICKSTART_DIR}/ejb-txn-remote-call/server; 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" + -Dwildfly.javaOpts="-Djboss.socket.binding.port-offset=200 -Djboss.tx.node.id=server3 -Djboss.node.name=server3" \ + -Pprovisioned-server -DpostgresqlUsername="test" -DpostgresqlPassword="test" ---- . Type the following command to run the `verify` goal with the `integration-testing` profile activated, and specifying the quickstart's URL using the `server.host` system property. @@ -638,13 +638,13 @@ mvn verify -Pintegration-testing [source,subs="attributes+",options="nowrap"] ---- cd ${PATH_TO_QUICKSTART_DIR}/ejb-txn-remote-call/server; -mvn verify -Pintegration-testing -Dserver.host="http://localhost:8180/server" +mvn verify -Pintegration-testing -Dserver.host="http://localhost:8180/" ---- + [source,subs="attributes+",options="nowrap"] ---- cd ${PATH_TO_QUICKSTART_DIR}/ejb-txn-remote-call/server; -mvn verify -Pintegration-testing -Dserver.host="http://localhost:8280/server" +mvn verify -Pintegration-testing -Dserver.host="http://localhost:8280/" ---- . To shut down the {productName} provisioned servers using the {productName} Maven Plugin: 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 5767f4a60a..7a09a7bf22 100644 --- a/ejb-txn-remote-call/client/pom.xml +++ b/ejb-txn-remote-call/client/pom.xml @@ -28,6 +28,7 @@ 7 + ejb-txn-remote-call-client 31.0.0.Final-SNAPSHOT @@ -40,10 +41,8 @@ 30.0.0.Final ${version.server} - 4.2.0.Final + 5.0.0.Beta2 42.7.0 - 5.0.2.Final - 6.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} 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 7ba2fe5eae..99a320be84 100644 --- a/ejb-txn-remote-call/pom.xml +++ b/ejb-txn-remote-call/pom.xml @@ -28,7 +28,7 @@ 7 - + ejb-txn-remote-call 31.0.0.Final-SNAPSHOT pom diff --git a/ejb-txn-remote-call/server/pom.xml b/ejb-txn-remote-call/server/pom.xml index c13a51b396..a753a7503e 100644 --- a/ejb-txn-remote-call/server/pom.xml +++ b/ejb-txn-remote-call/server/pom.xml @@ -28,6 +28,7 @@ 7 + ejb-txn-remote-call-server 31.0.0.Final-SNAPSHOT @@ -41,9 +42,7 @@ ${version.server} 7.0.0.Final - 4.2.0.Final - 5.0.2.Final - 6.0.0.Final + 5.0.0.Beta2 @@ -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/pom.xml b/helloworld-jms/pom.xml index 67c139eb84..8d2c01cd0b 100644 --- a/helloworld-jms/pom.xml +++ b/helloworld-jms/pom.xml @@ -47,8 +47,7 @@ 31.0.0.Beta1 ${version.server} - 5.0.0.Final - 4.2.1.Final + 5.0.0.Beta2 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/pom.xml b/helloworld-mdb/pom.xml index 8688c01e0e..7774ef9636 100644 --- a/helloworld-mdb/pom.xml +++ b/helloworld-mdb/pom.xml @@ -48,8 +48,7 @@ 31.0.0.Beta1 ${version.server} - 5.0.0.Final - 4.2.1.Final + 5.0.0.Beta2 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-ws/pom.xml b/helloworld-ws/pom.xml index 24d7286941..1c4c168271 100644 --- a/helloworld-ws/pom.xml +++ b/helloworld-ws/pom.xml @@ -47,8 +47,7 @@ 31.0.0.Beta1 ${version.server} - 5.0.0.Final - 4.2.1.Final + 5.0.0.Beta2 @@ -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/pom.xml b/helloworld/pom.xml index 8ed2c02e3c..8ede3df4de 100644 --- a/helloworld/pom.xml +++ b/helloworld/pom.xml @@ -47,8 +47,7 @@ 31.0.0.Beta1 ${version.server} - 5.0.0.Final - 4.2.1.Final + 5.0.0.Beta2 @@ -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/pom.xml b/hibernate/pom.xml index 1e17adb13c..159e5cf8ef 100644 --- a/hibernate/pom.xml +++ b/hibernate/pom.xml @@ -48,9 +48,7 @@ 31.0.0.Beta1 ${version.server} - 5.0.0.Final - 6.0.0.Final - 4.2.1.Final + 5.0.0.Beta2 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/pom.xml b/http-custom-mechanism/pom.xml index e352955df8..0c2853766f 100644 --- a/http-custom-mechanism/pom.xml +++ b/http-custom-mechanism/pom.xml @@ -53,8 +53,7 @@ 31.0.0.Beta1 ${version.server} - 5.0.0.Final - 4.2.1.Final + 5.0.0.Beta2 diff --git a/http-custom-mechanism/webapp/pom.xml b/http-custom-mechanism/webapp/pom.xml index 26aa230fc1..b6025587a4 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/pom.xml b/jaxrs-client/pom.xml index 5963772a1a..5e514cf5c3 100644 --- a/jaxrs-client/pom.xml +++ b/jaxrs-client/pom.xml @@ -48,8 +48,7 @@ 31.0.0.Beta1 ${version.server} - 5.0.0.Final - 4.2.1.Final + 5.0.0.Beta2 9.37.1 5.10.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/pom.xml b/jaxrs-jwt/pom.xml index e378610f94..5ad46d28b4 100644 --- a/jaxrs-jwt/pom.xml +++ b/jaxrs-jwt/pom.xml @@ -47,8 +47,7 @@ 31.0.0.Beta1 ${version.server} - 5.0.0.Final - 4.2.1.Final + 5.0.0.Beta2 9.37.1 5.10.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/pom.xml b/jaxws-ejb/pom.xml index 6c4b33ade7..3e849d5501 100644 --- a/jaxws-ejb/pom.xml +++ b/jaxws-ejb/pom.xml @@ -47,8 +47,7 @@ 31.0.0.Beta1 ${version.server} - 5.0.0.Final - 4.2.1.Final + 5.0.0.Beta2 @@ -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/pom.xml b/jaxws-retail/pom.xml index 250b8c8def..7906e79d8b 100644 --- a/jaxws-retail/pom.xml +++ b/jaxws-retail/pom.xml @@ -46,8 +46,7 @@ 31.0.0.Beta1 ${version.server} - 5.0.0.Final - 4.2.1.Final + 5.0.0.Beta2 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/pom.xml b/jsonp/pom.xml index 6168e8710d..e298608512 100644 --- a/jsonp/pom.xml +++ b/jsonp/pom.xml @@ -47,8 +47,7 @@ 31.0.0.Beta1 ${version.server} - 5.0.0.Final - 4.2.1.Final + 5.0.0.Beta2 @@ -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/pom.xml b/kitchensink/pom.xml index 9e464a58f6..620cd1e667 100644 --- a/kitchensink/pom.xml +++ b/kitchensink/pom.xml @@ -47,8 +47,7 @@ 31.0.0.Beta1 ${version.server} - 5.0.0.Final - 4.2.1.Final + 5.0.0.Beta2 @@ -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.adoc b/logging/README.adoc index 8e066f1331..4b934a5323 100644 --- a/logging/README.adoc +++ b/logging/README.adoc @@ -70,11 +70,12 @@ Now you have deployed the quickstart with the default configuration, you run a m . Review the `configure-logging.cli` file in the root of this quickstart directory. This script configures the logging subsystem in the server configuration file. It configures the file handlers, creates the logger for our quickstart and sets the level to TRACE. It also assigns the handlers for our quickstart to our logger. +. The CLI script references the logging formatter with the property `${formatter}`. On bare-metal this formatter is named `PATTERN`, on OpenShift it is named `OPENSHIFT`. A properties file is to be provided when executing the CLI to resolve the `formatter` property according to the execution context. The file `cli.properties` is to be used when executing the script on bare-metal. `cli-openshift.properties` is to be used when executing the script on OpenShift. . Open a new terminal, navigate to the root directory of this quickstart, and run the following command, replacing `__{jbossHomeName}__` with the path to your server: + [source,subs="+quotes,attributes+",options="nowrap"] ---- -$ __{jbossHomeName}__/bin/jboss-cli.sh --connect --file=configure-logging.cli +$ __{jbossHomeName}__/bin/jboss-cli.sh --connect --file=configure-logging.cli --resolve-parameter-values=true --properties=cli.properties ---- + NOTE: For Windows, use the `__{jbossHomeName}__\bin\jboss-cli.bat` script. 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 469a86554c..a759a95437 100644 --- a/logging/pom.xml +++ b/logging/pom.xml @@ -47,8 +47,7 @@ 31.0.0.Beta1 ${version.server} - 5.0.0.Final - 4.2.1.Final + 5.0.0.Beta2 5.10.1 @@ -142,17 +141,9 @@ org.wildfly.plugins wildfly-maven-plugin + ${version.plugin.wildfly} ${jboss.home} - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - - ee-core-profile-server - core-tools - false @@ -170,21 +161,26 @@ org.wildfly.plugins wildfly-maven-plugin + ${version.plugin.wildfly} - + ROOT.war - - ee-core-profile-server - cloud-server - + + ${version.server} + - - false + + ${project.basedir}${file.separator}cli.properties + + true @@ -206,21 +202,27 @@ org.wildfly.plugins wildfly-maven-plugin + ${version.plugin.wildfly} - - ROOT.war - - ee-core-profile-server - cloud-server - + + ROOT.war + + ${version.server} + cloud + - - false + + ${project.basedir}${file.separator}cli-openshift.properties + + true diff --git a/mail/pom.xml b/mail/pom.xml index ea7545c2f2..4a8744f8e7 100644 --- a/mail/pom.xml +++ b/mail/pom.xml @@ -48,8 +48,7 @@ 31.0.0.Beta1 ${version.server} - 5.0.0.Final - 4.2.1.Final + 5.0.0.Beta2 4.15.0 5.6.2 @@ -200,19 +199,13 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - - - core-tools - core-server - mail - jsf - - + + ${version.server} + + ROOT.war diff --git a/microprofile-config/pom.xml b/microprofile-config/pom.xml index e57a84d6d4..f20f2cd58d 100644 --- a/microprofile-config/pom.xml +++ b/microprofile-config/pom.xml @@ -24,9 +24,7 @@ ${version.server} ${version.server} - 5.0.0.Final - 4.2.1.Final - 10.0.0.Final + 5.0.0.Beta2 @@ -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/pom.xml b/microprofile-fault-tolerance/pom.xml index c94d42cfdd..b6a412f7f4 100644 --- a/microprofile-fault-tolerance/pom.xml +++ b/microprofile-fault-tolerance/pom.xml @@ -57,9 +57,7 @@ ${version.server} ${version.server} - 5.0.0.Final - 4.2.1.Final - 10.0.0.Final + 5.0.0.Beta2 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/pom.xml b/microprofile-health/pom.xml index fc3e1ebe4a..a902324903 100644 --- a/microprofile-health/pom.xml +++ b/microprofile-health/pom.xml @@ -23,9 +23,7 @@ ${version.server} ${version.server} - 5.0.0.Final - 4.2.1.Final - 10.0.0.Final + 5.0.0.Beta2 @@ -157,11 +155,6 @@ wildfly-maven-plugin ${version.plugin.wildfly} - - org.wildfly.plugins - wildfly-jar-maven-plugin - ${version.plugin.wildfly-jar} - @@ -172,7 +165,7 @@ - ${version.microprofile.bom} + ${version.bom.microprofile} @@ -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/pom.xml b/microprofile-jwt/pom.xml index b50154616c..756ff448c5 100644 --- a/microprofile-jwt/pom.xml +++ b/microprofile-jwt/pom.xml @@ -48,9 +48,7 @@ ${version.server} ${version.server} - 5.0.0.Final - 4.2.1.Final - 10.0.0.Final + 5.0.0.Beta2 8.5.1.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/pom.xml b/microprofile-lra/pom.xml index c8f6078e02..f1acf25671 100644 --- a/microprofile-lra/pom.xml +++ b/microprofile-lra/pom.xml @@ -23,9 +23,7 @@ ${version.server} ${version.server} - 5.0.0.Final - 4.2.1.Final - 10.0.0.Final + 5.0.0.Beta2 @@ -152,11 +150,6 @@ wildfly-maven-plugin ${version.plugin.wildfly} - - org.wildfly.plugins - wildfly-jar-maven-plugin - ${version.plugin.wildfly-jar} - @@ -168,17 +161,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 @@ -199,19 +195,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/pom.xml b/microprofile-openapi/pom.xml index b2c595ef2f..115cb68419 100644 --- a/microprofile-openapi/pom.xml +++ b/microprofile-openapi/pom.xml @@ -25,9 +25,7 @@ ${version.server} ${version.server} - 5.0.0.Final - 4.2.1.Final - 10.0.0.Final + 5.0.0.Beta2 @@ -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/pom.xml b/microprofile-reactive-messaging-kafka/pom.xml index 43ae03fc7f..8302614bc9 100644 --- a/microprofile-reactive-messaging-kafka/pom.xml +++ b/microprofile-reactive-messaging-kafka/pom.xml @@ -40,9 +40,7 @@ ${version.server} ${version.server} - 5.0.0.Final - 4.2.1.Final - 10.0.0.Final + 5.0.0.Beta2 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/pom.xml b/microprofile-rest-client/pom.xml index 4dedeef398..b9b17fc6b3 100644 --- a/microprofile-rest-client/pom.xml +++ b/microprofile-rest-client/pom.xml @@ -46,9 +46,7 @@ ${version.server} ${version.server} - 5.0.0.Final - 4.2.1.Final - 10.0.0.Final + 5.0.0.Beta2 6.2.6.Final 5.10.1 @@ -194,34 +192,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.wildfly-jar.maven.plugin} - - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - - jaxrs-server - microprofile-platform - - - true - @@ -235,7 +205,18 @@ org.wildfly.plugins - wildfly-jar-maven-plugin + wildfly-maven-plugin + + + ${version.server} + + true + + ROOT.war + @@ -256,22 +237,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/pom.xml b/numberguess/pom.xml index dc113701a8..fa5f9c9650 100644 --- a/numberguess/pom.xml +++ b/numberguess/pom.xml @@ -47,8 +47,7 @@ 31.0.0.Beta1 ${version.server} - 5.0.0.Final - 4.2.1.Final + 5.0.0.Beta2 @@ -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/remote-helloworld-mdb/pom.xml b/remote-helloworld-mdb/pom.xml index cf6fe96a42..eb901c6119 100644 --- a/remote-helloworld-mdb/pom.xml +++ b/remote-helloworld-mdb/pom.xml @@ -48,8 +48,7 @@ 31.0.0.Beta1 ${version.server} - 5.0.0.Final - 4.2.1.Final + 5.0.0.Beta2 5.10.0 @@ -163,6 +162,18 @@ + + + + + org.wildfly.plugins + wildfly-maven-plugin + ${version.plugin.wildfly} + + + + + provisioned-server @@ -172,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 @@ -204,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/pom.xml b/servlet-async/pom.xml index e804a1e681..c0eaa5275a 100644 --- a/servlet-async/pom.xml +++ b/servlet-async/pom.xml @@ -48,8 +48,7 @@ 31.0.0.Beta1 ${version.server} - 5.0.0.Final - 4.2.1.Final + 5.0.0.Beta2 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/pom.xml b/servlet-filterlistener/pom.xml index c0dbc39a98..f5fef339dc 100644 --- a/servlet-filterlistener/pom.xml +++ b/servlet-filterlistener/pom.xml @@ -48,8 +48,7 @@ 31.0.0.Beta1 ${version.server} - 5.0.0.Final - 4.2.1.Final + 5.0.0.Beta2 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/pom.xml b/servlet-security/pom.xml index bdba0c0063..3c021d48c3 100644 --- a/servlet-security/pom.xml +++ b/servlet-security/pom.xml @@ -48,9 +48,7 @@ 31.0.0.Beta1 ${version.server} - 5.0.0.Final - 6.0.0.Final - 4.2.1.Final + 5.0.0.Beta2 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/spring-resteasy/pom.xml b/spring-resteasy/pom.xml index c52defb980..6aeda2d566 100644 --- a/spring-resteasy/pom.xml +++ b/spring-resteasy/pom.xml @@ -52,8 +52,7 @@ 31.0.0.Beta1 ${version.server} - 5.0.0.Final - 4.2.1.Final + 5.0.0.Beta2 6.0.4 @@ -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/pom.xml b/temperature-converter/pom.xml index c66bb2d93d..d1123a6e5e 100644 --- a/temperature-converter/pom.xml +++ b/temperature-converter/pom.xml @@ -48,8 +48,7 @@ 31.0.0.Beta1 ${version.server} - 5.0.0.Final - 4.2.1.Final + 5.0.0.Beta2 @@ -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/pom.xml b/thread-racing/pom.xml index c79a81192f..130a839575 100644 --- a/thread-racing/pom.xml +++ b/thread-racing/pom.xml @@ -48,8 +48,7 @@ 31.0.0.Beta1 ${version.server} - 5.0.0.Final - 4.2.1.Final + 5.0.0.Beta2 @@ -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/pom.xml b/todo-backend/pom.xml index b9916d5190..0f7f2a4396 100644 --- a/todo-backend/pom.xml +++ b/todo-backend/pom.xml @@ -48,9 +48,7 @@ 31.0.0.Beta1 ${version.server} - 5.0.0.Final - 6.0.0.Final - 4.2.1.Final + 5.0.0.Beta2 @@ -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/pom.xml b/websocket-endpoint/pom.xml index 9ec5088bc0..dd354eff26 100644 --- a/websocket-endpoint/pom.xml +++ b/websocket-endpoint/pom.xml @@ -48,8 +48,7 @@ 31.0.0.Beta1 ${version.server} - 5.0.0.Final - 4.2.1.Final + 5.0.0.Beta2 5.9.1 1.1.5 @@ -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/pom.xml b/websocket-hello/pom.xml index 6b1efb3874..b11f61e5fd 100644 --- a/websocket-hello/pom.xml +++ b/websocket-hello/pom.xml @@ -48,8 +48,7 @@ 31.0.0.Beta1 ${version.server} - 5.0.0.Final - 4.2.1.Final + 5.0.0.Beta2 @@ -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