Skip to content

Commit

Permalink
Upgrade to 5.8.4 #27
Browse files Browse the repository at this point in the history
.. also tweaking build settings...
legacy T55 module is built by default, but is wrapped in
a profile that allows to turn it off
  • Loading branch information
andrus committed Mar 26, 2024
1 parent 1dbebb4 commit 21f4db5
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 6 deletions.
12 changes: 8 additions & 4 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,15 @@ on:
jobs:
build:
runs-on: ubuntu-20.04
name: JDK ${{ matrix.java }}
continue-on-error: ${{ matrix.java == '17' || matrix.java == 21 }}
name: JDK ${{ matrix.java.bersion }}
strategy:
matrix:
java: [ 11, 17, 21 ]
java:
- version: 11
- version: 17
profile: '!legacy' # exclude T55 module
- version: 21
profile: '!legacy' # exclude T55 module

steps:
- name: Checkout...
Expand All @@ -20,7 +24,7 @@ jobs:
- name: Set up JDK...
uses: actions/setup-java@v1
with:
java-version: ${{ matrix.java }}
java-version: ${{ matrix.java.version }}

- name: Retrieve mvn repo cache...
uses: actions/cache@v2
Expand Down
1 change: 1 addition & 0 deletions RELEASE-NOTES.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
## 3.0-M3

* #26 Deprecate 5.5 / 5.6 modules
* #27 Upgrade to 5.8.4 - support Java 21

## 3.0.M1

Expand Down
13 changes: 11 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@
<!-- Confusion alert: Due to Tapestry versioning scheme, 5.5 and 5.6 are compatible,
while 5.7+ is a new thing. So "bootique-tapestry55" module is now based on Tapestry 5.6.x -->
<tapestry55.version>5.6.4</tapestry55.version>
<tapestry58.version>5.8.2</tapestry58.version>
<tapestry58.version>5.8.4</tapestry58.version>
</properties>

<modules>
<module>bootique-tapestry55</module>
<!-- "bootique-tapestry55" module is included via a profile below -->
<module>bootique-tapestry58</module>
</modules>

Expand Down Expand Up @@ -93,6 +93,15 @@
</dependencyManagement>

<profiles>
<profile>
<id>legacy</id>
<modules>
<module>bootique-tapestry55</module>
</modules>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
</profile>
<profile>
<id>rat</id>
<build>
Expand Down

0 comments on commit 21f4db5

Please sign in to comment.