Merge pull request #316 from jamezp/update-workflows

Update the workflow files and the README
resteasy · Jun 21, 2024 · 8a4588e · 8a4588e
2 parents 2aff5ef + afee6ca
commit 8a4588e
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 41 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -12,12 +12,12 @@ on:
       - '**/pom.xml'
       - 'config/**'
       - 'context-propagation/**'
-      - 'galleon-pack/**'
       - 'rest-client/**'
       - 'rest-client-base/**'
       - 'resteasy-microprofile-bom/**'
       - 'resteasy-microprofile-test-bom/**'
       - 'testsuite/**'
+      - 'wildfly/**'
   pull_request:
     branches:
       - '**'
@@ -26,12 +26,12 @@ on:
       - '**/pom.xml'
       - 'config/**'
       - 'context-propagation/**'
-      - 'galleon-pack/**'
       - 'rest-client/**'
       - 'rest-client-base/**'
       - 'resteasy-microprofile-bom/**'
       - 'resteasy-microprofile-test-bom/**'
       - 'testsuite/**'
+      - 'wildfly/**'
 
 # Only run the latest job
 concurrency:
@@ -66,7 +66,6 @@ jobs:
           name: surefire-reports-${{ matrix.os }}-${{ matrix.java }}
           path: |
             '**/surefire-reports/'
-            !galleon-pack/
 
   additional-profiles:
     name: Test with ${{ matrix.profile }} - JDK ${{ matrix.java }}
@@ -96,7 +95,6 @@ jobs:
           name: surefire-reports-${{ matrix.profile }}-${{ matrix.java }}
           path: |
             '**/surefire-reports/'
-            !galleon-pack/
 
   provision-preview:
     name: Test Provisioning with Preview - JDK ${{ matrix.java }}
@@ -124,7 +122,6 @@ jobs:
           name: surefire-reports-preview-${{ matrix.java }}
           path: |
             '**/surefire-reports/'
-            !galleon-pack/
 
   format-check:
     name: Check Code Formatting

diff --git a/.github/workflows/resteasy-build.yml b/.github/workflows/resteasy-build.yml
@@ -12,12 +12,12 @@ on:
       - '**/pom.xml'
       - 'config/**'
       - 'context-propagation/**'
-      - 'galleon-pack/**'
       - 'rest-client/**'
       - 'rest-client-base/**'
       - 'resteasy-microprofile-bom/**'
       - 'resteasy-microprofile-test-bom/**'
       - 'testsuite/**'
+      - 'wildfly/**'
   pull_request:
     branches:
       - '**'
@@ -73,20 +73,17 @@ jobs:
           name: surefire-reports-${{ matrix.os }}-${{ matrix.java }}
           path: |
             '**/surefire-reports/'
-            !galleon-pack/
       - uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: failsafe-reports-${{ matrix.os }}-${{ matrix.java }}
           path: |
             '**/failsafe-reports/'
-            !galleon-pack/
       - name: Upload server logs
         uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: server-logs-${{ matrix.os }}-${{ matrix.java }}
           path: |
             '**/*.log'
-            !galleon-pack/
 
diff --git a/.github/workflows/wildfly-build.yml b/.github/workflows/wildfly-build.yml
@@ -11,12 +11,12 @@ on:
       - '**/pom.xml'
       - 'config/**'
       - 'context-propagation/**'
-      - 'galleon-pack/**'
       - 'rest-client/**'
       - 'rest-client-base/**'
       - 'resteasy-microprofile-bom/**'
       - 'resteasy-microprofile-test-bom/**'
       - 'testsuite/**'
+      - 'wildfly/**'
   pull_request:
     branches:
       - '**'
@@ -70,12 +70,10 @@ jobs:
           name: surefire-reports-${{ matrix.os }}-${{ matrix.java }}
           path: |
             '**/surefire-reports/'
