From: benzelleroehr Date: Mon, 19 May 2025 12:19:24 +0000 (+0200) Subject: chore: Update dependencies X-Git-Tag: 0.2.1^0 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F12%2F140912%2F1;p=portal-ng%2Fpreferences.git chore: Update dependencies - logstash-logback-encoder from 7.4 to 8.1 - liquibase-core from 4.31.0 to 4.31.1 - openapi-generator from 7.0.0-beta to 7.13.0 - gradle-git-properties from 2.4.1 to 2.5.0 - springframework from 3.3.10 to 3.4.5 - gradle-wrapper from 8.2.1-bin to 8.14-bin - apache.commons:commons-lang3 from 3.15.0 to 3.17.0 - spring-boot-starter-webflux from 3.3.10 to 3.4.5 Issue-ID: PORTALNG-145 Change-Id: I87e3ef88887c4d3926543db85c33719f998f857b Signed-off-by: benzelleroehr --- diff --git a/app/build.gradle b/app/build.gradle index 8fa1db6..b90e538 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -44,10 +44,10 @@ repositories { ext { problemVersion = '0.27.1' - logstashLogbackVersion = '7.2' + logstashLogbackVersion = '8.1' springCloudWiremockVersion = '4.1.5' micrometerVersion = '1.0.0' - liquibaseCoreVersion = '4.31.0' + liquibaseCoreVersion = '4.31.1' } dependencies { @@ -68,7 +68,7 @@ dependencies { implementation 'io.micrometer:micrometer-tracing-bridge-otel' implementation 'io.opentelemetry:opentelemetry-exporter-zipkin' implementation 'io.micrometer:micrometer-registry-prometheus' - implementation 'org.apache.commons:commons-lang3:3.15.0' + implementation 'org.apache.commons:commons-lang3:3.17.0' compileOnly 'org.projectlombok:lombok' @@ -119,3 +119,8 @@ def Properties getVersionProperties() { } return versionProperties } + +gitProperties { + // if .git directory is on the same level as the root project + dotGitDirectory = project.rootProject.layout.projectDirectory.dir(".git") +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 249e583..033e24c 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 84a0b92..ca025c8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index a69d9cb..fcb6fca 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,13 +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##*/} - -# 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"' +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,22 +130,29 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. 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 @@ -193,6 +197,10 @@ if "$cygwin" || "$msys" ; then done fi + +# 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"' + # Collect all arguments for the java command; # * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of # shell script including quotes and variable substitutions, so put them in diff --git a/gradlew.bat b/gradlew.bat index 53a6b23..6689b85 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -26,6 +26,7 @@ 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% diff --git a/openapi/build.gradle b/openapi/build.gradle index 7594398..b706f47 100644 --- a/openapi/build.gradle +++ b/openapi/build.gradle @@ -10,7 +10,7 @@ repositories { dependencies { compileOnly 'org.openapitools:openapi-generator:7.0.0-beta' - compileOnly 'org.springframework.boot:spring-boot-starter-webflux:3.3.10' + compileOnly 'org.springframework.boot:spring-boot-starter-webflux:3.4.5' compileOnly 'jakarta.validation:jakarta.validation-api:3.0.2' constraints { diff --git a/settings.gradle b/settings.gradle index f6cbd54..815dbfc 100644 --- a/settings.gradle +++ b/settings.gradle @@ -3,10 +3,10 @@ pluginManagement { // https://docs.gradle.org/current/userguide/plugins.html#sec:plugin_version_management plugins { id 'io.spring.dependency-management' version '1.1.7' - id 'org.springframework.boot' version '3.3.10' + id 'org.springframework.boot' version '3.4.5' id 'com.github.hierynomus.license' version '0.16.1' - id 'com.gorylenko.gradle-git-properties' version '2.4.1' - id 'org.openapi.generator' version '7.0.0-beta' + id 'com.gorylenko.gradle-git-properties' version '2.5.0' + id 'org.openapi.generator' version '7.13.0' } // https://docs.gradle.org/current/userguide/plugins.html#sec:custom_plugin_repositories repositories {