diff --git a/.github/workflows/project_ci.yml b/.github/workflows/project_ci.yml index 1c6a1c9fa0..0ae18a3f1a 100644 --- a/.github/workflows/project_ci.yml +++ b/.github/workflows/project_ci.yml @@ -41,45 +41,46 @@ jobs: # Use the shared-wildfly-build workflow to have a consistent WildFly build. Note the branch names MUST match what # is used in WildFly. - WildFly-build: - uses: wildfly/wildfly/.github/workflows/shared-wildfly-build.yml@main - with: - wildfly-branch: ${{ github.base_ref }} - wildfly-repo: "wildfly/wildfly" - - Test-build-with-deps-matrix: - name: BUILD WITH DEPS - JDK${{ matrix.jdk }} - ${{ matrix.os }} - runs-on: ${{ matrix.os }} - needs: WildFly-build - strategy: - fail-fast: false - matrix: - jdk: [11, 17] - os: [ubuntu-20.04, windows-latest] - steps: - - uses: actions/checkout@v4 - with: - path: quickstarts - - uses: actions/download-artifact@v4 - with: - name: wildfly-maven-repository - path: . - - name: Extract Maven Repo - shell: bash - run: tar -xzf wildfly-maven-repository.tar.gz -C ~ - - name: Set up JDK ${{ matrix.jdk }} - uses: actions/setup-java@v4 - with: - java-version: ${{ matrix.jdk }} - distribution: 'temurin' - cache: 'maven' - - 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 }} - shell: bash - - uses: actions/upload-artifact@v4 - if: failure() - with: - name: surefire-reports-JDK${{ matrix.jdk }}-${{ matrix.os }} - path: 'quickstarts/**/surefire-reports/*.txt' +# WildFly-build: +# uses: wildfly/wildfly/.github/workflows/shared-wildfly-build.yml@main +# with: +# wildfly-branch: ${{ github.base_ref }} +# wildfly-repo: "wildfly/wildfly" +# +# Test-build-with-deps-matrix: +# name: BUILD WITH DEPS - JDK${{ matrix.jdk }} - ${{ matrix.os }} +# runs-on: ${{ matrix.os }} +# needs: WildFly-build +# if: +# strategy: +# fail-fast: false +# matrix: +# jdk: [11, 17] +# os: [ubuntu-20.04, windows-latest] +# steps: +# - uses: actions/checkout@v4 +# with: +# path: quickstarts +# - uses: actions/download-artifact@v4 +# with: +# name: wildfly-maven-repository +# path: . +# - name: Extract Maven Repo +# shell: bash +# run: tar -xzf wildfly-maven-repository.tar.gz -C ~ +# - name: Set up JDK ${{ matrix.jdk }} +# uses: actions/setup-java@v4 +# with: +# java-version: ${{ matrix.jdk }} +# distribution: 'temurin' +# cache: 'maven' +# - 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 }} +# shell: bash +# - uses: actions/upload-artifact@v4 +# if: failure() +# with: +# name: surefire-reports-JDK${{ matrix.jdk }}-${{ matrix.os }} +# path: 'quickstarts/**/surefire-reports/*.txt' diff --git a/.github/workflows/quickstart_ci.yml b/.github/workflows/quickstart_ci.yml index 5f5db8e3e9..8fe4f5a203 100644 --- a/.github/workflows/quickstart_ci.yml +++ b/.github/workflows/quickstart_ci.yml @@ -102,10 +102,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 echo "Testing provisioned server..." @@ -121,11 +123,14 @@ 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 + # 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 + java -jar ${{ inputs.DEPLOYMENT_DIR }}/target/server-bootable.jar & + # Sleep to wait for server to start (we should have a wait) + sleep 20 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 }} @@ -152,105 +157,110 @@ jobs: # Use the shared-wildfly-build workflow to have a consistent WildFly build. Note the branch names MUST match what # is used in WildFly. - WildFly-build: - uses: wildfly/wildfly/.github/workflows/shared-wildfly-build.yml@main - with: - wildfly-branch: ${{ github.base_ref }} - wildfly-repo: "wildfly/wildfly" - - Test-build-with-deps-matrix: - name: BUILD WITH DEPS - JDK${{ matrix.jdk }} - ${{ matrix.os }} - runs-on: ${{ matrix.os }} - needs: [Matrix-Setup, WildFly-build] - strategy: - fail-fast: false - matrix: - jdk: ${{ fromJSON(needs.Matrix-Setup.outputs.jdk) }} - os: ${{ fromJSON(needs.Matrix-Setup.outputs.os) }} - steps: - - uses: actions/checkout@v4 - with: - path: quickstarts - - uses: actions/download-artifact@v4 - with: - name: wildfly-maven-repository - path: . - - name: Extract Maven Repo - shell: bash - run: tar -xzf wildfly-maven-repository.tar.gz -C ~ - - name: Set up JDK ${{ matrix.jdk }} - uses: actions/setup-java@v4 - with: - java-version: ${{ matrix.jdk }} - distribution: 'temurin' - cache: 'maven' - - name: Run before script - env: - FILE: "./quickstarts/.github/workflows/quickstart_${{ inputs.QUICKSTART_PATH }}_ci_before.sh" - run: | - if test -f $FILE; - then - chmod +x $FILE - bash $FILE - fi - shell: bash - - name: Build Quickstart for Release with built Server version - run: | - cd quickstarts - cd ${{ inputs.QUICKSTART_PATH }} - mvn -fae clean package -Drelease -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} - shell: bash - - name: Build, run & test ${{ inputs.QUICKSTART_PATH }} Quickstart with provisioned-server profile, and built Server version - if: ${{ inputs.TEST_PROVISIONED_SERVER }} - run: | - 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' - echo "Starting provisioned server..." - mvn -f ${{ inputs.DEPLOYMENT_DIR }}/pom.xml wildfly:start -DjbossHome=${{ inputs.DEPLOYMENT_DIR }}/target/server -Dstartup-timeout=120 - echo "Testing provisioned server..." - mvn -fae verify -Dserver.host=${{ inputs.SERVER_PROVISIONING_SERVER_HOST }} -Pintegration-testing - echo "Shutting down provisioned server..." - mvn -f ${{ inputs.DEPLOYMENT_DIR }}/pom.xml wildfly:shutdown - shell: bash - - name: Build, run & test ${{ inputs.QUICKSTART_PATH }} Quickstart with bootable-jar profile, and built Server version - if: ${{ inputs.TEST_BOOTABLE_JAR }} - run: | - cd quickstarts - cd ${{ inputs.QUICKSTART_PATH }} - echo "Building bootable jar..." - mvn -fae clean package -Pbootable-jar -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} - 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 - 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 - 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 }} - shell: bash - - name: Run after script - env: - FILE: "./quickstarts/.github/workflows/quickstart_${{ inputs.QUICKSTART_PATH }}_ci_after.sh" - run: | - if test -f $FILE; - then - chmod +x $FILE - bash $FILE - fi - shell: bash - - uses: actions/upload-artifact@v4 - if: failure() - with: - name: surefire-reports-JDK${{ matrix.jdk }}-${{ matrix.os }} - path: 'quickstarts/**/surefire-reports/*.txt' \ No newline at end of file +# WildFly-build: +# uses: wildfly/wildfly/.github/workflows/shared-wildfly-build.yml@main +# with: +# wildfly-branch: ${{ github.base_ref }} +# wildfly-repo: "wildfly/wildfly" +# +# Test-build-with-deps-matrix: +# name: BUILD WITH DEPS - JDK${{ matrix.jdk }} - ${{ matrix.os }} +# runs-on: ${{ matrix.os }} +# needs: [Matrix-Setup, WildFly-build] +# strategy: +# fail-fast: false +# matrix: +# jdk: ${{ fromJSON(needs.Matrix-Setup.outputs.jdk) }} +# os: ${{ fromJSON(needs.Matrix-Setup.outputs.os) }} +# steps: +# - uses: actions/checkout@v4 +# with: +# path: quickstarts +# - uses: actions/download-artifact@v4 +# with: +# name: wildfly-maven-repository +# path: . +# - name: Extract Maven Repo +# shell: bash +# run: tar -xzf wildfly-maven-repository.tar.gz -C ~ +# - name: Set up JDK ${{ matrix.jdk }} +# uses: actions/setup-java@v4 +# with: +# java-version: ${{ matrix.jdk }} +# distribution: 'temurin' +# cache: 'maven' +# - name: Run before script +# env: +# FILE: "./quickstarts/.github/workflows/quickstart_${{ inputs.QUICKSTART_PATH }}_ci_before.sh" +# run: | +# if test -f $FILE; +# then +# chmod +x $FILE +# bash $FILE +# fi +# shell: bash +# - name: Build Quickstart for Release with built Server version +# run: | +# cd quickstarts +# cd ${{ inputs.QUICKSTART_PATH }} +# mvn -fae clean package -Drelease -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} +# shell: bash +# - name: Build, run & test ${{ inputs.QUICKSTART_PATH }} Quickstart with provisioned-server profile, and built Server version +# if: ${{ inputs.TEST_PROVISIONED_SERVER }} +# run: | +# cd quickstarts +# cd ${{ inputs.QUICKSTART_PATH }} +# echo "Building provisioned server..." +# mvn -fae clean package -Pprovisioned-server -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} +# 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 +# echo "Testing provisioned server..." +# mvn -fae verify -Dserver.host=${{ inputs.SERVER_PROVISIONING_SERVER_HOST }} -Pintegration-testing +# echo "Shutting down provisioned server..." +# mvn -f ${{ inputs.DEPLOYMENT_DIR }}/pom.xml wildfly:shutdown +# shell: bash +# - name: Build, run & test ${{ inputs.QUICKSTART_PATH }} Quickstart with bootable-jar profile, and built Server version +# if: ${{ inputs.TEST_BOOTABLE_JAR }} +# run: | +# cd quickstarts +# cd ${{ inputs.QUICKSTART_PATH }} +# echo "Building bootable jar..." +# mvn -fae clean package -Pbootable-jar -Dversion.server=${{ needs.wildfly-build.outputs.wildfly-version }} +# 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 +# java -jar ${{ inputs.DEPLOYMENT_DIR }}/target/server-bootable.jar & +# # Sleep to wait for server to start (we should have a wait) +# sleep 20 +# 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: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 }} +# shell: bash +# - name: Run after script +# env: +# FILE: "./quickstarts/.github/workflows/quickstart_${{ inputs.QUICKSTART_PATH }}_ci_after.sh" +# run: | +# if test -f $FILE; +# then +# chmod +x $FILE +# bash $FILE +# fi +# shell: bash +# - uses: actions/upload-artifact@v4 +# if: failure() +# with: +# name: surefire-reports-JDK${{ matrix.jdk }}-${{ matrix.os }} +# path: 'quickstarts/**/surefire-reports/*.txt' \ No newline at end of file diff --git a/.github/workflows/quickstart_todo-backend_ci.yml b/.github/workflows/quickstart_todo-backend_ci.yml index 33986121e2..b08099b8a7 100644 --- a/.github/workflows/quickstart_todo-backend_ci.yml +++ b/.github/workflows/quickstart_todo-backend_ci.yml @@ -13,4 +13,4 @@ jobs: QUICKSTART_PATH: todo-backend TEST_PROVISIONED_SERVER: true TEST_OPENSHIFT: true - MATRIX_OS: "ubuntu-latest" \ No newline at end of file + MATRIX_OS: '"ubuntu-latest"' \ No newline at end of file diff --git a/batch-processing/pom.xml b/batch-processing/pom.xml index e3d5fdff5e..2beeb05f1b 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.Beta1 @@ -255,18 +254,12 @@ 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 +282,13 @@ 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 678c9ffa3f..ee43d5c99b 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.Beta1 @@ -195,18 +194,13 @@ 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 +222,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 - 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 4f63f26917..d695145e60 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.Beta1 @@ -199,18 +198,13 @@ 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 +226,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 - 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 31b31c9182..4c1f7a05f6 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.Beta1 @@ -179,15 +178,9 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - - - cloud-server - + + ${version.server} + ROOT.war @@ -219,17 +212,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 - + + ${version.server} + cloud + ROOT.war diff --git a/ejb-remote/pom.xml b/ejb-remote/pom.xml index aa2abaa49d..9c6fc42efc 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.Beta1 @@ -168,16 +167,12 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - - - cloud-server - ejb - + + ${version.server} + + wildfly-cli + + ROOT.war @@ -200,18 +195,13 @@ 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 3a8d080f4c..8a3d63fcdd 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.Beta1 @@ -191,16 +190,17 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - - - cloud-server - ejb - + + ${version.server} + + wildfly-cli + + + false + diff --git a/ejb-security-programmatic-auth/pom.xml b/ejb-security-programmatic-auth/pom.xml index fcbaaab35c..2b12b647c9 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.Beta1 @@ -215,16 +214,17 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - - - cloud-server - ejb - + + ${version.server} + + false + + wildfly-cli + + diff --git a/ejb-timer/pom.xml b/ejb-timer/pom.xml index d5e8591a6a..bcea7b6f9a 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.Beta1 @@ -180,16 +179,9 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - - - cloud-server - ejb - + + ${version.server} + ROOT.war @@ -212,18 +204,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 - + + ${version.server} + cloud + ROOT.war diff --git a/helloworld-jms/pom.xml b/helloworld-jms/pom.xml index 837ff3142f..6244f40ca3 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.Beta1 5.10.0 @@ -166,16 +165,13 @@ 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 +202,13 @@ 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 5ce893d195..cba60fb4be 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.Beta1 5.10.0 @@ -183,16 +182,12 @@ 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 +209,13 @@ 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 2c6ba1c7ce..3228125d75 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.Beta1 @@ -186,15 +185,9 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - - cloud-server - webservices - + + ${version.server} + ROOT.war @@ -217,18 +210,10 @@ 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 d975c96d0e..905cebd6ea 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.Beta1 @@ -156,15 +155,9 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - - - cloud-server - + + ${version.server} + ROOT.war @@ -187,17 +180,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 - + + ${version.server} + cloud + ROOT.war diff --git a/hibernate/pom.xml b/hibernate/pom.xml index 6ff423e89a..baa1bd89d1 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.Beta1 5.9.1 @@ -221,19 +219,14 @@ 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 +257,15 @@ 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 6122e6975d..199d62dcdb 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.Beta1 diff --git a/http-custom-mechanism/webapp/pom.xml b/http-custom-mechanism/webapp/pom.xml index 26aa230fc1..bea39ae249 100644 --- a/http-custom-mechanism/webapp/pom.xml +++ b/http-custom-mechanism/webapp/pom.xml @@ -71,15 +71,12 @@ 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 5e77cb3101..cc8288ed9f 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.Beta1 9.37.1 5.10.1 @@ -141,14 +140,6 @@ ${version.plugin.wildfly} ${jboss.home} - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - - jaxrs-server - @@ -172,10 +163,9 @@ ROOT.war - - jaxrs-server - cloud-server - + + ${version.server} + @@ -198,10 +188,10 @@ ROOT.war - - jaxrs-server - cloud-server - + + ${version.server} + cloud + diff --git a/jaxrs-jwt/pom.xml b/jaxrs-jwt/pom.xml index e958b67027..1de44e36c1 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.Beta1 9.37.1 5.10.1 @@ -142,14 +141,6 @@ ${version.plugin.wildfly} ${jboss.home} - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - - ee-core-profile-server - @@ -176,11 +167,17 @@ wildfly-maven-plugin - ROOT.war + ROOT.war +<<<<<<< Updated upstream + + ${version.server} + +======= ee-core-profile-server cloud-server +>>>>>>> Stashed changes @@ -212,11 +209,18 @@ wildfly-maven-plugin - ROOT.war + ROOT.war +<<<<<<< Updated upstream + + ${version.server} + cloud + +======= ee-core-profile-server cloud-server +>>>>>>> Stashed changes diff --git a/jaxws-ejb/pom.xml b/jaxws-ejb/pom.xml index ff5e423941..1f281646cf 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.Beta1 @@ -196,16 +195,9 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - - cloud-server - ejb - webservices - + + ${version.server} + ROOT.war @@ -228,19 +220,10 @@ 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 218004bd4b..25b08ae6aa 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.Beta1 1.3.0.Final @@ -223,16 +222,9 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - - cloud-server - ejb - webservices - + + ${version.server} + ROOT.war @@ -255,19 +247,10 @@ 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 6fdda1a28c..7601ef757e 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.Beta1 @@ -208,16 +207,9 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - - - jsf - cloud-server - + + ${version.server} + ROOT.war @@ -240,18 +232,10 @@ 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 85df02fb8a..048fa93a45 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.Beta1 @@ -289,17 +288,9 @@ 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 +312,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 - 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 93ba7d0e9f..64d79a5d7e 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.Beta1 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,23 @@ 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 +199,24 @@ 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 2bbd7d4574..07222addf3 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.Beta1 4.15.0 5.6.2 @@ -200,18 +199,9 @@ 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 368ff6f94c..c3e0c382ed 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.Beta1 @@ -171,11 +169,6 @@ wildfly-maven-plugin ${version.plugin.wildfly} - - org.wildfly.plugins - wildfly-jar-maven-plugin - ${version.plugin.wildfly-jar} - @@ -199,16 +192,13 @@ 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 +219,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 - microprofile-config - + + ${version.server} + cloud + ROOT.war diff --git a/microprofile-fault-tolerance/pom.xml b/microprofile-fault-tolerance/pom.xml index 40d6266095..b952e566cd 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.Beta1 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,13 @@ 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,19 +258,11 @@ 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 - - ROOT.war + + ${version.server} + cloud + + ROOT.war diff --git a/microprofile-health/pom.xml b/microprofile-health/pom.xml index 9a2d82e570..5e96f7fc35 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.Beta1 @@ -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,13 @@ 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 +206,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 - microprofile-health - + + ${version.server} + cloud + ROOT.war diff --git a/microprofile-jwt/pom.xml b/microprofile-jwt/pom.xml index 6b9e296da9..1288a12f34 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.Beta1 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,23 @@ - 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 +269,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 - microprofile-jwt - + + ${version.server} + cloud + ROOT.war diff --git a/microprofile-lra/pom.xml b/microprofile-lra/pom.xml index c0a31194a7..2179fbdd53 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.Beta1 @@ -152,11 +150,6 @@ wildfly-maven-plugin ${version.plugin.wildfly} - - org.wildfly.plugins - wildfly-jar-maven-plugin - ${version.plugin.wildfly-jar} - @@ -168,17 +161,16 @@ 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 +191,13 @@ 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 898c85d01f..dd38c7022c 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.Beta1 @@ -134,11 +132,6 @@ wildfly-maven-plugin ${version.plugin.wildfly} - - org.wildfly.plugins - wildfly-jar-maven-plugin - ${version.plugin.wildfly-jar} - @@ -149,26 +142,26 @@ - org.wildfly.plugins - wildfly-jar-maven-plugin - - wildfly@maven(org.jboss.universe:community-universe)#${version.server} - - jaxrs-server - microprofile-openapi - - - true - - - - - - package - - - - + org.wildfly.plugins + wildfly-maven-plugin + + + ${version.server} + + openapi + + + true + ROOT.war + + + + + package + + + + @@ -180,18 +173,13 @@ 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 57caa8f329..145f1b78ff 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.Beta1 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} - @@ -282,27 +275,23 @@ - org.wildfly.plugins - wildfly-jar-maven-plugin - - wildfly@maven(org.jboss.universe:community-universe)#${version.server} - - cloud-server - h2-default-datasource - microprofile-reactive-messaging-kafka - - - true - - - - - - package - - - - + org.wildfly.plugins + wildfly-maven-plugin + + + ${version.server} + + true + ROOT.war + + + + + package + + + + @@ -315,19 +304,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 - 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 22e4b9efc9..363153e75f 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.Beta1 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,14 @@ org.wildfly.plugins - wildfly-jar-maven-plugin + wildfly-maven-plugin + + + ${version.server} + + true + ROOT.war + @@ -256,22 +233,12 @@ 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 399e9aaf3f..5143deca4c 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.Beta1 @@ -172,15 +171,9 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - - cloud-server - jsf - + + ${version.server} + ROOT.war @@ -202,18 +195,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 - jsf - + + ${version.server} + cloud + ROOT.war diff --git a/remote-helloworld-mdb/pom.xml b/remote-helloworld-mdb/pom.xml index 9559284a5f..7b20d30a0d 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.Beta1 5.10.0 @@ -163,6 +162,18 @@ + + + + + org.wildfly.plugins + wildfly-maven-plugin + ${version.plugin.wildfly} + + + + + provisioned-server @@ -172,17 +183,12 @@ 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 +210,13 @@ 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 ee63abc56d..a3bef44872 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.Beta1 5.9.1 @@ -183,14 +182,9 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - - cloud-server - + + ${version.server} + ROOT.war @@ -212,17 +206,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 - + + ${version.server} + cloud + ROOT.war diff --git a/servlet-filterlistener/pom.xml b/servlet-filterlistener/pom.xml index 26c81423d0..70184dadb8 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.Beta1 5.9.1 @@ -183,14 +182,9 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - - cloud-server - + + ${version.server} + ROOT.war @@ -212,17 +206,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 - + + ${version.server} + cloud + ROOT.war diff --git a/servlet-security/pom.xml b/servlet-security/pom.xml index 839c63308a..56136b65ec 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.Beta1 5.9.1 @@ -183,18 +181,14 @@ 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 +219,15 @@ 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 d7cdb1acb7..4dad2b744e 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.Beta1 6.0.4 @@ -88,6 +87,20 @@ default + + spring-repo + Spring Repository + https://repo.spring.io/milestone + + true + never + + + true + never + + default + @@ -212,11 +225,14 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - + + ${version.server} + + false + ROOT.war @@ -239,15 +255,15 @@ 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 + + false + ROOT.war diff --git a/temperature-converter/pom.xml b/temperature-converter/pom.xml index b3705c079d..e817249adf 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.Beta1 @@ -189,16 +188,9 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - - cloud-server - ejb - jsf - + + ${version.server} + ROOT.war @@ -220,19 +212,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/thread-racing/pom.xml b/thread-racing/pom.xml index 4bafe87fb1..2b916e81b6 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.Beta1 @@ -238,18 +237,13 @@ 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 +265,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 - 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 046e5ec878..cee675b430 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.Beta1 @@ -196,18 +194,12 @@ 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 +231,13 @@ 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 +267,6 @@ org.apache.maven.plugins maven-failsafe-plugin - ${version.failsafe.plugin} diff --git a/websocket-endpoint/pom.xml b/websocket-endpoint/pom.xml index d0e9962251..809c81a830 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.Beta1 5.9.1 1.1.5 @@ -209,14 +208,9 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - - cloud-server - + + ${version.server} + ROOT.war @@ -238,17 +232,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 - + + ${version.server} + cloud + ROOT.war diff --git a/websocket-hello/pom.xml b/websocket-hello/pom.xml index e46d6bb193..70e572c625 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.Beta1 @@ -160,14 +159,9 @@ org.wildfly.plugins wildfly-maven-plugin - - - org.wildfly:wildfly-galleon-pack:${version.server} - - - - cloud-server - + + ${version.server} + ROOT.war @@ -189,17 +183,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 - + + ${version.server} + cloud + ROOT.war