Skip to content

Commit b7ad907

Browse files
update Gradle version and use JDK 17 to invoke Gradle commands (#1226)
* update Gradle version and use JDK 17 to invoke Gradle commands * update Nebula Gradle plugins version
1 parent dc3bb6c commit b7ad907

File tree

6 files changed

+38
-14
lines changed

6 files changed

+38
-14
lines changed

build.gradle

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ buildscript {
1515

1616
plugins {
1717
id "com.github.kt3k.coveralls" version "2.12.0"
18-
id "nebula.netflixoss" version "10.5.1"
18+
id "com.netflix.nebula.netflixoss" version "11.4.0"
19+
id "com.netflix.nebula.facet" version "11.0.0" apply false
1920
id "org.ajoberstar.grgit" version "4.1.1"
2021
id "org.ajoberstar.git-publish" version "3.0.1"
2122
id "org.springframework.boot" version "${spring_boot_version}" apply false
@@ -59,15 +60,15 @@ idea {
5960
}
6061

6162
configure((Set<Project>) ext.javaProjects) {
62-
apply plugin: "nebula.netflixoss"
63+
apply plugin: "com.netflix.nebula.netflixoss"
6364
apply plugin: "java"
6465
apply plugin: "checkstyle"
6566
apply plugin: "com.github.spotbugs"
6667
apply plugin: "io.spring.dependency-management"
6768
apply plugin: "com.gorylenko.gradle-git-properties"
6869
apply plugin: "groovy"
6970
apply plugin: "io.franzbecker.gradle-lombok"
70-
apply plugin: "nebula.facet"
71+
apply plugin: "com.netflix.nebula.facet"
7172

7273
lombok {
7374
version = '1.18.24'
@@ -140,6 +141,7 @@ configure((Set<Project>) ext.javaProjects) {
140141
generatedSourcesJavaDir = file("${project.generatedSourcesDir}/main/java")
141142
}
142143

144+
sourcesJar.dependsOn compileJava
143145
sourceSets {
144146
main {
145147
java {
@@ -272,6 +274,7 @@ configure((Set<Project>) ext.javaProjects) {
272274
}
273275
}
274276

277+
licenseMain.dependsOn compileJava
275278
license {
276279
ignoreFailures false
277280
}
@@ -313,6 +316,9 @@ task codeCoverageReport(type: JacocoReport, group: "Coverage reports") {
313316
executionData fileTree(project.rootDir.absolutePath).include("**/build/jacoco/*.exec")
314317

315318
dependsOn javaProjects*.test
319+
dependsOn javaProjects*.integrationTest
320+
dependsOn javaProjects*.smokeTest
321+
dependsOn javaProjects*.javadoc
316322

317323
javaProjects.each {
318324
sourceSets((SourceSet) it.sourceSets.main)

gradle/gradle-daemon-jvm.properties

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# This file is used to configure the JDK version used by the Gradle Daemon (Build Runtime)
2+
# This configuration wins over the JAVA_HOME environment variable
3+
toolchainVersion=17
4+
toolchainVendor=azul

gradle/wrapper/gradle-wrapper.jar

1.99 KB
Binary file not shown.
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
4+
networkTimeout=10000
45
zipStoreBase=GRADLE_USER_HOME
56
zipStorePath=wrapper/dists

gradlew

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
# Darwin, MinGW, and NonStop.
5656
#
5757
# (3) This script is generated from the Groovy template
58-
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
58+
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
5959
# within the Gradle project.
6060
#
6161
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
8080
esac
8181
done
8282

83-
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
84-
85-
APP_NAME="Gradle"
83+
# This is normally unused
84+
# shellcheck disable=SC2034
8685
APP_BASE_NAME=${0##*/}
86+
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
8787

8888
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
8989
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
143143
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
144144
case $MAX_FD in #(
145145
max*)
146+
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
147+
# shellcheck disable=SC3045
146148
MAX_FD=$( ulimit -H -n ) ||
147149
warn "Could not query maximum file descriptor limit"
148150
esac
149151
case $MAX_FD in #(
150152
'' | soft) :;; #(
151153
*)
154+
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
155+
# shellcheck disable=SC3045
152156
ulimit -n "$MAX_FD" ||
153157
warn "Could not set maximum file descriptor limit to $MAX_FD"
154158
esac
@@ -205,6 +209,12 @@ set -- \
205209
org.gradle.wrapper.GradleWrapperMain \
206210
"$@"
207211

212+
# Stop when "xargs" is not available.
213+
if ! command -v xargs >/dev/null 2>&1
214+
then
215+
die "xargs is not available"
216+
fi
217+
208218
# Use "xargs" to parse quoted args.
209219
#
210220
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
@rem limitations under the License.
1515
@rem
1616

17-
@if "%DEBUG%" == "" @echo off
17+
@if "%DEBUG%"=="" @echo off
1818
@rem ##########################################################################
1919
@rem
2020
@rem Gradle startup script for Windows
@@ -25,7 +25,8 @@
2525
if "%OS%"=="Windows_NT" setlocal
2626

2727
set DIRNAME=%~dp0
28-
if "%DIRNAME%" == "" set DIRNAME=.
28+
if "%DIRNAME%"=="" set DIRNAME=.
29+
@rem This is normally unused
2930
set APP_BASE_NAME=%~n0
3031
set APP_HOME=%DIRNAME%
3132

@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
4041

4142
set JAVA_EXE=java.exe
4243
%JAVA_EXE% -version >NUL 2>&1
43-
if "%ERRORLEVEL%" == "0" goto execute
44+
if %ERRORLEVEL% equ 0 goto execute
4445

4546
echo.
4647
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
7576

7677
:end
7778
@rem End local scope for the variables with windows NT shell
78-
if "%ERRORLEVEL%"=="0" goto mainEnd
79+
if %ERRORLEVEL% equ 0 goto mainEnd
7980

8081
:fail
8182
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
8283
rem the _cmd.exe /c_ return code!
83-
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
84-
exit /b 1
84+
set EXIT_CODE=%ERRORLEVEL%
85+
if %EXIT_CODE% equ 0 set EXIT_CODE=1
86+
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
87+
exit /b %EXIT_CODE%
8588

8689
:mainEnd
8790
if "%OS%"=="Windows_NT" endlocal

0 commit comments

Comments
 (0)