diff --git a/build.gradle.kts b/build.gradle.kts index 4b5df75..c6b4d67 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,7 +1,7 @@ plugins { java - id("org.owasp.dependencycheck") version "12.2.0" - id("org.cyclonedx.bom") version "3.2.0" + id("org.owasp.dependencycheck") version "12.2.2" + id("org.cyclonedx.bom") version "3.2.4" } // Shared versions diff --git a/eventlens-api/build.gradle.kts b/eventlens-api/build.gradle.kts index f6a3287..7952a59 100644 --- a/eventlens-api/build.gradle.kts +++ b/eventlens-api/build.gradle.kts @@ -1,13 +1,13 @@ dependencies { implementation(project(":eventlens-core")) implementation(project(":eventlens-spi")) - implementation("io.javalin:javalin:7.1.0") - implementation("com.fasterxml.jackson.core:jackson-databind:2.21.2") - implementation("com.nimbusds:nimbus-jose-jwt:10.8") + implementation("io.javalin:javalin:7.2.0") + implementation("com.fasterxml.jackson.core:jackson-databind:2.21.3") + implementation("com.nimbusds:nimbus-jose-jwt:10.9") implementation("ch.qos.logback:logback-classic:1.5.32") - implementation("io.micrometer:micrometer-core:1.16.4") - implementation("io.micrometer:micrometer-registry-prometheus:1.16.4") - testImplementation("com.fasterxml.jackson.core:jackson-databind:2.21.2") + implementation("io.micrometer:micrometer-core:1.16.5") + implementation("io.micrometer:micrometer-registry-prometheus:1.16.5") + testImplementation("com.fasterxml.jackson.core:jackson-databind:2.21.3") testImplementation(project(":eventlens-source-postgres")) testImplementation(project(":eventlens-source-mysql")) testImplementation("org.testcontainers:junit-jupiter:1.21.4") diff --git a/eventlens-cli/build.gradle.kts b/eventlens-cli/build.gradle.kts index 09ce891..597599a 100644 --- a/eventlens-cli/build.gradle.kts +++ b/eventlens-cli/build.gradle.kts @@ -5,7 +5,7 @@ dependencies { implementation(project(":eventlens-source-mysql")) implementation(project(":eventlens-stream-kafka")) implementation(project(":eventlens-api")) - implementation("io.javalin:javalin:7.1.0") + implementation("io.javalin:javalin:7.2.0") implementation("info.picocli:picocli:4.7.7") implementation("ch.qos.logback:logback-classic:1.5.32") annotationProcessor("info.picocli:picocli-codegen:4.7.7") diff --git a/eventlens-core/build.gradle.kts b/eventlens-core/build.gradle.kts index 03d5942..aa07d2f 100644 --- a/eventlens-core/build.gradle.kts +++ b/eventlens-core/build.gradle.kts @@ -1,10 +1,10 @@ dependencies { implementation(project(":eventlens-spi")) - implementation("com.fasterxml.jackson.core:jackson-databind:2.21.2") - implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.21.2") - implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.21.2") - implementation("com.github.ben-manes.caffeine:caffeine:3.2.3") - implementation("com.zaxxer:HikariCP:5.1.0") - implementation("org.xerial:sqlite-jdbc:3.50.3.0") + implementation("com.fasterxml.jackson.core:jackson-databind:2.21.3") + implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.21.3") + implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.21.3") + implementation("com.github.ben-manes.caffeine:caffeine:3.2.4") + implementation("com.zaxxer:HikariCP:7.0.2") + implementation("org.xerial:sqlite-jdbc:3.53.0.0") implementation("de.mkammerer:argon2-jvm:2.12") } diff --git a/eventlens-source-mysql/build.gradle.kts b/eventlens-source-mysql/build.gradle.kts index 913e183..5aaa792 100644 --- a/eventlens-source-mysql/build.gradle.kts +++ b/eventlens-source-mysql/build.gradle.kts @@ -1,9 +1,9 @@ dependencies { implementation(project(":eventlens-core")) implementation(project(":eventlens-spi")) - implementation("com.fasterxml.jackson.core:jackson-databind:2.21.2") + implementation("com.fasterxml.jackson.core:jackson-databind:2.21.3") implementation("com.zaxxer:HikariCP:7.0.2") - implementation("com.mysql:mysql-connector-j:9.6.0") + implementation("com.mysql:mysql-connector-j:9.7.0") testImplementation(project(":eventlens-plugin-test")) testImplementation("org.testcontainers:junit-jupiter:1.21.4") diff --git a/eventlens-source-postgres/build.gradle.kts b/eventlens-source-postgres/build.gradle.kts index ba50fad..d8e7a8c 100644 --- a/eventlens-source-postgres/build.gradle.kts +++ b/eventlens-source-postgres/build.gradle.kts @@ -1,9 +1,9 @@ dependencies { implementation(project(":eventlens-core")) implementation(project(":eventlens-spi")) - implementation("com.fasterxml.jackson.core:jackson-databind:2.21.2") + implementation("com.fasterxml.jackson.core:jackson-databind:2.21.3") implementation("com.zaxxer:HikariCP:7.0.2") - implementation("org.postgresql:postgresql:42.7.10") + implementation("org.postgresql:postgresql:42.7.11") testImplementation(project(":eventlens-plugin-test")) testImplementation("org.testcontainers:junit-jupiter:1.21.4") diff --git a/eventlens-spi/build.gradle.kts b/eventlens-spi/build.gradle.kts index 7c0dba1..b4f928f 100644 --- a/eventlens-spi/build.gradle.kts +++ b/eventlens-spi/build.gradle.kts @@ -9,8 +9,8 @@ java { } dependencies { - api("com.fasterxml.jackson.core:jackson-databind:2.21.2") - testImplementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.21.2") + api("com.fasterxml.jackson.core:jackson-databind:2.21.3") + testImplementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.21.3") } publishing { diff --git a/eventlens-stream-kafka/build.gradle.kts b/eventlens-stream-kafka/build.gradle.kts index 5912a41..2e2edeb 100644 --- a/eventlens-stream-kafka/build.gradle.kts +++ b/eventlens-stream-kafka/build.gradle.kts @@ -2,7 +2,7 @@ dependencies { implementation(project(":eventlens-core")) implementation(project(":eventlens-spi")) implementation("org.apache.kafka:kafka-clients:4.2.0") - implementation("com.fasterxml.jackson.core:jackson-databind:2.21.2") + implementation("com.fasterxml.jackson.core:jackson-databind:2.21.3") testImplementation(project(":eventlens-plugin-test")) testImplementation("org.testcontainers:junit-jupiter:1.21.4") diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index d997cfc..b1b8ef5 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 c61a118..b52fb7e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,9 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip networkTimeout=10000 +retries=0 +retryBackOffMs=500 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 0262dcb..b9bb139 100755 --- a/gradlew +++ b/gradlew @@ -57,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/b631911858264c0b6e4d6603d677ff5218766cee/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. diff --git a/gradlew.bat b/gradlew.bat index c4bdd3a..aa5f10b 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,93 +1,82 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem -@rem SPDX-License-Identifier: Apache-2.0 -@rem - -@if "%DEBUG%"=="" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%"=="" set DIRNAME=. -@rem This is normally unused -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if %ERRORLEVEL% equ 0 goto execute - -echo. 1>&2 -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 -echo. 1>&2 -echo Please set the JAVA_HOME variable in your environment to match the 1>&2 -echo location of your Java installation. 1>&2 - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. 1>&2 -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 -echo. 1>&2 -echo Please set the JAVA_HOME variable in your environment to match the 1>&2 -echo location of your Java installation. 1>&2 - -goto fail - -:execute -@rem Setup the command line - - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* - -:end -@rem End local scope for the variables with windows NT shell -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! -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 - -:omega +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables, and ensure extensions are enabled +setlocal EnableExtensions + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +"%COMSPEC%" /c exit 1 + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +"%COMSPEC%" /c exit 1 + +:execute +@rem Setup the command line + + + +@rem Execute Gradle +@rem endlocal doesn't take effect until after the line is parsed and variables are expanded +@rem which allows us to clear the local environment before executing the java command +endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel + +:exitWithErrorLevel +@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts +"%COMSPEC%" /c exit %ERRORLEVEL%