Skip to content

Commit 6ef884a

Browse files
Update common files (#12156)
1 parent 9ded33c commit 6ef884a

File tree

10 files changed

+58
-29
lines changed

10 files changed

+58
-29
lines changed

.github/workflows/central-sync.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,23 @@ jobs:
1414
central-sync:
1515
runs-on: ubuntu-latest
1616
steps:
17+
- name: Remove system JDKs
18+
run: |
19+
sudo rm -rf /usr/lib/jvm/*
20+
unset JAVA_HOME
21+
export PATH=$(echo "$PATH" | tr ':' '\n' | grep -v '/usr/lib/jvm' | paste -sd:)
1722
- name: Checkout repository
1823
uses: actions/checkout@v5
1924
with:
2025
ref: v${{ github.event.inputs.release_version }}
21-
- uses: gradle/actions/wrapper-validation@v4
26+
- uses: gradle/actions/wrapper-validation@v5
2227
- name: Set up JDK
2328
uses: actions/setup-java@v5
2429
with:
2530
distribution: 'temurin'
2631
java-version: |
27-
17
2832
21
33+
25
2934
- name: Publish to Sonatype OSSRH
3035
env:
3136
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}

.github/workflows/graalvm-dev.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,11 @@ jobs:
4242
DEVELOCITY_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USERNAME }}
4343
DEVELOCITY_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
4444
steps:
45+
- name: Remove system JDKs
46+
run: |
47+
sudo rm -rf /usr/lib/jvm/*
48+
unset JAVA_HOME
49+
export PATH=$(echo "$PATH" | tr ':' '\n' | grep -v '/usr/lib/jvm' | paste -sd:)
4550
- uses: actions/checkout@v5
4651
- name: Pre-Build Steps
4752
uses: micronaut-projects/github-actions/graalvm/pre-build@master

.github/workflows/graalvm-latest.yml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ on:
88
push:
99
branches:
1010
- master
11-
- '[1-9]+.[0-9]+.x'
11+
- '[0-9]+.[0-9]+.x'
1212
pull_request:
1313
branches:
1414
- master
15-
- '[1-9]+.[0-9]+.x'
15+
- '[0-9]+.[0-9]+.x'
1616
jobs:
1717
build_matrix:
1818
if: github.repository != 'micronaut-projects/micronaut-project-template'
@@ -28,26 +28,34 @@ jobs:
2828
- name: Build Matrix
2929
uses: micronaut-projects/github-actions/graalvm/build-matrix@master
3030
id: build-matrix
31+
with:
32+
java-version: '21'
3133
build:
3234
needs: build_matrix
3335
if: github.repository != 'micronaut-projects/micronaut-project-template'
3436
runs-on: ubuntu-latest
3537
strategy:
3638
max-parallel: 6
3739
matrix:
38-
java: ['17', '21']
40+
java: ['21']
3941
native_test_task: ${{ fromJson(needs.build_matrix.outputs.matrix).native_test_task }}
4042
env:
4143
DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
4244
DEVELOCITY_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USERNAME }}
4345
DEVELOCITY_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
4446
steps:
47+
- name: Remove system JDKs
48+
run: |
49+
sudo rm -rf /usr/lib/jvm/*
50+
unset JAVA_HOME
51+
export PATH=$(echo "$PATH" | tr ':' '\n' | grep -v '/usr/lib/jvm' | paste -sd:)
4552
- uses: actions/checkout@v5
4653
- name: Pre-Build Steps
4754
uses: micronaut-projects/github-actions/graalvm/pre-build@master
4855
id: pre-build
4956
with:
5057
distribution: 'graalvm'
58+
gradle-java: '21'
5159
java: ${{ matrix.java }}
5260
- name: Build Steps
5361
uses: micronaut-projects/github-actions/graalvm/build@master

.github/workflows/gradle.yml

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@ on:
88
push:
99
branches:
1010
- master
11-
- '[1-9]+.[0-9]+.x'
11+
- '[0-9]+.[0-9]+.x'
1212
pull_request:
1313
branches:
1414
- master
15-
- '[1-9]+.[0-9]+.x'
15+
- '[0-9]+.[0-9]+.x'
1616
jobs:
1717
build:
1818
if: github.repository != 'micronaut-projects/micronaut-project-template'
1919
runs-on: ubuntu-latest
2020
strategy:
2121
matrix:
22-
java: ['17', '21']
22+
java: ['21', '25']
2323
env:
2424
DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
2525
DEVELOCITY_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USERNAME }}
@@ -34,6 +34,11 @@ jobs:
3434
OSS_INDEX_PASSWORD: ${{ secrets.OSS_INDEX_PASSWORD }}
3535
steps:
3636
# https://github.com/actions/virtual-environments/issues/709
37+
- name: Remove system JDKs
38+
run: |
39+
sudo rm -rf /usr/lib/jvm/*
40+
unset JAVA_HOME
41+
export PATH=$(echo "$PATH" | tr ':' '\n' | grep -v '/usr/lib/jvm' | paste -sd:)
3742
- name: "🗑 Free disk space"
3843
run: |
3944
sudo rm -rf "/usr/local/share/boost"
@@ -47,32 +52,32 @@ jobs:
4752
fetch-depth: 0
4853

4954
- name: "🔧 Setup GraalVM CE"
50-
uses: graalvm/[email protected].2
55+
uses: graalvm/[email protected].1
5156
with:
5257
distribution: 'graalvm'
5358
java-version: ${{ matrix.java }}
5459
github-token: ${{ secrets.GITHUB_TOKEN }}
5560

5661
- name: "🔧 Setup Gradle"
57-
uses: gradle/actions/setup-gradle@v4
62+
uses: gradle/actions/setup-gradle@v5
5863

5964
- name: "❓ Optional setup step"
6065
run: |
6166
[ -f ./setup.sh ] && ./setup.sh || [ ! -f ./setup.sh ]
6267
6368
- name: "🚔 Sonatype Scan"
64-
if: env.OSS_INDEX_PASSWORD != '' && matrix.java == '17'
69+
if: env.OSS_INDEX_PASSWORD != '' && matrix.java == '21'
6570
id: sonatypescan
6671
run: |
6772
./gradlew ossIndexAudit --no-parallel --info
6873
6974
- name: "🛠 Build with Gradle"
7075
id: gradle
7176
run: |
72-
./gradlew jacocoReport check --no-daemon --continue
77+
./gradlew check jacocoReport --no-daemon --continue
7378
7479
- name: "🔎 Run static analysis"
75-
if: env.SONAR_TOKEN != '' && matrix.java == '17'
80+
if: env.SONAR_TOKEN != '' && matrix.java == '21'
7681
run: |
7782
./gradlew sonar --no-parallel --continue
7883
@@ -85,14 +90,14 @@ jobs:
8590
check_retries: 'true'
8691

8792
- name: "📜 Upload binary compatibility check results"
88-
if: matrix.java == '17'
89-
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
93+
if: matrix.java == '21'
94+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
9095
with:
9196
name: binary-compatibility-reports
9297
path: "**/build/reports/binary-compatibility-*.html"
9398

9499
- name: "📦 Publish to Sonatype Snapshots"
95-
if: success() && github.event_name == 'push' && matrix.java == '17'
100+
if: success() && github.event_name == 'push' && matrix.java == '21'
96101
env:
97102
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
98103
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
@@ -107,7 +112,7 @@ jobs:
107112
if_false: ${{ github.repository }}
108113

109114
- name: "📑 Publish to Github Pages"
110-
if: success() && github.event_name == 'push' && matrix.java == '17'
115+
if: success() && github.event_name == 'push' && matrix.java == '21'
111116
uses: micronaut-projects/github-pages-deploy-action@master
112117
env:
113118
TARGET_REPOSITORY: ${{ steps.docs_target.outputs.value }}

.github/workflows/publish-snapshot.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@ jobs:
1010
if: github.repository != 'micronaut-projects/micronaut-project-template'
1111
runs-on: ubuntu-latest
1212
steps:
13+
- name: Remove system JDKs
14+
run: |
15+
sudo rm -rf /usr/lib/jvm/*
16+
unset JAVA_HOME
17+
export PATH=$(echo "$PATH" | tr ':' '\n' | grep -v '/usr/lib/jvm' | paste -sd:)
1318
- uses: actions/checkout@v5
1419
- uses: actions/cache@v4
1520
with:
@@ -22,8 +27,8 @@ jobs:
2227
with:
2328
distribution: 'temurin'
2429
java-version: |
25-
17
2630
21
31+
25
2732
- name: Publish to Sonatype Snapshots
2833
if: success()
2934
env:

.github/workflows/release.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,23 @@ jobs:
1313
artifacts-sha256: ${{ steps.hash.outputs.artifacts-sha256 }} # Computed hashes for build artifacts.
1414
runs-on: ubuntu-latest
1515
steps:
16+
- name: Remove system JDKs
17+
run: |
18+
sudo rm -rf /usr/lib/jvm/*
19+
unset JAVA_HOME
20+
export PATH=$(echo "$PATH" | tr ':' '\n' | grep -v '/usr/lib/jvm' | paste -sd:)
1621
- name: Checkout repository
1722
uses: actions/checkout@v5
1823
with:
1924
token: ${{ secrets.GH_TOKEN }}
20-
- uses: gradle/actions/wrapper-validation@v4
25+
- uses: gradle/actions/wrapper-validation@v5
2126
- name: Set up JDK
2227
uses: actions/setup-java@v5
2328
with:
2429
distribution: 'temurin'
2530
java-version: |
26-
17
2731
21
32+
25
2833
- name: Set the current release version
2934
id: release_version
3035
run: echo "release_version=${GITHUB_REF:11}" >> $GITHUB_OUTPUT
@@ -68,13 +73,13 @@ jobs:
6873
# Store the hash in a file, which is uploaded as a workflow artifact.
6974
sha256sum $ARTIFACTS | base64 -w0 > artifacts-sha256
7075
- name: Upload build artifacts
71-
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
76+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
7277
with:
7378
name: gradle-build-outputs
7479
path: build/repo/${{ steps.publish.outputs.group }}/*/${{ steps.publish.outputs.version }}/*
7580
retention-days: 5
7681
- name: Upload artifacts-sha256
77-
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
82+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
7883
with:
7984
name: artifacts-sha256
8085
path: artifacts-sha256

gradle/wrapper/gradle-wrapper.jar

1.65 KB
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22

33
#
4-
# Copyright © 2015-2021 the original authors.
4+
# Copyright © 2015 the original authors.
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.
@@ -114,7 +114,6 @@ case "$( uname )" in #(
114114
NONSTOP* ) nonstop=true ;;
115115
esac
116116

117-
CLASSPATH="\\\"\\\""
118117

119118

120119
# Determine the Java command to use to start the JVM.
@@ -172,7 +171,6 @@ fi
172171
# For Cygwin or MSYS, switch paths to Windows format before running java
173172
if "$cygwin" || "$msys" ; then
174173
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
175-
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
176174

177175
JAVACMD=$( cygpath --unix "$JAVACMD" )
178176

@@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
212210

213211
set -- \
214212
"-Dorg.gradle.appname=$APP_BASE_NAME" \
215-
-classpath "$CLASSPATH" \
216213
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
217214
"$@"
218215

gradlew.bat

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,10 @@ goto fail
7070
:execute
7171
@rem Setup the command line
7272

73-
set CLASSPATH=
7473

7574

7675
@rem Execute Gradle
77-
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
76+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
7877

7978
:end
8079
@rem End local scope for the variables with windows NT shell

0 commit comments

Comments
 (0)