Commit Graph

10672 Commits

Author SHA1 Message Date
Stephane Nicoll
ebfaac95c0 Merge branch '1.5.x' 2017-01-26 09:33:44 +01:00
Brian Clozel
b804d27a0c Add Netty and RxJava dependency management 2017-01-26 09:29:13 +01:00
Stephane Nicoll
9a044d1577 Remove unused classes 2017-01-26 09:22:41 +01:00
Stephane Nicoll
219acc6b58 Merge branch '1.5.x' 2017-01-26 09:15:45 +01:00
Stephane Nicoll
265ebe784c Merge branch '1.4.x' into 1.5.x 2017-01-26 09:15:23 +01:00
Stephane Nicoll
8a3e82734e Start building against snapshots for Spring Data Hopper SR7
See gh-8112
2017-01-26 09:14:14 +01:00
Stephane Nicoll
ad29a6ec07 Upgrade to Spring Integration 4.3.7.RELEASE
Closes gh-8032
2017-01-26 09:12:57 +01:00
Phillip Webb
17451c5e7a Merge branch '1.5.x' 2017-01-25 22:24:07 -08:00
Phillip Webb
6f19538028 Update CLI open_source_licenses.txt for json
Update the open_source_licenses file to reflect the fact that the
org.json library is no longer used.

See gh-5929
2017-01-25 22:12:37 -08:00
Phillip Webb
f3db8c90c7 Merge branch '1.4.x' into 1.5.x 2017-01-25 22:09:50 -08:00
Phillip Webb
ae910f3169 Update CLI open_source_licenses.txt file
Closes gh-7703
2017-01-25 22:05:00 -08:00
Phillip Webb
0af53b361f Ensure embedded start can be called multiple times
Update all `EmbeddedServletContainer` implementations to ensure that
the `start()` method can be called multiple times, with the second call
being ignored.

Fixes gh-8036
2017-01-25 20:50:23 -08:00
Phillip Webb
ef69ae6a89 Ensure logging filters are removed on cleanup
Update `Log4J2LoggingSystem` and `LogbackLoggingSystem` to ensure
that filters are removed when the `cleanUp` method is called. Prior
to this commit application failures would not remove the filter and
no log messages would appear.

The `LoggingApplicationListener` has also been updated since it
previously failed to handle `ApplicationFailureEvents`.

Finally `EventPublishingRunListener` and `DelegatingApplicationListener`
have been updated to deal with `null` parameters and to cope with
listener errors.

Fixes gh-7758
2017-01-25 19:13:46 -08:00
Phillip Webb
3d619da553 Polish 2017-01-25 16:56:22 -08:00
Phillip Webb
71601c3b96 Merge branch '1.4.x' into 1.5.x 2017-01-25 16:48:33 -08:00
Phillip Webb
2cf93f89f5 Polish 2017-01-25 16:45:59 -08:00
Madhura Bhave
a7f148091e Remove binding from ConfigFileApplicationListener
Closes gh-8101
2017-01-25 09:19:51 -08:00
Andy Wilkinson
bdf903896f Remove support for module layout
Closes gh-8107
2017-01-25 16:49:37 +00:00
Andy Wilkinson
3ce6d8e5b5 Merge branch '1.5.x' 2017-01-25 16:41:13 +00:00
Andy Wilkinson
cd5124005b Deprecate support for module layout
Closes gh-8008
2017-01-25 16:40:42 +00:00
Andy Wilkinson
0e4b9b5738 Merge branch '1.5.x' 2017-01-25 15:26:55 +00:00
Andy Wilkinson
a081c96523 Merge branch '1.4.x' into 1.5.x 2017-01-25 15:26:43 +00:00
Andy Wilkinson
daf6be46f6 Revert "Upgrade to Groovy 2.4.8"
This reverts commit 70cd5c42ed.

See gh-8083
2017-01-25 15:24:33 +00:00
Andy Wilkinson
05831e4b87 Merge branch '1.5.x' 2017-01-25 14:55:39 +00:00
Andy Wilkinson
37cf31f450 Upgrade to Couchbase Java Client 2.3.7
In version 2.3.6 and earlier, an attempt to create a Bucket or a
ClusterInfo would fail fast with a ConnectException in the cause of
the Couchbase server was done. In 2.3.7 this remains true for a
Bucket but is no longer the case for ClusterInfo. The latter now
retries for 75 seconds by default and when it eventually fails a
ConnectException is no longer part of the cause chain.

