diff --git a/build.gradle b/build.gradle index 5ed8656fb..50c53b7ab 100644 --- a/build.gradle +++ b/build.gradle @@ -46,10 +46,10 @@ enforce { ext { guiceVersion = "7.0.0" - jettyVersion = "12.1.0" + jettyVersion = "12.1.1" jerseyVersion = "3.1.11" - nettyVersion = "4.2.4.Final" - protobufVersion = "4.32.0" + nettyVersion = "4.2.6.Final" + protobufVersion = "4.32.1" jxlsVersion = "2.14.0" // version 3 has breaking changes } @@ -83,8 +83,8 @@ dependencies { implementation "commons-codec:commons-codec:1.19.0" implementation "com.h2database:h2:2.3.232" implementation "com.mysql:mysql-connector-j:9.4.0" - implementation "org.mariadb.jdbc:mariadb-java-client:3.5.5" - implementation "org.postgresql:postgresql:42.7.7" + implementation "org.mariadb.jdbc:mariadb-java-client:3.5.6" + implementation "org.postgresql:postgresql:42.7.8" implementation "com.microsoft.sqlserver:mssql-jdbc:13.2.0.jre11" implementation "com.zaxxer:HikariCP:7.0.2" implementation "io.netty:netty-buffer:$nettyVersion" @@ -126,12 +126,12 @@ dependencies { implementation "net.java.dev.jna:jna-platform:5.17.0" implementation "com.github.jnr:jnr-posix:3.1.20" implementation "com.google.protobuf:protobuf-java:$protobufVersion" - implementation "software.amazon.awssdk:sns:2.32.25" - implementation "org.apache.kafka:kafka-clients:4.0.0" - implementation "com.hivemq:hivemq-mqtt-client:1.3.7" - implementation "redis.clients:jedis:6.1.0" - implementation "com.google.firebase:firebase-admin:9.5.0" - implementation "com.nimbusds:oauth2-oidc-sdk:11.27.1" + implementation "software.amazon.awssdk:sns:2.34.0" + implementation "org.apache.kafka:kafka-clients:4.1.0" + implementation "com.hivemq:hivemq-mqtt-client:1.3.9" + implementation "redis.clients:jedis:6.2.0" + implementation "com.google.firebase:firebase-admin:9.6.0" + implementation "com.nimbusds:oauth2-oidc-sdk:11.28" implementation "com.rabbitmq:amqp-client:5.26.0" implementation "com.warrenstrange:googleauth:1.5.0" implementation "com.google.openlocationcode:openlocationcode:1.0.4" diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 1b33c55ba..8bdaf60c7 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 d30212c04..d706aba60 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 23d15a936..adff685a0 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. @@ -114,7 +114,6 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH="\\\"\\\"" # Determine the Java command to use to start the JVM. @@ -172,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" ) @@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" diff --git a/gradlew.bat b/gradlew.bat index db3a6ac20..c4bdd3ab8 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -70,11 +70,10 @@ goto fail :execute @rem Setup the command line -set CLASSPATH= @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* +"%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