diff --git a/build.gradle b/build.gradle index fd0ee75b5d..b130820843 100644 --- a/build.gradle +++ b/build.gradle @@ -53,70 +53,70 @@ ext { } modifiedFiles.finalizeValueOnRead() - apacheSshdVersion = '2.10.0' - artemisVersion = '2.31.0' + apacheSshdVersion = '2.11.0' + artemisVersion = '2.31.2' aspectjVersion = '1.9.20.1' assertjVersion = '3.24.2' assertkVersion = '0.27.0' avroVersion = '1.11.3' awaitilityVersion = '4.2.0' camelVersion = '4.1.0' - commonsDbcp2Version = '2.10.0' - commonsIoVersion = '2.14.0' + commonsDbcp2Version = '2.11.0' + commonsIoVersion = '2.15.0' commonsNetVersion = '3.10.0' curatorVersion = '5.5.0' debeziumVersion = '2.4.0.Final' derbyVersion = '10.16.1.1' findbugsVersion = '3.0.1' ftpServerVersion = '1.2.0' - graalvmVersion = '23.0.1' - greenmailVersion = '2.1.0-alpha-2' + graalvmVersion = '23.0.2' + greenmailVersion = '2.1.0-alpha-3' groovyVersion = '4.0.15' hamcrestVersion = '2.2' - hazelcastVersion = '5.3.2' + hazelcastVersion = '5.3.5' hibernateVersion = '6.3.1.Final' hsqldbVersion = '2.7.2' h2Version = '2.2.224' jacksonVersion = '2.15.3' jaxbVersion = '4.0.3' - jcifsVersion = '2.1.36' + jcifsVersion = '2.1.37' jeroMqVersion = '0.5.4' jmsApiVersion = '3.1.0' jpaApiVersion = '3.1.0' jrubyVersion = '9.4.3.0' jsonpathVersion = '2.8.0' junit4Version = '4.13.2' - junitJupiterVersion = '5.10.0' + junitJupiterVersion = '5.10.1' jythonVersion = '2.7.3' kotlinCoroutinesVersion = '1.7.3' kryoVersion = '5.5.0' lettuceVersion = '6.2.6.RELEASE' - log4jVersion = '2.20.0' + log4jVersion = '2.21.1' mailVersion = '2.0.2' - micrometerTracingVersion = '1.2.0-RC1' - micrometerVersion = '1.12.0-RC1' - mockitoVersion = '5.6.0' + micrometerTracingVersion = '1.2.0-SNAPSHOT' + micrometerVersion = '1.12.0-SNAPSHOT' + mockitoVersion = '5.7.0' mongoDriverVersion = '4.11.0' mysqlVersion = '8.0.33' oracleVersion = '23.3.0.23.09' pahoMqttClientVersion = '1.2.5' postgresVersion = '42.6.0' - protobufVersion = '3.24.4' + protobufVersion = '3.25.0' r2dbch2Version = '1.0.0.RELEASE' - reactorVersion = '2023.0.0-RC1' + reactorVersion = '2023.0.0-SNAPSHOT' resilience4jVersion = '2.1.0' romeToolsVersion = '2.1.0' rsocketVersion = '1.1.4' servletApiVersion = '6.0.0' smackVersion = '4.4.6' - springAmqpVersion = '3.1.0-RC1' - springDataVersion = '2023.1.0-RC1' - springGraphqlVersion = '1.2.3' - springKafkaVersion = '3.1.0-RC1' + springAmqpVersion = '3.1.0-SNAPSHOT' + springDataVersion = '2023.1.0-SNAPSHOT' + springGraphqlVersion = '1.2.4-SNAPSHOT' + springKafkaVersion = '3.1.0-SNAPSHOT' springRetryVersion = '2.0.4' - springSecurityVersion = '6.2.0-RC2' - springVersion = '6.1.0-RC1' - springWsVersion = '4.0.6' + springSecurityVersion = '6.2.0-SNAPSHOT' + springVersion = '6.1.0-SNAPSHOT' + springWsVersion = '4.0.7' testcontainersVersion = '1.19.1' tomcatVersion = '10.1.15' xmlUnitVersion = '2.9.1' diff --git a/gradle/docs.gradle b/gradle/docs.gradle index 36bd06a1ff..bf0e522c54 100644 --- a/gradle/docs.gradle +++ b/gradle/docs.gradle @@ -1,5 +1,5 @@ ext { - micrometerDocsVersion='1.0.1' + micrometerDocsVersion='1.0.2' } @@ -16,7 +16,7 @@ antora { '@antora/atlas-extension': '1.0.0-alpha.2', '@antora/collector-extension': '1.0.0-alpha.3', '@asciidoctor/tabs': '1.0.0-beta.6', - '@springio/antora-extensions': '1.5.0', + '@springio/antora-extensions': '1.8.0', '@springio/asciidoctor-extensions': '1.0.0-alpha.9', ] } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 033e24c4cd..7f93135c49 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 c2447881d4..46671acb6e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=03ec176d388f2aa99defcadc3ac6adf8dd2bce5145a129659537c0874dea5ad1 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip +distributionSha256Sum=3e1af3ae886920c3ac87f7a91f816c0c7c436f276a6eefdb3da152100fef72ae +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index fcb6fca147..1aa94a4269 100755 --- a/gradlew +++ b/gradlew @@ -83,7 +83,8 @@ done # This is normally unused # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit +# 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 # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -144,7 +145,7 @@ 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 + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -152,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | soft) :;; #( *) # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -201,11 +202,11 @@ 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 -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_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" \ diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/outbound/AmqpOutboundEndpointTests2.java b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/outbound/AmqpOutboundEndpointTests2.java index 981a7f9ccc..7b55cecb05 100644 --- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/outbound/AmqpOutboundEndpointTests2.java +++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/outbound/AmqpOutboundEndpointTests2.java @@ -1,5 +1,5 @@ /* - * Copyright 2019-2022 the original author or authors. + * Copyright 2019-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -92,7 +92,7 @@ public class AmqpOutboundEndpointTests2 { void testWithReject(@Autowired IntegrationFlow flow, @Autowired RabbitAdmin admin, @Autowired RabbitTemplate template) { - Queue queue = QueueBuilder.nonDurable().autoDelete().maxLength(1).overflow(Overflow.rejectPublish).build(); + Queue queue = QueueBuilder.nonDurable().autoDelete().maxLength(1L).overflow(Overflow.rejectPublish).build(); admin.declareQueue(queue); flow.getInputChannel().send(new GenericMessage<>("test", Collections.singletonMap("rk", queue.getName()))); assertThatThrownBy(() -> flow.getInputChannel() diff --git a/src/reference/antora/antora-playbook.yml b/src/reference/antora/antora-playbook.yml index 53bcf5ae93..40bd9ab64a 100644 --- a/src/reference/antora/antora-playbook.yml +++ b/src/reference/antora/antora-playbook.yml @@ -38,4 +38,4 @@ runtime: format: pretty ui: bundle: - url: https://github.com/spring-io/antora-ui-spring/releases/download/v0.3.4/ui-bundle.zip \ No newline at end of file + url: https://github.com/spring-io/antora-ui-spring/releases/download/v0.4.7/ui-bundle.zip \ No newline at end of file