From a855b44983864ff9809c03ddbaec94b6adf90102 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Petrovick=C3=BD?= Date: Mon, 23 Sep 2024 07:16:47 +0200 Subject: [PATCH 1/3] ci: upgrade workflows to Java 23 --- .github/workflows/pull_request.yml | 6 +++--- .github/workflows/pull_request_quickstarts.yml | 2 +- .github/workflows/pull_request_secure.yml | 4 ++-- .github/workflows/release.yml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 5be96f44c5..e102b99610 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -27,7 +27,7 @@ jobs: - os: ubuntu-latest java-version: 17 - os: ubuntu-latest - java-version: 22 + java-version: 23 timeout-minutes: 120 steps: - uses: actions/checkout@v4 @@ -54,7 +54,7 @@ jobs: - os: ubuntu-latest java-version: 17 - os: ubuntu-latest - java-version: 22 + java-version: 23 timeout-minutes: 120 steps: - uses: actions/checkout@v4 @@ -97,7 +97,7 @@ jobs: matrix: os: [ ubuntu-latest ] # Windows doesn't work, Mac is not a deploy OS. module: ["spring-integration", "quarkus-integration"] - java-version: [ 17, 21, 22 ] # LTS + latest. + java-version: [ 17, 21, 23 ] # LTS + latest. timeout-minutes: 120 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/pull_request_quickstarts.yml b/.github/workflows/pull_request_quickstarts.yml index 25bd50a4fc..f558a63baf 100644 --- a/.github/workflows/pull_request_quickstarts.yml +++ b/.github/workflows/pull_request_quickstarts.yml @@ -74,7 +74,7 @@ jobs: strategy: matrix: os: [ ubuntu-latest ] - java-version: [ 17 ] # Only the first supported LTS; already too many jobs here. + java-version: [ 21 ] # Only the latest supported LTS; already too many jobs here. # TODO: Add Python 3.10 once employee scheduling and school timetabling support it python-version: ['3.11', '3.12'] fail-fast: false diff --git a/.github/workflows/pull_request_secure.yml b/.github/workflows/pull_request_secure.yml index 5a45153f3c..1635e0bb95 100644 --- a/.github/workflows/pull_request_secure.yml +++ b/.github/workflows/pull_request_secure.yml @@ -225,10 +225,10 @@ jobs: fetch-depth: 0 # Otherwise merge will fail on account of not having history. # Build and test - - name: Set up JDK 17 + - name: Set up the JDK uses: actions/setup-java@v4 with: - java-version: 17 + java-version: 21 distribution: 'temurin' cache: 'maven' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c693bdf071..b657b6ffc3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -60,7 +60,7 @@ jobs: - uses: actions/setup-java@v4 with: - java-version: '17' + java-version: '21' distribution: 'temurin' cache: 'maven' From 76a066b91d640cd8d52e40ff5d0b45e5c963a0c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Petrovick=C3=BD?= Date: Mon, 14 Oct 2024 08:17:03 +0200 Subject: [PATCH 2/3] Fix rewrite --- .github/workflows/pull_request_quickstarts.yml | 4 ++-- .github/workflows/pull_request_secure.yml | 14 +++++++------- migration/pom.xml | 5 +++++ 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/.github/workflows/pull_request_quickstarts.yml b/.github/workflows/pull_request_quickstarts.yml index f558a63baf..fa00d0e328 100644 --- a/.github/workflows/pull_request_quickstarts.yml +++ b/.github/workflows/pull_request_quickstarts.yml @@ -52,10 +52,10 @@ jobs: fetch-depth: 0 # Otherwise merge will fail on account of not having history. # Build and test - - name: Setup Temurin 21 and Maven + - name: Setup Temurin 17 and Maven uses: actions/setup-java@v4 with: - java-version: '21' + java-version: '17' distribution: 'temurin' cache: 'maven' - name: Quickly build timefold-solver diff --git a/.github/workflows/pull_request_secure.yml b/.github/workflows/pull_request_secure.yml index 1635e0bb95..a2e6f42b1b 100644 --- a/.github/workflows/pull_request_secure.yml +++ b/.github/workflows/pull_request_secure.yml @@ -70,10 +70,10 @@ jobs: path: ./timefold-solver ref: ${{ github.event.pull_request.head.sha }} # The GHA event will pull the main branch by default, and we must specify the PR reference version - - name: Setup Temurin 21 and Maven + - name: Setup Temurin 17 and Maven uses: actions/setup-java@v4 with: - java-version: '21' + java-version: '17' distribution: 'temurin' cache: 'maven' @@ -172,10 +172,10 @@ jobs: fetch-depth: 0 # Otherwise merge will fail on account of not having history. # Build and test - - name: Setup Temurin 21 and Maven + - name: Setup Temurin 17 and Maven uses: actions/setup-java@v4 with: - java-version: '21' + java-version: '17' distribution: 'temurin' cache: 'maven' - name: Quickly build timefold-solver @@ -228,7 +228,7 @@ jobs: - name: Set up the JDK uses: actions/setup-java@v4 with: - java-version: 21 + java-version: 17 distribution: 'temurin' cache: 'maven' @@ -266,10 +266,10 @@ jobs: with: fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis ref: ${{ github.event.pull_request.head.sha }} # The GHA event will pull the main branch by default, and we must specify the PR reference version - - name: Set up JDK 21 + - name: Set up JDK 17 uses: actions/setup-java@v4 with: - java-version: 21 + java-version: 17 distribution: 'temurin' cache: 'maven' - name: Python 3.10, Python 3.11, Python 3.12 Setup diff --git a/migration/pom.xml b/migration/pom.xml index 99ec50cc40..1250a7714e 100644 --- a/migration/pom.xml +++ b/migration/pom.xml @@ -60,6 +60,11 @@ rewrite-java-17 runtime + + org.openrewrite + rewrite-java-21 + runtime + org.openrewrite rewrite-properties From 25df329d83da31b6dfad89962709102f7cd3198c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Petrovick=C3=BD?= Date: Mon, 14 Oct 2024 08:22:31 +0200 Subject: [PATCH 3/3] Less changes --- .github/workflows/pull_request_quickstarts.yml | 4 ++-- .github/workflows/release.yml | 2 +- migration/pom.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pull_request_quickstarts.yml b/.github/workflows/pull_request_quickstarts.yml index fa00d0e328..f558a63baf 100644 --- a/.github/workflows/pull_request_quickstarts.yml +++ b/.github/workflows/pull_request_quickstarts.yml @@ -52,10 +52,10 @@ jobs: fetch-depth: 0 # Otherwise merge will fail on account of not having history. # Build and test - - name: Setup Temurin 17 and Maven + - name: Setup Temurin 21 and Maven uses: actions/setup-java@v4 with: - java-version: '17' + java-version: '21' distribution: 'temurin' cache: 'maven' - name: Quickly build timefold-solver diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b657b6ffc3..c693bdf071 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -60,7 +60,7 @@ jobs: - uses: actions/setup-java@v4 with: - java-version: '21' + java-version: '17' distribution: 'temurin' cache: 'maven' diff --git a/migration/pom.xml b/migration/pom.xml index 1250a7714e..0c9928022c 100644 --- a/migration/pom.xml +++ b/migration/pom.xml @@ -61,7 +61,7 @@ runtime - org.openrewrite + org.openrewrite rewrite-java-21 runtime