diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7095b82c..a840c9eb 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,12 +1,12 @@ [versions] idscp2 = "0.19.2" -ktlint = "1.2.1" +ktlint = "1.3.0" # Kotlin library/compiler version -kotlin = "1.9.23" -kotlinx-coroutines = "1.8.0" +kotlin = "2.0.0" +kotlinx-coroutines = "1.8.1" # HTTP client -ktor = "2.3.9" +ktor = "2.3.11" # The used version of the infomodel from IESE infomodel = "4.1.3" @@ -20,10 +20,10 @@ jaxActivation = "1.2.0" camel = "3.18.8" influxDB = "2.24" -guava = "33.1.0-jre" +guava = "33.2.1-jre" junit4 = "4.13.2" -junit5 = "5.10.2" -mockito = "5.11.0" +junit5 = "5.11.0-M2" +mockito = "5.12.0" mapdb = "3.1.0" jnrunix = "0.38.22" protobuf = "3.25.3" @@ -31,7 +31,7 @@ httpclient = "4.5.14" # Needed for policy reasoning with 2p (formerly tuProlog) tup = "4.1.1" -commonsText = "1.11.0" +commonsText = "1.12.0" protonpack = "1.16" # Needed for ACME module @@ -43,7 +43,7 @@ javaxJson = "1.1.4" dockerJavaApi = "0.0.13" # We will pull in a newer version of jackson because of security fixes -jackson = "2.17.0" +jackson = "2.17.1" orgJson = "20220320" @@ -51,17 +51,17 @@ orgJson = "20220320" commonsFileUpload = "1.5" # Needed for info model manager -commonsCli = "1.6.0" +commonsCli = "1.8.0" javaxValidation = "2.0.1.Final" # Needed for web console auth0Jwt = "4.4.0" -swagger = "1.6.13" +swagger = "1.6.14" jose4j = "0.9.6" jetty = "9.4.53.v20231009" -springBoot = "3.2.3" -springSecurity = "6.2.2" +springBoot = "3.3.0" +springSecurity = "6.3.0" bouncyCastle = "1.77" [libraries] @@ -149,13 +149,13 @@ jaxbImpl = ["jaxb-core", "jaxb-impl"] [plugins] springboot = { id = "org.springframework.boot", version.ref = "springBoot" } -spring-dependencyManagement = { id = "io.spring.dependency-management", version = "1.1.4" } +spring-dependencyManagement = { id = "io.spring.dependency-management", version = "1.1.5" } swagger = { id = "com.benjaminsproule.swagger", version = "1.0.14" } protobuf = { id = "com.google.protobuf", version = "0.9.4" } kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } kotlin-plugin-spring = { id = "org.jetbrains.kotlin.plugin.spring", version.ref = "kotlin" } spotless = { id = "com.diffplug.spotless", version = "6.25.0" } -licenseReport = { id = "com.github.jk1.dependency-license-report", version = "2.6" } +licenseReport = { id = "com.github.jk1.dependency-license-report", version = "2.8" } versions = { id = "com.github.ben-manes.versions", version = "0.51.0" } buildconfig = { id = "com.github.gmazzo.buildconfig", version = "5.3.5" } node = { id = "com.github.node-gradle.node", version = "7.0.2" } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7f93135c..d64cd491 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 a80b22ce..a4413138 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-8.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew.bat b/gradlew.bat index 6689b85b..7101f8e4 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -43,11 +43,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +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 @@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +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