diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 4aed7629..9369cc7a 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -46,7 +46,7 @@ dependencies { implementation 'com.fasterxml.jackson.core:jackson-databind:2.11.4' implementation 'io.github.gradle-nexus:publish-plugin:1.1.0' implementation("io.spring.javaformat:spring-javaformat-gradle-plugin:0.0.38") - implementation 'io.spring.nohttp:nohttp-gradle:0.0.10' + implementation 'io.spring.nohttp:nohttp-gradle:0.0.11' implementation "org.apache.maven:maven-embedder:3.6.3" implementation "org.asciidoctor:asciidoctor-gradle-jvm:3.3.2" implementation 'org.codehaus.groovy:groovy-all:2.5.17' diff --git a/gradle/aggregate-jacoco-report.gradle b/gradle/aggregate-jacoco-report.gradle index 29baf2d3..3b7798ca 100644 --- a/gradle/aggregate-jacoco-report.gradle +++ b/gradle/aggregate-jacoco-report.gradle @@ -16,8 +16,8 @@ project.afterEvaluate { description = 'Generates aggregate code coverage report for all projects test tasks' reports { - html.enabled = true - xml.enabled = true + html.required = true + xml.required = true } def excludes = [ diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 41d9927a..afba1092 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 5b6fb15e..c30b486a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionSha256Sum=e5444a57cda4a95f90b0c9446a9e1b47d3d7f69057765bfb54bd4f482542d548 diff --git a/gradlew b/gradlew index 1b6c7873..65dcd68d 100755 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,10 +80,10 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' @@ -143,12 +143,16 @@ fi if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -205,6 +209,12 @@ set -- \ org.gradle.wrapper.GradleWrapperMain \ "$@" +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/gradlew.bat b/gradlew.bat index ac1b06f9..6689b85b 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. 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 :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/spring-pulsar-docs/src/main/antora/modules/ROOT/pages/intro/building.adoc b/spring-pulsar-docs/src/main/antora/modules/ROOT/pages/intro/building.adoc index c21a340c..848ba155 100644 --- a/spring-pulsar-docs/src/main/antora/modules/ROOT/pages/intro/building.adoc +++ b/spring-pulsar-docs/src/main/antora/modules/ROOT/pages/intro/building.adoc @@ -5,7 +5,7 @@ include::../attributes/attributes-variables.adoc[] If you have cloned the project locally, follow these steps to build the project from the source code. -NOTE: Gradle `7.x (7.4 or above)` is required to build. +NOTE: Gradle `8.x (8.3 or above)` is required to build. Run the following command to do a full build of the project: [indent=0] diff --git a/src/nohttp/checkstyle.xml b/src/nohttp/checkstyle.xml new file mode 100644 index 00000000..0b768267 --- /dev/null +++ b/src/nohttp/checkstyle.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + diff --git a/src/nohttp/suppressions.xml b/src/nohttp/suppressions.xml new file mode 100644 index 00000000..7774803f --- /dev/null +++ b/src/nohttp/suppressions.xml @@ -0,0 +1,7 @@ + + + + +