Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update maven wrapper to version 4.0.0-rc that needs jdk 17 #667

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/benchmark.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '11'
java-version: '17'
cache: 'maven'
- name: Build
run: ./mvnw clean verify -Dtests.groups=BenchmarkTest
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ jobs:
name: Build
strategy:
matrix:
java: [ '11', '17', '21', '22', '23' ]
os: [ 'ubuntu-24.04', 'macos-14', 'windows-2022' ]
java: ['17', '21', '22', '23']
os: ['ubuntu-24.04', 'macos-14', 'windows-2022']
runs-on: ${{ matrix.os }}
steps:
- name: Checkout repository
Expand Down
10 changes: 8 additions & 2 deletions .github/workflows/release-trigger.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,20 +26,24 @@ jobs:
- uses: actions/checkout@v4
with:
persist-credentials: false
- name: Set up JDK 11

- name: Set up JDK 17 as runtime
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: 11
java-version: 17
cache: 'maven'

- name: Build
run: ./mvnw clean verify

- name: Create Release Notes
uses: docker://decathlon/release-notes-generator-action:3.1.5
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
OUTPUT_FOLDER: .chglog/
FILENAME: ${{ github.event.inputs.releaseVersion }}

- name: Setup git user
uses: fregante/setup-git-user@v2
- name: Commit Release Notes
Expand All @@ -51,6 +55,7 @@ jobs:
with:
github_token: ${{ secrets.AM_PAT }}
branch: ${{ github.ref }}

- name: Set release version
run: ./mvnw versions:set -DnewVersion=${{ github.event.inputs.releaseVersion }}
- name: Commit release version
Expand All @@ -62,6 +67,7 @@ jobs:
with:
github_token: ${{ secrets.AM_PAT }}
branch: ${{ github.ref }}

- name: Set new snapshot version
run: ./mvnw versions:set -DnewVersion=${{ github.event.inputs.nextVersion }}
- name: Commit new snapshot version
Expand Down
9 changes: 7 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,28 +13,33 @@ jobs:
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- name: Set up JDK 11

- name: Set up JDK 17
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: 11
java-version: 17
cache: 'maven'
server-id: 'ossrh'
server-username: OSSRH_USERNAME
server-password: OSSRH_PASSWORD
gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
gpg-passphrase: GPG_PASSPHRASE

- name: Tests with Maven
run: ./mvnw clean verify

- name: Build with Maven
run: ./mvnw -Prelease -Drelease deploy
env:
OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}

- name: Extract release tag
id: vars
run: echo "version=${GITHUB_REF#refs/*/v}" >> $GITHUB_OUTPUT

- name: Create Release
uses: softprops/action-gh-release@v2
env:
Expand Down
2 changes: 1 addition & 1 deletion .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
# under the License.
wrapperVersion=3.3.2
distributionType=only-script
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/4.0.0-rc-2/apache-maven-4.0.0-rc-2-bin.zip
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1 +1 @@
java temurin-11.0.23+9
java temurin-17.0.13+11
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@
<version>3.8.5</version>
</requireMavenVersion>
<requireJavaVersion>
<version>${java.version}</version>
<version>11</version>
</requireJavaVersion>
<RestrictImports>
<reason>Use SLF4j for logging</reason>
Expand Down
Loading