diff --git a/build.gradle b/build.gradle index 6d9027e..7addf6e 100755 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id 'maven-publish' id 'jacoco' - id "org.sonarqube" version "4.4.1.3373" + id "org.sonarqube" version "5.1.0.4882" } repositories { @@ -14,10 +14,10 @@ repositories { ext{ vertxVersion = '5.0.0-SNAPSHOT' - jupiterVersion = '5.10.1' - jupiterLauncherVersion = '1.10.1' - slfApiVersion = '2.0.9' - logbackVersion = '1.4.11' + jupiterVersion = '5.11.0' + jupiterLauncherVersion = '1.11.0' + slfApiVersion = '2.0.16' + logbackVersion = '1.5.8' } dependencies { @@ -42,15 +42,14 @@ test { finalizedBy jacocoTestReport } -java { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 -} + jar.archiveFileName = "vertx-web-accesslog-5.0.0-SNAPSHOT.jar" java { withSourcesJar() + sourceCompatibility='8' + targetCompatibility='8' } publishing { @@ -84,6 +83,6 @@ jacocoTestReport { } wrapper() { - gradleVersion = '8.5' + gradleVersion = '8.10.1' } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c..afba109 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 a595206..c44c230 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 1b6c787..65dcd68 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 ac1b06f..6689b85 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/pom.xml b/pom.xml deleted file mode 100644 index ab569f1..0000000 --- a/pom.xml +++ /dev/null @@ -1,67 +0,0 @@ - - 4.0.0 - com.romanpierson - vertx-web-accesslog - 1.6.0 - Vertx Web Accesslog - An access log implementation to be used in vert web routes - - inspired by apache / tomcat access log configuration - https://github.com/romanpierson/vertx-web-accesslog - - - The Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - - - - - romanpierson - Roman Pierson - yo@romanpierson.com - - - - scm:git@github.com:romanpierson/vertx-web-accesslog.git - - scm:git@github.com:romanpierson/vertx-web-accesslog.git - https://github.com/romanpierson/vertx-web-accesslog.git - - - - io.vertx - vertx-web - 4.4.1 - runtime - - - io.vertx - vertx-config-yaml - 4.4.1 - test - - - io.vertx - vertx-junit5 - 4.4.1 - test - - - io.vertx - vertx-web-client - 4.4.1 - test - - - org.junit.jupiter - junit-jupiter-api - 5.9.1 - test - - - org.junit.platform - junit-platform-launcher - 1.9.1 - test - - - \ No newline at end of file diff --git a/src/main/java/com/romanpierson/vertx/web/accesslogger/appender/console/impl/ConsoleAppender.java b/src/main/java/com/romanpierson/vertx/web/accesslogger/appender/console/impl/ConsoleAppender.java index ce84658..8929005 100644 --- a/src/main/java/com/romanpierson/vertx/web/accesslogger/appender/console/impl/ConsoleAppender.java +++ b/src/main/java/com/romanpierson/vertx/web/accesslogger/appender/console/impl/ConsoleAppender.java @@ -20,8 +20,8 @@ import com.romanpierson.vertx.web.accesslogger.AccessLoggerConstants; import com.romanpierson.vertx.web.accesslogger.appender.Appender; -import io.vertx.core.impl.logging.Logger; -import io.vertx.core.impl.logging.LoggerFactory; +import io.vertx.core.internal.logging.Logger; +import io.vertx.core.internal.logging.LoggerFactory; import io.vertx.core.json.JsonObject; /** diff --git a/src/main/java/com/romanpierson/vertx/web/accesslogger/appender/elasticsearch/impl/ElasticSearchAppender.java b/src/main/java/com/romanpierson/vertx/web/accesslogger/appender/elasticsearch/impl/ElasticSearchAppender.java index f47285c..582823b 100644 --- a/src/main/java/com/romanpierson/vertx/web/accesslogger/appender/elasticsearch/impl/ElasticSearchAppender.java +++ b/src/main/java/com/romanpierson/vertx/web/accesslogger/appender/elasticsearch/impl/ElasticSearchAppender.java @@ -23,8 +23,8 @@ import io.vertx.core.Vertx; import io.vertx.core.eventbus.EventBus; -import io.vertx.core.impl.logging.Logger; -import io.vertx.core.impl.logging.LoggerFactory; +import io.vertx.core.internal.logging.Logger; +import io.vertx.core.internal.logging.LoggerFactory; import io.vertx.core.json.JsonArray; import io.vertx.core.json.JsonObject; diff --git a/src/main/java/com/romanpierson/vertx/web/accesslogger/appender/eventbus/impl/EventBusAppender.java b/src/main/java/com/romanpierson/vertx/web/accesslogger/appender/eventbus/impl/EventBusAppender.java index 49ef57a..0917975 100644 --- a/src/main/java/com/romanpierson/vertx/web/accesslogger/appender/eventbus/impl/EventBusAppender.java +++ b/src/main/java/com/romanpierson/vertx/web/accesslogger/appender/eventbus/impl/EventBusAppender.java @@ -19,8 +19,8 @@ import io.vertx.core.Vertx; import io.vertx.core.eventbus.EventBus; -import io.vertx.core.impl.logging.Logger; -import io.vertx.core.impl.logging.LoggerFactory; +import io.vertx.core.internal.logging.Logger; +import io.vertx.core.internal.logging.LoggerFactory; import io.vertx.core.json.JsonArray; import io.vertx.core.json.JsonObject; diff --git a/src/main/java/com/romanpierson/vertx/web/accesslogger/appender/logging/impl/LoggingAppender.java b/src/main/java/com/romanpierson/vertx/web/accesslogger/appender/logging/impl/LoggingAppender.java index 68122b4..816faa2 100644 --- a/src/main/java/com/romanpierson/vertx/web/accesslogger/appender/logging/impl/LoggingAppender.java +++ b/src/main/java/com/romanpierson/vertx/web/accesslogger/appender/logging/impl/LoggingAppender.java @@ -16,8 +16,8 @@ import com.romanpierson.vertx.web.accesslogger.AccessLoggerConstants; import com.romanpierson.vertx.web.accesslogger.appender.Appender; -import io.vertx.core.impl.logging.Logger; -import io.vertx.core.impl.logging.LoggerFactory; +import io.vertx.core.internal.logging.Logger; +import io.vertx.core.internal.logging.LoggerFactory; import io.vertx.core.json.JsonObject; import static com.romanpierson.vertx.web.accesslogger.util.FormatUtility.getStringifiedParameterValues; diff --git a/src/main/java/com/romanpierson/vertx/web/accesslogger/configuration/pattern/PatternResolver.java b/src/main/java/com/romanpierson/vertx/web/accesslogger/configuration/pattern/PatternResolver.java index bb0383f..02c0a2c 100644 --- a/src/main/java/com/romanpierson/vertx/web/accesslogger/configuration/pattern/PatternResolver.java +++ b/src/main/java/com/romanpierson/vertx/web/accesslogger/configuration/pattern/PatternResolver.java @@ -21,8 +21,8 @@ import com.romanpierson.vertx.web.accesslogger.configuration.element.AccessLogElement; -import io.vertx.core.impl.logging.Logger; -import io.vertx.core.impl.logging.LoggerFactory; +import io.vertx.core.internal.logging.Logger; +import io.vertx.core.internal.logging.LoggerFactory; import io.vertx.core.json.JsonObject; public class PatternResolver { diff --git a/src/main/java/com/romanpierson/vertx/web/accesslogger/impl/AccessLoggerHandlerImpl.java b/src/main/java/com/romanpierson/vertx/web/accesslogger/impl/AccessLoggerHandlerImpl.java index e889394..8e54dce 100644 --- a/src/main/java/com/romanpierson/vertx/web/accesslogger/impl/AccessLoggerHandlerImpl.java +++ b/src/main/java/com/romanpierson/vertx/web/accesslogger/impl/AccessLoggerHandlerImpl.java @@ -33,8 +33,8 @@ import io.vertx.core.http.Cookie; import io.vertx.core.http.HttpServerRequest; import io.vertx.core.http.HttpServerResponse; -import io.vertx.core.impl.logging.Logger; -import io.vertx.core.impl.logging.LoggerFactory; +import io.vertx.core.internal.logging.Logger; +import io.vertx.core.internal.logging.LoggerFactory; import io.vertx.core.json.JsonArray; import io.vertx.core.json.JsonObject; import io.vertx.ext.web.RoutingContext; diff --git a/src/main/java/com/romanpierson/vertx/web/accesslogger/util/FormatUtility.java b/src/main/java/com/romanpierson/vertx/web/accesslogger/util/FormatUtility.java index 405ad00..f18c6b0 100644 --- a/src/main/java/com/romanpierson/vertx/web/accesslogger/util/FormatUtility.java +++ b/src/main/java/com/romanpierson/vertx/web/accesslogger/util/FormatUtility.java @@ -16,8 +16,8 @@ import java.util.List; -import io.vertx.core.impl.logging.Logger; -import io.vertx.core.impl.logging.LoggerFactory; +import io.vertx.core.internal.logging.Logger; +import io.vertx.core.internal.logging.LoggerFactory; public class FormatUtility { diff --git a/src/main/java/com/romanpierson/vertx/web/accesslogger/verticle/AccessLoggerProducerVerticle.java b/src/main/java/com/romanpierson/vertx/web/accesslogger/verticle/AccessLoggerProducerVerticle.java index 0af0645..3339480 100644 --- a/src/main/java/com/romanpierson/vertx/web/accesslogger/verticle/AccessLoggerProducerVerticle.java +++ b/src/main/java/com/romanpierson/vertx/web/accesslogger/verticle/AccessLoggerProducerVerticle.java @@ -31,8 +31,8 @@ import com.romanpierson.vertx.web.accesslogger.exception.AccessLoggerException; import io.vertx.core.AbstractVerticle; -import io.vertx.core.impl.logging.Logger; -import io.vertx.core.impl.logging.LoggerFactory; +import io.vertx.core.internal.logging.Logger; +import io.vertx.core.internal.logging.LoggerFactory; import io.vertx.core.json.JsonArray; import io.vertx.core.json.JsonObject; diff --git a/src/test/java/com/romanpierson/vertx/web/accesslogger/appender/MemoryAppender.java b/src/test/java/com/romanpierson/vertx/web/accesslogger/appender/MemoryAppender.java index 1467e35..1f195e3 100644 --- a/src/test/java/com/romanpierson/vertx/web/accesslogger/appender/MemoryAppender.java +++ b/src/test/java/com/romanpierson/vertx/web/accesslogger/appender/MemoryAppender.java @@ -17,8 +17,8 @@ import com.romanpierson.vertx.web.accesslogger.AccessLoggerConstants; -import io.vertx.core.impl.logging.Logger; -import io.vertx.core.impl.logging.LoggerFactory; +import io.vertx.core.internal.logging.Logger; +import io.vertx.core.internal.logging.LoggerFactory; import io.vertx.core.json.JsonObject; import static com.romanpierson.vertx.web.accesslogger.util.FormatUtility.getStringifiedParameterValues;