This commit makes the auto-configured ClusterInfo depend on the
auto-configured Bucket. This means that the Bucket is always created
before the ClusterInfo, thereby ensuring that things fail gracefully
with useful diagnostics when the server is unavailable.

Closes gh-8092
2017-01-25 14:55:28 +00:00
Stephane Nicoll
b6064fff46 Merge branch '1.5.x' 2017-01-25 15:54:06 +01:00
Stephane Nicoll
9a65968cb3 Merge branch '1.4.x' into 1.5.x 2017-01-25 15:53:16 +01:00
Stephane Nicoll
feb496fecd Upgrade to Spring Framework 4.3.6.RELEASE
Closes gh-7774
2017-01-25 15:51:29 +01:00
Andy Wilkinson
e8f8556df3 Remove remapping of Thymeleaf's logging as it is no longer necessary
Thymeleaf 3.0 no longer logs its initialization information at INFO
level so we no longer need to remap its INFO output to DEBUG.

Closes gh-7657
2017-01-25 14:09:26 +00:00
Andy Wilkinson
9bba73a1a9 Upgrade to Thymeleaf 3 and drop support for Thymleaf 2
This commit raises the minimum supported version of Thymeleaf to
3.0.x. It also upgrades Spring Social to a version that is compatible
with Thymeleaf 3.

Closes gh-7450
Closes gh-6258
See gh-7885
2017-01-25 13:59:09 +00:00
Andy Wilkinson
9c77708fcb Remove Jetty 9.3 sample that was missed in dbd10a8d
See gh-7985
2017-01-25 13:54:25 +00:00
Andy Wilkinson
e14c7dadee Merge branch '1.5.x' 2017-01-25 11:27:27 +00:00
Andy Wilkinson
11d13d10c6 Merge branch '1.4.x' into 1.5.x 2017-01-25 11:27:07 +00:00
Andy Wilkinson
bfee21730c Detect path of exploded war correctly on Windows
Previously, AbstractEmbeddedServletContainerFactory detected an
exploded war by looking for `/WEB-INF/` in the path of its code
source's location. This failed on Windows due to the use of `\` rather
than `/` separators.

This commit updates AbstractEmbeddedServletContainerFactory to
uses the OS's separator rather than hardcoding `/`.

Closes gh-8100
2017-01-25 11:26:03 +00:00
Stephane Nicoll
661fd848eb Merge branch '1.5.x' 2017-01-25 11:02:32 +01:00
Stephane Nicoll
505e7f75ea Polish contribution
Closes gh-8089
2017-01-25 11:01:53 +01:00
dreis
d58f38f6f6 Use String.replace() with single char if possible
See gh-8089
2017-01-25 11:01:52 +01:00
Stephane Nicoll
551bfb2c60 Polish contribution
Closes gh-8103
2017-01-25 11:01:52 +01:00
Johnny Lim
32f9e90de5 Replace 'String.length() == 0' with 'String.isEmpty()'
See gh-8103
2017-01-25 11:01:52 +01:00
Stephane Nicoll
79233b019e Fix keys format for embedded mongodb support
Closes gh-8102
2017-01-25 11:01:52 +01:00
Dave Syer
50c1e363ad Merge remote-tracking branch 'origin/1.5.x' 2017-01-25 09:44:22 +00:00
Dave Syer
98a4c72c50 Clarify PublicMetrics (uniqueness of metric names)
See gh-6404
2017-01-25 09:43:20 +00:00
Stephane Nicoll
265a712294 Fix keys format for embedded mongodb support
Closes gh-8102
2017-01-25 10:41:47 +01:00
Andy Wilkinson
55c06fcc15 Merge branch '1.5.x' 2017-01-24 21:28:42 +00:00
Andy Wilkinson
5ee46742be Upgrade to Mariadb 1.5.7
Closes gh-8098
2017-01-24 21:27:42 +00:00
Andy Wilkinson
7ae9148caa Upgrade to Jooq 3.9.1
Closes gh-8097
2017-01-24 21:27:42 +00:00
Andy Wilkinson
99a48a9a8c Upgrade to Narayana 5.5.1.Final
Closes gh-8096
2017-01-24 21:27:42 +00:00
Andy Wilkinson
e42ae87989 Upgrade to Jersey 2.25.1
Closes gh-8095
2017-01-24 21:27:42 +00:00
Andy Wilkinson
31f1ad9bb9 Upgrade to Artemis 1.5.2
Closes gh-8094
2017-01-24 21:27:41 +00:00
Andy Wilkinson
ac4c29bc9f Upgrade to Hazelcast 3.7.5
Closes gh-8093
2017-01-24 21:27:41 +00:00