Skip to content

Commit

Permalink
Move project to Java 21
Browse files Browse the repository at this point in the history
  • Loading branch information
jodastephen committed Oct 6, 2024
1 parent 1a013d7 commit e81f1ae
Show file tree
Hide file tree
Showing 8 changed files with 582 additions and 58 deletions.
5 changes: 5 additions & 0 deletions .github/website.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,9 @@ git commit --message "Update joda-collect from CI: $GITHUB_ACTION"
echo "## push..."
git push origin main

echo "## tidy..."
cd ..
git push --delete origin website || true
git push --delete origin website2x || true

echo "## done"
7 changes: 2 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@ jobs:
permissions:
security-events: write # for github/codeql-action
runs-on: ubuntu-latest
strategy:
matrix:
java: [8, 11]
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -31,7 +28,7 @@ jobs:
- name: Set up JDK
uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java }}
java-version: 21
distribution: 'temurin'
cache: 'maven'

Expand All @@ -55,7 +52,7 @@ jobs:
uses: github/codeql-action/analyze@v3

- name: Website
if: matrix.java == '11' && github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/website') || startsWith(github.ref, 'refs/tags/v'))
if: github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/website') || startsWith(github.ref, 'refs/tags/v'))
env:
GITHUB_TOKEN: ${{ secrets.PERSONAL_TOKEN_GH }}
run: |
Expand Down
14 changes: 10 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,13 @@ Various documentation is available:


### Releases
[Release 1.0.1](https://www.joda.org/joda-collect/download.html) is the current latest release.
This release is considered stable and worthy of the 1.x tag.
It depends on Java SE 8 or later and requires [Google-Guava](https://github.com/google/guava).
The 2.x branch is compatible with Java SE 21 or later.

The 1.x branch is compatible with Java SE 8 or later.

v2.x releases are compatible with v1.x releases - except for the Java SE version and `module-info.class` file.

Joda-Collect depends on [Google-Guava](https://github.com/google/guava).

Available in the [Maven Central repository](https://search.maven.org/search?q=g:org.joda%20AND%20a:joda-collect&core=gav)

Expand Down Expand Up @@ -59,7 +63,9 @@ Tidelift will coordinate the fix and disclosure.

### Release process

* Update version (README.md, index.md, changes.xml)
* Update version (index.md, changes.xml)
* Commit and push
* Switch to Java 21
* `mvn clean release:clean release:prepare release:perform`
* `git fetch`
* Website will be built and released by GitHub Actions
2 changes: 1 addition & 1 deletion RELEASE-NOTES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Joda-Collect
================================================
Joda-Collect provides collections that are not present in the JDK or [Google Guava](https://github.com/google/guava).

The release runs on JDK 8 or later.
The release runs on JDK 21 or later.

See https://www.joda.org/joda-collect/changes-report.html for changes

Expand Down
Loading

0 comments on commit e81f1ae

Please sign in to comment.