-            !galleon-pack/
       - name: Upload server logs
         uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: server-logs-${{ matrix.os }}-${{ matrix.java }}
           path: |
             '**/*.log'
-            !galleon-pack/
diff --git a/README.adoc b/README.adoc
@@ -33,7 +33,7 @@ The simplest way to use these dependencies is to import the BOM.
 === RESTEasy MicroProfile Client
 
 This is an implementation of the
-https://download.eclipse.org/microprofile/microprofile-rest-client-2.0/microprofile-rest-client-spec-2.0.html[MicroProfile REST Client].
+https://download.eclipse.org/microprofile/microprofile-rest-client-4.0-RC1/microprofile-rest-client-spec-4.0-RC1.html[MicroProfile REST Client].
 
 [source,xml]
 ----
@@ -45,9 +45,9 @@ https://download.eclipse.org/microprofile/microprofile-rest-client-2.0/microprof
 
 === RESTEasy Config
 
-This uses the https://download.eclipse.org/microprofile/microprofile-config-2.0/microprofile-config-spec-2.0.html[MicroProfile Config]
+This uses the https://download.eclipse.org/microprofile/microprofile-config-3.1/microprofile-config-spec-3.1.html[MicroProfile Config]
 to define some
-https://download.eclipse.org/microprofile/microprofile-config-2.0/apidocs/org/eclipse/microprofile/config/spi/ConfigSource.html[ConfigSource]
+https://download.eclipse.org/microprofile/microprofile-config-3.1/apidocs/org/eclipse/microprofile/config/spi/ConfigSource.html[ConfigSource]
 options.
 
 The current sources for finding properties are:
@@ -85,32 +85,30 @@ The MicroProfile REST Client implementation and MicroProfile Config sources are
 like to upgrade or add all the modules to a provisioned WildFly server, you can use the
 https://docs.wildfly.org/galleon/[Galleon] tooling to do so.
 
-==== Galleon CLI
-
-----
-galleon.sh install org.jboss.resteasy.microprofile:galleon-feature-pack:$VERSION
-----
-
-
 ==== Maven
 
 [source,xml]
 ----
 <plugin>
-    <groupId>org.jboss.galleon</groupId>
-    <artifactId>galleon-maven-plugin</artifactId>
+    <groupId>org.wildfly.plugins</groupId>
+    <artifactId>wildfly-maven-plugin</artifactId>
     <configuration>
-        <install-dir>${jboss.home}</install-dir>
-        <record-state>false</record-state>
-        <plugin-options>
-            <jboss-maven-dist/>
+        <provisioning-dir>${jboss.home}</provisioning-dir>
+        <galleon-options>
             <jboss-fork-embedded>true</jboss-fork-embedded>
-            <optional-packages>passive+</optional-packages>`
-        </plugin-options>
+            <jboss-maven-dist/>
+        </galleon-options>
         <feature-packs>
             <feature-pack>
                 <groupId>org.wildfly</groupId>
                 <artifactId>wildfly-galleon-pack</artifactId>
+                <inherit-configs>false</inherit-configs>
+                <included-configs>
+                    <config>
+                        <model>standalone</model>
+                        <name>standalone.xml</name>
+                    </config>
+                </included-configs>
             </feature-pack>
         </feature-packs>
         <channels>
@@ -134,17 +132,11 @@ galleon.sh install org.jboss.resteasy.microprofile:galleon-feature-pack:$VERSION
                 </manifest>
             </channel>
         </channels>
-        <configurations>
-            <config>
-                <model>standalone</model>
-                <name>standalone.xml</name>
-                <layers>
-                    <layer>cdi</layer>
-                    <layer>jaxrs-server</layer>
-                    <layer>microprofile-config</layer>
-                </layers>
-            </config>
-        </configurations>
+        <layers>
+            <layer>cdi</layer>
+            <layer>jaxrs-server</layer>
+            <layer>microprofile-config</layer>
+        </layers>
     </configuration>
     <executions>
         <execution>