Commit Graph

33172 Commits

Author SHA1 Message Date
Phillip Webb
866ebf7c13 Merge branch '2.3.x' 2020-06-11 12:26:42 -07:00
Phillip Webb
8a249daf1a Refactor PropertiesLauncher so jars can be closed
Refactor the internals of `PropertiesLauncher` so that opened jar files
are tracked and can be closed after a test completes.

See gh-21575
2020-06-11 12:26:08 -07:00
Phillip Webb
29f5468ada Use java 8 compiler
Update Ant smoke test to explicitly use Java 8.
2020-06-11 12:26:08 -07:00
Madhura Bhave
fc9760ba49 Merge branch '2.3.x'
Closes gh-21894
2020-06-11 11:49:06 -07:00
Madhura Bhave
0165fee19c Merge pull request #21872 from dreis2211
* pr/21872:
  Fix deprecation in NettyRSocketServerFactoryTests

Closes gh-21872
2020-06-11 11:47:57 -07:00
dreis2211
469dfc285b Fix deprecation in NettyRSocketServerFactoryTests
See gh-21872
2020-06-11 11:46:11 -07:00
Madhura Bhave
62dd55de22 Merge branch '2.3.x'
Closes gh-21893
2020-06-11 11:37:18 -07:00
Madhura Bhave
fc3c5c8fef Merge pull request #21793 from dreis2211
* pr/21793:
  Link complete Slack message to build log

Closes gh-21793
2020-06-11 11:36:21 -07:00
dreis2211
51cdb9ba54 Link complete Slack message to build log
See gh-21793
2020-06-11 11:36:05 -07:00
Scott Frederick
9d9a501b17 Merge branch '2.3.x'
Closes gh-21892
2020-06-11 11:55:20 -05:00
Scott Frederick
7a2939f129 Use non-blocking I/O for Docker API
This commit changes the NamedPipeSocket used for communication with
a local Docker daemon to use a non-blocking AsynchronousByteChannel
instead of a blocking RandomAccessFile, modeled after a similar
change to the docker-java project. This eliminates the potential for
a blocking call to hang indefinitely.

Fixes gh-21672
2020-06-11 11:53:52 -05:00
Andy Wilkinson
6ac100583c Merge branch '2.3.x'
Closes gh-21891
2020-06-11 17:36:50 +01:00
Andy Wilkinson
d347346a93 Upgrade to Spring Asciidoctor Extensions 0.4.3.RELEASE
Pick up the workaround for the AsciidoctorJ bug that prevents the
configprops macro's attributes from being parsed. The lack of parsing
meant that the envvar format was being lost and properties were being
written in the canonical form instead.

