Commit Graph

10128 Commits

Author SHA1 Message Date
Stephane Nicoll
ad29a6ec07 Upgrade to Spring Integration 4.3.7.RELEASE
Closes gh-8032
2017-01-26 09:12:57 +01: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
Andy Wilkinson
cd5124005b Deprecate support for module layout
Closes gh-8008
2017-01-25 16:40:42 +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
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
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
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
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
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
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
Andy Wilkinson
988ad6b911 Merge branch '1.4.x' into 1.5.x 2017-01-24 17:13:31 +00:00
Andy Wilkinson
bd58a6de66 Upgrade to Jaybird 2.2.12
Closes gh-8086
2017-01-24 16:33:06 +00:00
Andy Wilkinson
f8056f9888 Upgrade to Elasticsearch 2.4.4
Closes gh-8085
2017-01-24 16:33:06 +00:00
Andy Wilkinson
96f6f42b32 Upgrade to Jetty 9.3.16.v20170120
Closes gh-8084
2017-01-24 16:33:05 +00:00
Andy Wilkinson
70cd5c42ed Upgrade to Groovy 2.4.8
Closes gh-8083
2017-01-24 16:33:05 +00:00
Andy Wilkinson
fcd5477334 Upgrade to Httpcore 4.4.6
Closes gh-8082
2017-01-24 16:33:04 +00:00
Andy Wilkinson
a736102a4b Upgrade to Activemq 5.13.5
Closes gh-8081
2017-01-24 16:33:04 +00:00
Andy Wilkinson
ec70046e27 Upgrade to Joda Time 2.9.7
Closes gh-8080
2017-01-24 16:33:03 +00:00
Andy Wilkinson
b5cecd42d1 Upgrade to Undertow 1.3.26.Final
Closes gh-8079
2017-01-24 16:33:03 +00:00
Andy Wilkinson
b43a8c2069 Upgrade to Jackson 2.8.6
Closes gh-8078
2017-01-24 16:33:02 +00:00
Andy Wilkinson
fe17a0efa2 Upgrade to Logback 1.1.9
Closes gh-69
2017-01-24 16:22:55 +00:00
Andy Wilkinson
1debd83b55 Upgrade to Dependency Management Plugin 1.0.0.RELEASE
Closes gh-8018
2017-01-24 12:40:39 +00:00
Andy Wilkinson
013d45a4d7 Upgrade to Jetty 9.4.1.v20170120
Closes gh-7750
2017-01-24 12:39:22 +00:00
Andy Wilkinson
e3235f2370 Merge branch '1.4.x' into 1.5.x 2017-01-24 12:30:30 +00:00
Andy Wilkinson
1607f682db Start building against Spring Framework 4.3.6 snapshots
See gh-7774
2017-01-24 12:28:24 +00:00
Stephane Nicoll
5d95fb6d56 Merge pull request #8076 from izeye:polish-20170124
* pr/8076:
  Polish
2017-01-24 13:22:46 +01:00
Johnny Lim
e0de28a1f7 Polish
Closes gh-8076
2017-01-24 13:22:22 +01:00
Andy Wilkinson
b00d1e59f4 Silence deprecation warnings in YamlConfigurationFactoryTests 2017-01-24 10:56:44 +00:00
Andy Wilkinson
1a69a4ff67 Remove unnecessary use of @Autowired in the samples 2017-01-24 10:52:50 +00:00
Andy Wilkinson
5efa6370cb Include test-support module in the prepare profile 2017-01-24 09:51:31 +00:00