Skip to content

Commit 2a10a57

Browse files
Update common files
1 parent ea449a2 commit 2a10a57

File tree

9 files changed

+21
-22
lines changed

9 files changed

+21
-22
lines changed

.github/workflows/central-sync.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ jobs:
2424
with:
2525
distribution: 'temurin'
2626
java-version: |
27-
17
2827
21
28+
25
2929
- name: Publish to Sonatype OSSRH
3030
env:
3131
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}

.github/workflows/graalvm-latest.yml

Lines changed: 6 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,14 +28,16 @@ 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 }}
@@ -48,6 +50,7 @@ jobs:
4850
id: pre-build
4951
with:
5052
distribution: 'graalvm'
53+
gradle-java: '21'
5154
java: ${{ matrix.java }}
5255
- name: Build Steps
5356
uses: micronaut-projects/github-actions/graalvm/build@master

.github/workflows/gradle.yml

Lines changed: 9 additions & 9 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 }}
@@ -61,18 +61,18 @@ jobs:
6161
[ -f ./setup.sh ] && ./setup.sh || [ ! -f ./setup.sh ]
6262
6363
- name: "🚔 Sonatype Scan"
64-
if: env.OSS_INDEX_PASSWORD != '' && matrix.java == '17'
64+
if: env.OSS_INDEX_PASSWORD != '' && matrix.java == '21'
6565
id: sonatypescan
6666
run: |
6767
./gradlew ossIndexAudit --no-parallel --info
6868
6969
- name: "🛠 Build with Gradle"
7070
id: gradle
7171
run: |
72-
./gradlew jacocoReport check --no-daemon --continue
72+
./gradlew check jacocoReport --no-daemon --continue
7373
7474
- name: "🔎 Run static analysis"
75-
if: env.SONAR_TOKEN != '' && matrix.java == '17'
75+
if: env.SONAR_TOKEN != '' && matrix.java == '21'
7676
run: |
7777
./gradlew sonar --no-parallel --continue
7878
@@ -85,14 +85,14 @@ jobs:
8585
check_retries: 'true'
8686

8787
- name: "📜 Upload binary compatibility check results"
88-
if: matrix.java == '17'
88+
if: matrix.java == '21'
8989
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
9090
with:
9191
name: binary-compatibility-reports
9292
path: "**/build/reports/binary-compatibility-*.html"
9393

9494
- name: "📦 Publish to Sonatype Snapshots"
95-
if: success() && github.event_name == 'push' && matrix.java == '17'
95+
if: success() && github.event_name == 'push' && matrix.java == '21'
9696
env:
9797
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
9898
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
@@ -107,7 +107,7 @@ jobs:
107107
if_false: ${{ github.repository }}
108108

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

.github/workflows/publish-snapshot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ jobs:
2222
with:
2323
distribution: 'temurin'
2424
java-version: |
25-
17
2625
21
26+
25
2727
- name: Publish to Sonatype Snapshots
2828
if: success()
2929
env:

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ jobs:
2323
with:
2424
distribution: 'temurin'
2525
java-version: |
26-
17
2726
21
27+
25
2828
- name: Set the current release version
2929
id: release_version
3030
run: echo "release_version=${GITHUB_REF:11}" >> $GITHUB_OUTPUT

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)