Closes gh-21794
2020-06-11 17:36:25 +01:00
Stephane Nicoll
e847aae988 Merge branch '2.3.x' 2020-06-11 17:13:12 +02:00
Stephane Nicoll
a5e7cf77bb Merge branch '2.2.x' into 2.3.x 2020-06-11 17:12:50 +02:00
Stephane Nicoll
4999ca5f35 Merge branch '2.1.x' into 2.2.x 2020-06-11 17:12:19 +02:00
Spring Buildmaster
08ce50c86e Next development version (v2.2.9.BUILD-SNAPSHOT) 2020-06-11 13:06:12 +00:00
Stephane Nicoll
c15b3747a9 Merge branch '2.3.x' 2020-06-11 13:26:10 +02:00
Stephane Nicoll
93d00f028f Merge branch '2.2.x' into 2.3.x 2020-06-11 13:24:01 +02:00
Stephane Nicoll
f8a0ca0d80 Upgrade to Netty Tcnative 2.0.31.Final
Closes gh-21889
2020-06-11 13:23:35 +02:00
Stephane Nicoll
ca44e83279 Merge branch '2.3.x'
Closes gh-21802
2020-06-11 11:22:37 +02:00
Stephane Nicoll
ca5afb6e90 Fix flaky integration test
Closes gh-21487
2020-06-11 11:20:49 +02:00
Spring Buildmaster
5abca71056 Next development version (v2.1.16.BUILD-SNAPSHOT) 2020-06-11 09:14:56 +00:00
Stephane Nicoll
e7ad3b6157 Merge branch '2.3.x' 2020-06-11 10:37:50 +02:00
Stephane Nicoll
a74afc104c Upgrade to Spring Batch 4.2.4
Closes gh-21784
2020-06-11 10:36:36 +02:00
Stephane Nicoll
e892bc1ff8 Merge branch '2.2.x' into 2.3.x 2020-06-11 10:35:49 +02:00
Stephane Nicoll
9af5f70b75 Upgrade to Spring Batch 4.2.4
Closes gh-21783
2020-06-11 10:34:50 +02:00
Stephane Nicoll
74ab92843e Merge branch '2.3.x' 2020-06-11 09:59:44 +02:00
Stephane Nicoll
cbd5b77fa4 Upgrade to Spring Data Neumann-SR1
Closes gh-21776
2020-06-11 09:58:35 +02:00
Stephane Nicoll
122f5afd42 Upgrade to Spring Integration 5.3.1
Closes gh-21779
2020-06-11 09:58:02 +02:00
Stephane Nicoll
760aec3136 Upgrade to Spring Kafka 2.5.2
Closes gh-21782
2020-06-11 09:57:27 +02:00
Stephane Nicoll
43ef49e2e4 Merge branch '2.3.x' 2020-06-11 08:56:54 +02:00
Stephane Nicoll
92ef361a4a Merge branch '2.2.x' into 2.3.x 2020-06-11 08:56:20 +02:00
Stephane Nicoll
e64bfb80e4 Upgrade to Postgresql 42.2.14
Closes gh-21888
2020-06-11 08:55:47 +02:00
Stephane Nicoll
664436a3d6 Upgrade to Spring Kafka 2.3.9
Closes gh-21781
2020-06-11 08:54:52 +02:00
Stephane Nicoll
028ecfb147 Merge branch '2.1.x' into 2.2.x 2020-06-11 08:54:01 +02:00
Stephane Nicoll
49ba5dc6bc Upgrade to Postgresql 42.2.14
Closes gh-21887
2020-06-11 08:44:30 +02:00
Stephane Nicoll
c496f2401f Upgrade to Netty Tcnative 2.0.31.Final
Closes gh-21886
2020-06-11 08:44:29 +02:00
Stephane Nicoll
7dee9e34b5 Upgrade to Spring Kafka 2.2.14
Closes gh-21780
2020-06-11 08:43:39 +02:00
Phillip Webb
087c62d34b Merge branch '2.3.x' 2020-06-10 22:14:44 -07:00
Phillip Webb
3b71403b99 Merge branch '2.2.x' into 2.3.x 2020-06-10 22:14:33 -07:00
Phillip Webb
ac197be815 Fix checkstyle issue 2020-06-10 22:14:09 -07:00
Phillip Webb
aecd13bb9b Merge branch '2.3.x' 2020-06-10 22:06:03 -07:00
Phillip Webb
7e5d6bafa8 Merge branch '2.2.x' into 2.3.x 2020-06-10 22:05:40 -07:00
Phillip Webb
3f36f6ea47 Rollback to Spring Batch 4.2.2
See gh-21885
2020-06-10 22:04:32 -07:00
Phillip Webb
02bfc9d30a Polish 2020-06-10 21:50:17 -07:00
Madhura Bhave
f96a2f2b83 Merge branch '2.3.x'
Closes gh-21881
2020-06-10 18:52:32 -07:00
Madhura Bhave
83485e625d Merge branch '2.2.x' into 2.3.x
Closes gh-21880
2020-06-10 18:50:41 -07:00
Madhura Bhave
4e014da9e9 Return all loggers for Log4j2
This commit aligns log4j2's behavior with logback such that loggers
with a null configuredLevel are also returned by the actuator endpoint.

Fixes gh-20037
2020-06-10 18:48:14 -07:00
Madhura Bhave
92ce94b3d8 Align default log levels for Log4j2 and Logback
Fixes gh-21293
2020-06-10 18:48:01 -07:00