Skip to content

Commit 72a9632

Browse files
committed
Infra: Upgrade to gradle 9.1.0
1 parent bd7d954 commit 72a9632

File tree

6 files changed

+33
-15
lines changed

6 files changed

+33
-15
lines changed
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Docs: https://github.com/gradle/actions/blob/main/docs/wrapper-validation.md
2+
name: "Validate Gradle Wrapper"
3+
4+
on:
5+
push:
6+
paths:
7+
- gradle/wrapper/gradle-wrapper.jar
8+
pull_request:
9+
paths:
10+
- gradle/wrapper/gradle-wrapper.jar
11+
12+
jobs:
13+
validation:
14+
name: "Validation"
15+
runs-on: ubuntu-latest
16+
steps:
17+
- uses: actions/checkout@v4
18+
- uses: gradle/actions/wrapper-validation@182e4d39a69c621df8047e4504c7be47bacfd8d6 # https://github.com/gradle/actions/releases/tag/v4.4.3

gradle/libs.versions.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,13 @@ lucene = '10.2.2'
4141
[plugins]
4242
spring-boot = { id = 'org.springframework.boot', version.ref = 'spring-boot' }
4343
spring-dependency-management = { id = 'io.spring.dependency-management', version = '1.1.3' }
44-
git-properties = { id = 'com.gorylenko.gradle-git-properties', version = '2.4.2' }
44+
git-properties = { id = 'com.gorylenko.gradle-git-properties', version = '2.5.3' }
4545
openapi-validator = {id = "org.openapitools.openapistylevalidator", version = "1.10" }
46-
openapi-generator = { id = 'org.openapi.generator', version = '7.13.0' }
47-
nexus-publish-plugin = { id = 'io.github.gradle-nexus.publish-plugin', version = '1.1.0' }
46+
openapi-generator = { id = 'org.openapi.generator', version = '7.15.0' }
47+
nexus-publish-plugin = { id = 'io.github.gradle-nexus.publish-plugin', version = '2.0.0' }
4848
node-gradle = { id = 'com.github.node-gradle.node', version = '7.1.0' }
4949
docker-remote-api = { id = 'com.bmuschko.docker-remote-api', version = '9.4.0' }
50-
sonarqube = { id = "org.sonarqube", version = "6.0.1.5171" }
50+
sonarqube = { id = "org.sonarqube", version = "6.3.1.5724" }
5151

5252

5353
[libraries]

gradle/wrapper/gradle-wrapper.jar

1.96 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.12-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: 7 additions & 8 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.
@@ -15,6 +15,8 @@
1515
# See the License for the specific language governing permissions and
1616
# limitations under the License.
1717
#
18+
# SPDX-License-Identifier: Apache-2.0
19+
#
1820

1921
##############################################################################
2022
#
@@ -55,7 +57,7 @@
5557
# Darwin, MinGW, and NonStop.
5658
#
5759
# (3) This script is generated from the Groovy template
58-
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
60+
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
5961
# within the Gradle project.
6062
#
6163
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,7 @@ done
8486
# shellcheck disable=SC2034
8587
APP_BASE_NAME=${0##*/}
8688
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
87-
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
8890

8991
# Use the maximum available, or set MAX_FD != -1 to use that value.
9092
MAX_FD=maximum
@@ -112,7 +114,6 @@ case "$( uname )" in #(
112114
NONSTOP* ) nonstop=true ;;
113115
esac
114116

115-
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
116117

117118

118119
# Determine the Java command to use to start the JVM.
@@ -170,7 +171,6 @@ fi
170171
# For Cygwin or MSYS, switch paths to Windows format before running java
171172
if "$cygwin" || "$msys" ; then
172173
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
173-
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
174174

175175
JAVACMD=$( cygpath --unix "$JAVACMD" )
176176

@@ -203,15 +203,14 @@ fi
203203
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
204204

205205
# Collect all arguments for the java command:
206-
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
206+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
207207
# and any embedded shellness will be escaped.
208208
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
209209
# treated as '${Hostname}' itself on the command line.
210210

211211
set -- \
212212
"-Dorg.gradle.appname=$APP_BASE_NAME" \
213-
-classpath "$CLASSPATH" \
214-
org.gradle.wrapper.GradleWrapperMain \
213+
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
215214
"$@"
216215

217216
# Stop when "xargs" is not available.

gradlew.bat

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
@rem See the License for the specific language governing permissions and
1414
@rem limitations under the License.
1515
@rem
16+
@rem SPDX-License-Identifier: Apache-2.0
17+
@rem
1618

1719
@if "%DEBUG%"=="" @echo off
1820
@rem ##########################################################################
@@ -68,11 +70,10 @@ goto fail
6870
:execute
6971
@rem Setup the command line
7072

71-
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
7273

7374

7475
@rem Execute Gradle
75-
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
76+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
7677

7778
:end
7879
@rem End local scope for the variables with windows NT shell

0 commit comments

Comments
 (0)