diff --git a/.github/workflows/wildfly-build.yml b/.github/workflows/wildfly-build.yml index 5b83fc9b..6deae3c7 100644 --- a/.github/workflows/wildfly-build.yml +++ b/.github/workflows/wildfly-build.yml @@ -62,7 +62,7 @@ jobs: distribution: 'temurin' cache: 'maven' - name: Build with Maven Java ${{ matrix.java }} - run: mvn -B clean install '-Dversion.org.wildfly=${{ needs.wildfly-build.outputs.wildfly-version }}' + run: mvn -B clean install '-Dserver.version=${{ needs.wildfly-build.outputs.wildfly-version }}' - name: Upload surefire reports uses: actions/upload-artifact@v4 if: failure() diff --git a/pom.xml b/pom.xml index 03bd4b49..7e76beaa 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,6 @@ 2.2.1.Final 6.2.9.Final - 32.0.1.Final 1.7.0.Final @@ -115,7 +114,6 @@ rest-client-base rest-client context-propagation - wildfly/galleon-pack wildfly/resteasy-microprofile-channel testsuite diff --git a/wildfly/galleon-pack/common/pom.xml b/wildfly/galleon-pack/common/pom.xml deleted file mode 100644 index d8c564ad..00000000 --- a/wildfly/galleon-pack/common/pom.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - - - 4.0.0 - - org.jboss.resteasy.microprofile - galleon-pack - 3.0.0.Beta1-SNAPSHOT - - - galleon-feature-pack-common - RESTEasy MicroProfile: Galleon Feature Pack Common - - - - ${project.groupId} - microprofile-config - - - ${project.groupId} - microprofile-context-propagation - - - ${project.groupId} - microprofile-rest-client - - - ${project.groupId} - microprofile-rest-client-base - - - - org.eclipse.microprofile.rest.client - microprofile-rest-client-api - - - org.eclipse.microprofile.context-propagation - microprofile-context-propagation-api - - - - \ No newline at end of file diff --git a/wildfly/galleon-pack/common/src/main/resources/configs/standalone/model.xml b/wildfly/galleon-pack/common/src/main/resources/configs/standalone/model.xml deleted file mode 100644 index abd0c907..00000000 --- a/wildfly/galleon-pack/common/src/main/resources/configs/standalone/model.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/wildfly/galleon-pack/common/src/main/resources/modules/system/layers/base/org/eclipse/microprofile/context-propagation/main/module.xml b/wildfly/galleon-pack/common/src/main/resources/modules/system/layers/base/org/eclipse/microprofile/context-propagation/main/module.xml deleted file mode 100644 index 5365b618..00000000 --- a/wildfly/galleon-pack/common/src/main/resources/modules/system/layers/base/org/eclipse/microprofile/context-propagation/main/module.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - diff --git a/wildfly/galleon-pack/common/src/main/resources/modules/system/layers/base/org/eclipse/microprofile/restclient/main/module.xml b/wildfly/galleon-pack/common/src/main/resources/modules/system/layers/base/org/eclipse/microprofile/restclient/main/module.xml deleted file mode 100644 index 619464bd..00000000 --- a/wildfly/galleon-pack/common/src/main/resources/modules/system/layers/base/org/eclipse/microprofile/restclient/main/module.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/wildfly/galleon-pack/common/src/main/resources/modules/system/layers/base/org/jboss/resteasy/microprofile/config/main/module.xml b/wildfly/galleon-pack/common/src/main/resources/modules/system/layers/base/org/jboss/resteasy/microprofile/config/main/module.xml deleted file mode 100644 index b441d9b0..00000000 --- a/wildfly/galleon-pack/common/src/main/resources/modules/system/layers/base/org/jboss/resteasy/microprofile/config/main/module.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/wildfly/galleon-pack/common/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-client-microprofile/main/module.xml b/wildfly/galleon-pack/common/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-client-microprofile/main/module.xml deleted file mode 100755 index 4771bb70..00000000 --- a/wildfly/galleon-pack/common/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-client-microprofile/main/module.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/wildfly/galleon-pack/common/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-context-propagation/main/module.xml b/wildfly/galleon-pack/common/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-context-propagation/main/module.xml deleted file mode 100644 index ad92fff0..00000000 --- a/wildfly/galleon-pack/common/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-context-propagation/main/module.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/wildfly/galleon-pack/galleon-feature-pack/pom.xml b/wildfly/galleon-pack/galleon-feature-pack/pom.xml deleted file mode 100644 index aa52bfd7..00000000 --- a/wildfly/galleon-pack/galleon-feature-pack/pom.xml +++ /dev/null @@ -1,149 +0,0 @@ - - - - - - org.jboss.resteasy.microprofile - galleon-pack - 3.0.0.Beta1-SNAPSHOT - - 4.0.0 - - galleon-feature-pack - RESTEasy MicroProfile: Galleon Feature Pack - - - ${basedir}/../common/src/main/resources - - - - - - - ${project.groupId} - galleon-feature-pack-common - ${project.version} - pom - - - - - org.wildfly - wildfly-ee-galleon-pack - ${version.org.wildfly} - zip - - - org.wildfly - wildfly-galleon-pack - ${version.org.wildfly} - zip - - - org.jboss.resteasy - galleon-feature-pack - ${version.org.jboss.resteasy} - zip - - - org.wildfly - wildfly-ee-galleon-pack - - - - - - - - - - maven-clean-plugin - - - auto-clean - initialize - - clean - - - - - - org.apache.maven.plugins - maven-resources-plugin - - - - copy-common-feature-pack-resources - process-resources - - copy-resources - - - ${basedir}/target/resources - - - ${common.resources.directory} - - modules/**/module.xml - - - - ${common.resources.directory} - - modules/**/module.xml - - true - - - ${common.resources.directory} - - configs/**/model.xml - - - - true - - - - - - org.wildfly.galleon-plugins - wildfly-galleon-maven-plugin - - - wildfly-template-feature-pack-build - - build-feature-pack - - prepare-package - - ${galleon.fork.embedded} - - - - - - - - \ No newline at end of file diff --git a/wildfly/galleon-pack/galleon-feature-pack/wildfly-feature-pack-build.xml b/wildfly/galleon-pack/galleon-feature-pack/wildfly-feature-pack-build.xml deleted file mode 100644 index 87fa7a2f..00000000 --- a/wildfly/galleon-pack/galleon-feature-pack/wildfly-feature-pack-build.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - org.wildfly:wildfly-ee-galleon-pack - - - - - - org.wildfly:wildfly-galleon-pack - - - - org.jboss.resteasy:galleon-feature-pack - - - - - - \ No newline at end of file diff --git a/wildfly/galleon-pack/galleon-preview-feature-pack/pom.xml b/wildfly/galleon-pack/galleon-preview-feature-pack/pom.xml deleted file mode 100644 index f4056780..00000000 --- a/wildfly/galleon-pack/galleon-preview-feature-pack/pom.xml +++ /dev/null @@ -1,143 +0,0 @@ - - - - - - org.jboss.resteasy.microprofile - galleon-pack - 3.0.0.Beta1-SNAPSHOT - - 4.0.0 - - galleon-preview-feature-pack - RESTEasy MicroProfile: Galleon Preview Feature Pack - - - ${basedir}/../common/src/main/resources - - - - - - - ${project.groupId} - galleon-feature-pack-common - ${project.version} - pom - - - - - org.wildfly - wildfly-preview-feature-pack - ${version.org.wildfly} - zip - - - org.jboss.resteasy - galleon-preview-feature-pack - ${version.org.jboss.resteasy} - zip - - - org.wildfly - wildfly-preview-feature-pack - - - - - - - - - - maven-clean-plugin - - - auto-clean - initialize - - clean - - - - - - org.apache.maven.plugins - maven-resources-plugin - - - - copy-common-feature-pack-resources - process-resources - - copy-resources - - - ${basedir}/target/resources - - - ${common.resources.directory} - - modules/**/module.xml - - - - ${common.resources.directory} - - modules/**/module.xml - - true - - - ${common.resources.directory} - - configs/**/model.xml - - - - true - - - - - - org.wildfly.galleon-plugins - wildfly-galleon-maven-plugin - - - resteasy-galleon-preview-feature-pack - - build-feature-pack - - prepare-package - - ${galleon.fork.embedded} - - - - - - - - \ No newline at end of file diff --git a/wildfly/galleon-pack/galleon-preview-feature-pack/wildfly-feature-pack-build.xml b/wildfly/galleon-pack/galleon-preview-feature-pack/wildfly-feature-pack-build.xml deleted file mode 100644 index b4c8871c..00000000 --- a/wildfly/galleon-pack/galleon-preview-feature-pack/wildfly-feature-pack-build.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - org.wildfly:wildfly-preview-feature-pack - - - - org.jboss.resteasy:galleon-preview-feature-pack - - - - - - \ No newline at end of file diff --git a/wildfly/galleon-pack/pom.xml b/wildfly/galleon-pack/pom.xml deleted file mode 100644 index 6a41a59c..00000000 --- a/wildfly/galleon-pack/pom.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - 4.0.0 - - org.jboss.resteasy.microprofile - resteasy-microprofile-parent - 3.0.0.Beta1-SNAPSHOT - ../../pom.xml - - - galleon-pack - RESTEasy MicroProfile: Galleon Pack Parent - pom - - - common - galleon-feature-pack - galleon-preview-feature-pack - - - - - - ${project.groupId} - resteasy-microprofile-bom - ${project.version} - pom - import - - - - - \ No newline at end of file