Skip to content

Commit

Permalink
Merge pull request #314 from jamezp/issue307
Browse files Browse the repository at this point in the history
[307] Add a RESTEasy MicroProfile Channel and remove the feature pack
  • Loading branch information
jamezp authored Jun 21, 2024
2 parents 5b8b4fc + de1d6b2 commit 3210361
Show file tree
Hide file tree
Showing 17 changed files with 236 additions and 756 deletions.
34 changes: 1 addition & 33 deletions .github/workflows/wildfly-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -79,35 +79,3 @@ jobs:
path: |
'**/*.log'
!galleon-pack/
legacy-build:
runs-on: ${{ matrix.os }}
timeout-minutes: 90
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest ]
java: ['11', '17']
wildfly-version: ['28.0.1.Final']

steps:
- uses: actions/checkout@v4
- name: Set up JDK ${{ matrix.java }}
uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java }}
distribution: 'temurin'
cache: 'maven'
- name: Build with Maven Java ${{ matrix.java }} on WildFly ${{ matrix.wildfly-version }} - ${{ matrix.os }}
run: |
mvn clean install -U -B -fae '-Dserver.version=${{ matrix.wildfly-version }}' '-Dgithub.actions'
- uses: actions/upload-artifact@v4
if: failure()
with:
name: surefire-reports-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.wildfly-version }}
path: '**/surefire-reports/'
- uses: actions/upload-artifact@v4
if: failure()
with:
name: server-logs-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.wildfly-version }}
path: '**/server.log'
26 changes: 23 additions & 3 deletions README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -109,11 +109,31 @@ galleon.sh install org.jboss.resteasy.microprofile:galleon-feature-pack:$VERSION
</plugin-options>
<feature-packs>
<feature-pack>
<groupId>org.jboss.resteasy.microprofile</groupId>
<artifactId>galleon-feature-pack</artifactId>
<version>${version.org.jboss.resteasy.microprofile}</version>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-galleon-pack</artifactId>
</feature-pack>
</feature-packs>
<channels>
<channel>
<manifest>
<groupId>org.wildfly</groupId>
<artifactId>wildfly</artifactId>
</manifest>
</channel>
<!-- Not required, but will get you the latest version of RESTEasy -->
<channel>
<manifest>
<groupId>dev.resteasy.channels</groupId>
<artifactId>resteasy-6.2</artifactId>
</manifest>
</channel>
<channel>
<manifest>
<groupId>dev.resteasy.channels</groupId>
<artifactId>resteasy-microprofile-3.0</artifactId>
</manifest>
</channel>
</channels>
<configurations>
<config>
<model>standalone</model>
Expand Down
62 changes: 0 additions & 62 deletions galleon-pack/common/pom.xml

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 3210361

Please sign in to comment.