diff --git a/dependencies.toml b/dependencies.toml index 1ca3eed55b9..cd44cd974b9 100644 --- a/dependencies.toml +++ b/dependencies.toml @@ -22,7 +22,7 @@ dgs = "7.3.6" dropwizard1 = "1.3.29" dropwizard2 = "2.1.6" dropwizard-metrics = "4.2.19" -errorprone = "2.20.0" +errorprone = "2.21.1" errorprone-gradle-plugin = "3.1.0" eureka = "2.0.1" fastutil = "8.5.12" @@ -30,12 +30,12 @@ finagle = "22.12.0" findbugs = "3.0.2" futures-completable = "0.3.5" futures-extra = "4.3.1" -gax-grpc = "2.31.1" +gax-grpc = "2.32.0" graphql-java = "20.4" graphql-kotlin = "6.5.3" -grpc-java = "1.57.1" +grpc-java = "1.57.2" grpc-kotlin = "1.3.0" -guava = "32.0.1-jre" +guava = "32.1.2-jre" hamcrest = "2.2" hbase = "1.2.6" hibernate-validator6 = "6.2.5.Final" @@ -60,7 +60,7 @@ jetty11-jstl = "11.0.0" jetty93 = "9.3.30.v20211001" jetty94 = "9.4.51.v20230217" jetty-alpn-api = "1.1.3.v20160715" -jmh-core = "1.36" +jmh-core = "1.37" jmh-extras = "0.3.7" jmh-gradle-plugin = "0.7.1" joor = "0.9.14" @@ -74,12 +74,12 @@ kafka = "3.5.1" kotlin = "1.9.0" kotlin-coroutine = "1.7.3" krotodc = "1.0.5" -ktlint-gradle-plugin = "11.5.0" +ktlint-gradle-plugin = "11.5.1" logback12 = "1.2.11" -logback13 = "1.3.8" -logback14 = "1.4.8" -micrometer = "1.11.2" -micrometer-tracing = "1.1.3" +logback13 = "1.3.11" +logback14 = "1.4.11" +micrometer = "1.11.3" +micrometer-tracing = "1.1.4" micrometer-docs-generator = "1.0.2" micrometer13 = "1.3.20" mockito = "4.11.0" @@ -96,7 +96,7 @@ opensaml = "3.4.6" osdetector = "1.7.3" proguard = "7.3.1" prometheus = "0.16.0" -protobuf = "3.23.4" +protobuf = "3.24.0" protobuf-gradle-plugin = "0.8.19" protobuf-jackson = "2.2.0" reactive-grpc = "1.2.4" @@ -141,7 +141,7 @@ thrift017 = { strictly = "0.17.0" } thrift018 = { strictly = "0.18.1" } tomcat8 = "8.5.85" tomcat9 = "9.0.71" -tomcat10 = "10.1.11" +tomcat10 = "10.1.12" xml-apis = "1.4.01" zookeeper = "3.8.2" zookeeper-junit = "1.2" @@ -479,10 +479,7 @@ version.ref = "krotodc" [libraries.guava] module = "com.google.guava:guava" version.ref = "guava" -exclusions = [ - "com.google.errorprone:error_prone_annotations", - "com.google.j2objc:j2objc-annotations", - "org.codehaus.mojo:animal-sniffer-annotations"] +exclusions = "org.codehaus.mojo:animal-sniffer-annotations" relocations = [ { from = "com.google.common", to = "com.linecorp.armeria.internal.shaded.guava" }, { from = "com.google.thirdparty.publicsuffix", to = "com.linecorp.armeria.internal.shaded.publicsuffix" }] diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index c1962a79e29..033e24c4cdf 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 9b0a13f0fb3..d11cdd907dd 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index aeb74cbb43e..fcb6fca147c 100755 --- a/gradlew +++ b/gradlew @@ -130,10 +130,13 @@ 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.