Skip to content

Commit b9478ac

Browse files
committed
Upgrade dependencies; fix some typos in docs
1 parent 9a43726 commit b9478ac

File tree

4 files changed

+19
-18
lines changed

4 files changed

+19
-18
lines changed

build.gradle

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@ ext {
4242
modifiedFiles =
4343
files(grgit.status().unstaged.modified).filter{ f -> f.name.endsWith('.java') || f.name.endsWith('.kt') }
4444

45-
activeMqVersion = '5.15.9'
45+
activeMqVersion = '5.15.10'
4646
apacheSshdVersion = '2.3.0'
4747
avroVersion = '1.9.0'
4848
aspectjVersion = '1.9.4'
49-
assertjVersion = '3.13.1'
49+
assertjVersion = '3.13.2'
5050
assertkVersion = '0.19'
51-
awaitilityVersion = '3.1.6'
51+
awaitilityVersion = '4.0.0'
5252
boonVersion = '0.34'
5353
commonsDbcp2Version = '2.6.0'
5454
commonsIoVersion = '2.6'
@@ -57,10 +57,10 @@ ext {
5757
derbyVersion = '10.14.2.0'
5858
ftpServerVersion = '1.1.1'
5959
googleJsr305Version = '3.0.2'
60-
groovyVersion = '2.5.7'
60+
groovyVersion = '2.5.8'
6161
hamcrestVersion = '2.1'
62-
hazelcastVersion = '3.12.1'
63-
hibernateVersion = '5.4.3.Final'
62+
hazelcastVersion = '3.12.2'
63+
hibernateVersion = '5.4.4.Final'
6464
hsqldbVersion = '2.5.0'
6565
h2Version = '1.4.199'
6666
jackson2Version = '2.9.9.20190807'
@@ -69,7 +69,7 @@ ext {
6969
jmsApiVersion = '2.0.1'
7070
jpa21ApiVersion = '1.0.2.Final'
7171
jpaApiVersion = '2.2.1'
72-
jrubyVersion = '9.2.7.0'
72+
jrubyVersion = '9.2.8.0'
7373
jschVersion = '0.1.55'
7474
jsonpathVersion = '2.4.0'
7575
junit4Version = '4.12'
@@ -78,15 +78,15 @@ ext {
7878
jythonVersion = '2.7.0'
7979
kryoShadedVersion = '4.0.2'
8080
lettuceVersion = '5.1.8.RELEASE'
81-
log4jVersion = '2.12.0'
81+
log4jVersion = '2.12.1'
8282
micrometerVersion = '1.2.0'
8383
mockitoVersion = '3.0.0'
8484
mysqlVersion = '8.0.16'
8585
pahoMqttClientVersion = '1.2.0'
8686
postgresVersion = '42.2.6'
87-
reactorNettyVersion = '0.9.0.BUILD-SNAPSHOT'
88-
reactorVersion = '3.3.0.BUILD-SNAPSHOT'
89-
resilience4jVersion = '0.16.0'
87+
reactorNettyVersion = '0.9.0.RC1'
88+
reactorVersion = '3.3.0.RC1'
89+
resilience4jVersion = '0.17.0'
9090
romeToolsVersion = '1.12.1'
9191
rsocketVersion = '1.0.0-RC3'
9292
servletApiVersion = '4.0.1'
@@ -98,9 +98,9 @@ ext {
9898
springGemfireVersion = '2.2.0.BUILD-SNAPSHOT'
9999
springSecurityVersion = '5.2.0.BUILD-SNAPSHOT'
100100
springRetryVersion = '1.2.4.RELEASE'
101-
springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.2.0.BUILD-SNAPSHOT'
101+
springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.2.0.RC2'
102102
springWsVersion = '3.0.7.RELEASE'
103-
tomcatVersion = "9.0.19"
103+
tomcatVersion = "9.0.24"
104104
xstreamVersion = '1.4.11.1'
105105
}
106106

@@ -325,7 +325,7 @@ subprojects { subproject ->
325325

326326
checkstyle {
327327
configFile = file("$rootDir/src/checkstyle/checkstyle.xml")
328-
toolVersion = "8.21"
328+
toolVersion = "8.24"
329329
}
330330

331331
artifacts {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

gradlew

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,8 @@ if $darwin; then
125125
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
126126
fi
127127

128-
# For Cygwin, switch paths to Windows format before running java
129-
if $cygwin ; then
128+
# For Cygwin or MSYS, switch paths to Windows format before running java
129+
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
130130
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
131131
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
132132
JAVACMD=`cygpath --unix "$JAVACMD"`

src/reference/asciidoc/endpoint.adoc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -517,6 +517,7 @@ public class TestConverter implements Converter<Boolean, Number> {
517517
====
518518

519519
Alternately, you can use the `@Configuration` annotation, as the following example shows:
520+
520521
[source,java]
521522
----
522523
@Configuration
@@ -621,7 +622,7 @@ The preceding configuration demonstrates an out-of-tune configuration.
621622

622623
By default, the task executor has an unbounded task queue.
623624
The poller keeps scheduling new tasks even though all the threads are blocked, waiting for either a new message to arrive or the timeout to expire.
624-
Given that there are 20 threads executing tasks with a five-second timeout, they aree executed at a rate of 4 per second.
625+
Given that there are 20 threads executing tasks with a five-second timeout, they are executed at a rate of 4 per second.
625626
However, new tasks are being scheduled at a rate of 20 per second, so the internal queue in the task executor grows at a rate of 16 per second (while the process is idle), so we have a memory leak.
626627

627628
One of the ways to handle this is to set the `queue-capacity` attribute of the task executor.

0 commit comments

Comments
 (0)