diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index bc0d6690..ffe6da2e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,35 +3,35 @@ opendcs = "7.5.1-RC18" servlet-api = "6.1.0" slf4j = { strictly = "2.0.17" } -jersey = "4.0.0" +jersey = "4.0.1" -swagger = "2.2.41" -swagger-ui = "5.18.3" -swagger-parser = "2.1.25" +swagger = "2.2.42" +swagger-ui = "5.31.0" +swagger-parser = "2.1.37" rs-api = "4.0.0" -jackson = "2.20.1" -jackson-annotations = "2.20" -selenium = "4.38.0" +jackson = "2.21.0" +jackson-annotations = "2.21" +selenium = "4.40.0" nimbus = "9.41.1" -jwt = "4.4.0" +jwt = "4.5.0" auto-service = "1.1.1" -jaxb = "4.0.0" +jaxb = "4.0.4" -swagger-codegen = "3.0.61" +swagger-codegen = "3.0.76" jakarta-annotation-api = "1.3.5" jsr305 = "3.0.2" -openapitools-databind-nullable = "0.2.1" +openapitools-databind-nullable = "0.2.8" httpmime-version = "4.5.13" #Test Dependencies junit = "5.10.2" mockito = "4.11.0" -byte-buddy = "1.15.3" +byte-buddy = "1.18.4" rest-assured = "5.5.0" hamcrest = "3.0" -tomcat = "11.0.14" -commons-io = "2.11.0" -commons-lang = "2.5" +tomcat = "11.0.15" +commons-io = "2.21.0" +commons-lang = "2.6" test-containers = { strictly = "2.0.2"} [libraries] @@ -40,7 +40,7 @@ opendcs-api = { module = "org.opendcs:opendcs-api", version.ref = "opendcs" } opendcs-schemas = { module = "org.opendcs:opendcs-schemas", version.ref = "opendcs" } opendcs-schemas-cwms = { module = "org.opendcs:opendcs-schemas-cwms-oracle", version.ref = "opendcs" } -jdbi = { module = "org.jdbi:jdbi3-core", version = "3.39.1" } +jdbi = { module = "org.jdbi:jdbi3-core", version = "3.51.0" } servlet-api = { module = "jakarta.servlet:jakarta.servlet-api", version.ref = "servlet-api" } rs-api = { module = "jakarta.ws.rs:jakarta.ws.rs-api", version.ref="rs-api" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index d64cd491..61285a65 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 bad7c246..19a6bdeb 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-9.2.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 1aa94a42..adff685a 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright © 2015-2021 the original authors. +# Copyright © 2015 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -55,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/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/. @@ -84,7 +86,7 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -112,7 +114,6 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar # Determine the Java command to use to start the JVM. @@ -170,7 +171,6 @@ fi # For Cygwin or MSYS, switch paths to Windows format before running java if "$cygwin" || "$msys" ; then APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) JAVACMD=$( cygpath --unix "$JAVACMD" ) @@ -203,15 +203,14 @@ fi DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Collect all arguments for the java command: -# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, # and any embedded shellness will be escaped. # * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be # treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" # Stop when "xargs" is not available. diff --git a/gradlew.bat b/gradlew.bat old mode 100644 new mode 100755 index 6689b85b..e509b2dd --- a/gradlew.bat +++ b/gradlew.bat @@ -13,6 +13,8 @@ @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 ########################################################################## @@ -43,11 +45,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,22 +59,21 @@ 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 :execute @rem Setup the command line -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* +"%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 diff --git a/java/api-clients/api-client-java/build.gradle b/java/api-clients/api-client-java/build.gradle index 89046f86..921a7dd5 100644 --- a/java/api-clients/api-client-java/build.gradle +++ b/java/api-clients/api-client-java/build.gradle @@ -3,7 +3,7 @@ plugins { id 'opendcs-rest-api.java-conventions' id 'opendcs-rest-api.publishing-conventions' id 'java-library' - id "org.openapi.generator" version "7.17.0" + id "org.openapi.generator" version "7.19.0" } configurations { diff --git a/java/api-clients/api-client-typescript/build.gradle b/java/api-clients/api-client-typescript/build.gradle index d5952283..f17f890a 100644 --- a/java/api-clients/api-client-typescript/build.gradle +++ b/java/api-clients/api-client-typescript/build.gradle @@ -1,7 +1,7 @@ plugins { id 'base' id 'opendcs-rest-api.deps-conventions' - id "org.openapi.generator" version "7.17.0" + id "org.openapi.generator" version "7.19.0" id 'com.github.node-gradle.node' version '7.1.0' id 'java-library' } diff --git a/java/opendcs-rest-api/build.gradle b/java/opendcs-rest-api/build.gradle index c6bb64f5..096d95f1 100644 --- a/java/opendcs-rest-api/build.gradle +++ b/java/opendcs-rest-api/build.gradle @@ -18,7 +18,7 @@ plugins { id "opendcs-rest-api.deps-conventions" id "opendcs-rest-api.publishing-conventions" id "war" - id "io.swagger.core.v3.swagger-gradle-plugin" version "2.2.41" + id "io.swagger.core.v3.swagger-gradle-plugin" version "2.2.42" } configurations { diff --git a/java/opendcs-web-ui/build.gradle b/java/opendcs-web-ui/build.gradle index 1e1b3724..b928e3eb 100644 --- a/java/opendcs-web-ui/build.gradle +++ b/java/opendcs-web-ui/build.gradle @@ -18,7 +18,7 @@ plugins { id "opendcs-rest-api.deps-conventions" id "opendcs-rest-api.publishing-conventions" id "war" - id "com.netflix.nebula.jakartaee-migration" version "2.0.0" + id "com.netflix.nebula.jakartaee-migration" version "2.0.1" } configurations { @@ -48,7 +48,7 @@ dependencies { runtimeOnly("org.webjars:jquery") runtimeOnly("org.webjars:select2:4.0.13") runtimeOnly("org.webjars:d3js:6.7.0") - runtimeOnly("org.webjars:jquery-validation:1.20.0") + runtimeOnly("org.webjars:jquery-validation:1.21.0") runtimeOnly("org.webjars:pickadate.js:3.6.4") runtimeOnly("org.webjars:bootstrap-daterangepicker:3.1") runtimeOnly("org.webjars:momentjs:2.30.1-1")