Commit Graph

15169 Commits

Author SHA1 Message Date
Phillip Webb
db2580f8f8 Merge pull request #11839 from dreis2211
* pr/11839:
  Use interfaces for collection declarations
2018-01-29 16:54:43 -08:00
dreis2211
e7248ff273 Use interfaces for collection declarations
Closes gh-11839
2018-01-29 16:54:11 -08:00
Phillip Webb
9a8c182d19 Only use micrometer composites when necessary
Update micrometer auto-configuration so that a `CompositeMeterRegistry`
is only created when more than one `MeterRegistry` bean is declared.
When a composite is crated, it is marked as `@Primary` so that it
can be directly injected. Meter registries can now be defined directly
as beans, and auto-configuration can back off in the usual way.

The `MeterRegistryConfigurer` is now called `MeterRegistryCustomizer`
and is generically types so it's easy to apply customizations to a
particular `MeterRegistry` implementation.

Fixes gh-11799

Co-authored-by: Jon Schneider <jschneider@pivotal.io>
2018-01-29 16:52:01 -08:00
Phillip Webb
798882bd3f Merge branch 'gh-11584' 2018-01-29 14:31:11 -08:00
Phillip Webb
3a12f98bab Migrate callbacks to LambdaSafe util
Migrate existing code to the new `LambaSafe` callback handler.

Closes gh-11584
2018-01-29 14:31:10 -08:00
Phillip Webb
b0cb728944 Add general utility to deal with lambda callbacks
Add `LambdaSafe` utility that provides a consistent way to deal with
the problems that can occur when calling lambda based callbacks.

See gh-11584
2018-01-29 14:31:10 -08:00
Andy Wilkinson
6582afea4a Polish 2018-01-29 21:04:41 +00:00
Andy Wilkinson
e834b25ef1 Polish 2018-01-29 20:20:58 +00:00
Andy Wilkinson
f5102516fa Merge branch '1.5.x' 2018-01-29 20:16:55 +00:00
Andy Wilkinson
4ecc7b9211 Polish 2018-01-29 20:10:29 +00:00
Andy Wilkinson
a58c8d5f7b Upgrade to Spring Kafka 2.1.2.RELEASE
Closes gh-11837
2018-01-29 20:02:54 +00:00
Andy Wilkinson
3e30a06849 Merge branch '1.5.x' 2018-01-29 20:01:41 +00:00
Andy Wilkinson
f8b4018f44 Upgrade to Spring Integration 4.3.14.RELEASE
Closes gh-11836
2018-01-29 20:01:32 +00:00
Andy Wilkinson
06ca702161 Upgrade to Spring Integration 5.0.1.RELEASE
Closes gh-11501
2018-01-29 19:58:13 +00:00
Andy Wilkinson
244a287484 Merge branch '1.5.x' 2018-01-29 19:51:50 +00:00
Andy Wilkinson
7c269a6dc7 Merge pull request #11790 from Alex Panchenko
* gh-11790:
  Polish "Configure ErrorReportValve not to report stack traces"
  Configure ErrorReportValve not to report stack traces
2018-01-29 19:50:20 +00:00
Andy Wilkinson
5a74f63f7c Polish "Configure ErrorReportValve not to report stack traces"
Closes gh-11790
2018-01-29 19:50:07 +00:00
Phillip Webb
af50a18da9 Polish 2018-01-29 09:47:03 -08:00
Alex Panchenko
29736e340e Configure ErrorReportValve not to report stack traces
See gh-11790
2018-01-29 17:23:49 +00:00
Andy Wilkinson
488965bb06 Merge pull request #11834 from Gary Russell
* gh-11834:
  Upgrade to Spring AMQP 2.0.2
2018-01-29 17:12:42 +00:00
Gary Russell
d20585db6f Upgrade to Spring AMQP 2.0.2
Closes gh-11834
2018-01-29 17:12:35 +00:00
Andy Wilkinson
8e90ff66b2 Merge branch '1.5.x' 2018-01-29 17:10:23 +00:00
Andy Wilkinson
4c001e8d56 Merge pull request #11835 from Gary Russell
* gh-11835:
  Upgrade to Spring AMQP 1.7.6
2018-01-29 17:10:05 +00:00
Gary Russell
4ad5045aab Upgrade to Spring AMQP 1.7.6
Closes gh-11835
2018-01-29 17:09:40 +00:00
Andy Wilkinson
32a80f7091 Merge branch '1.5.x' 2018-01-29 16:07:06 +00:00
Andy Wilkinson
2ba2bddc76 Add note to docs about configuration of Log4j 2's JDK logging adapter
Closes gh-11660
2018-01-29 16:04:16 +00:00
Stephane Nicoll
eba476ba6e Disable LoggersEndpoint if the logging system is disabled
Closes gh-11793
2018-01-29 16:37:28 +01:00
Andy Wilkinson
4b47a874ec Merge branch '1.5.x' 2018-01-29 15:25:05 +00:00
Andy Wilkinson
9da6ddb253 Trace IDs of sessions created downstream of trace filter
Closes gh-11717
2018-01-29 15:24:24 +00:00
Andy Wilkinson
7a75ca4685 Upgrade to Postgresql 42.2.1
Closes gh-11833
2018-01-29 14:48:55 +00:00
Andy Wilkinson
11e6bcaf4f Upgrade to Jolokia 1.4.0
Closes gh-11832
2018-01-29 14:48:55 +00:00
Andy Wilkinson
2b01d5c70b Upgrade to Narayana 5.7.2.Final
Closes gh-11831
2018-01-29 14:48:54 +00:00
Andy Wilkinson
d908d0e876 Upgrade to Jackson 2.9.4
Closes gh-11830
2018-01-29 14:48:53 +00:00
Andy Wilkinson
5e2c6609d5 Merge branch '1.5.x' 2018-01-29 14:46:29 +00:00
Andy Wilkinson
7ae39eaebf Upgrade to Spring Security 4.2.4.RELEASE
Closes gh-11829
2018-01-29 14:46:18 +00:00
Andy Wilkinson
70dabdbf39 Add application/json and /xml to default compressible mime types
Closes gh-11828
2018-01-29 14:33:02 +00:00
Andy Wilkinson
844782b20b Remove default JUL handler to prevent duplicate console logging
By default, JUL configures a single root handler. That handler is a
ConsoleHandler. Previously, we removed all root handlers from JUL but
this is problematic in environments where other handlers are
registered with JUL and those handlers need to be retained.
0679d436 attempted to fix the problem by leaving the root handlers in
place and only adding and removing the bridge handler. This resulted
in log output from Tomcat (and anything else that uses JUL) being
duplicated.

This commit makes another attempt at tackling the problem. It attempts
to detect JUL's default configuration (a single root handler that's a
ConsoleHandler) and only removes the handler if it appears to be from
the default configuration. For environments where default JUL
configuration is being used, this will prevent duplicate logging and
for environments where custom JUL configuration is being used, this
will prevent that configuration from being undone.

Closes gh-8933
2018-01-29 14:22:28 +00:00
Stephane Nicoll
c2a2999799 Use proper classloader for value serialization
Closes gh-11822
2018-01-29 13:55:05 +01:00
Andy Wilkinson
9edcd25c25 Simply test for async dispatch metrics filter registration
Previously, the test in MetricsAutoConfigurationIntegrationTests was
testing the functionality of WebMvcMetricsFilter to verify that the
auto-configuration had registered the filter for async dispatches.
This test was complex and covered the same code as a test in
WebMvcMetricsFilterTests.

This commit reworks the test to examine the dispatcher types on the
filter registration directly instead.

Closes gh-11826
2018-01-29 11:23:58 +00:00
Andy Wilkinson
199088b0c9 Set kotlin.version when Kotlin's Gradle plugin is applied
Closes gh-11711
2018-01-29 10:13:54 +00:00
Stephane Nicoll
bdd532cc20 Clarify when a property was not renamed due to an incompatible type
Closes gh-11794
2018-01-29 10:30:59 +01:00
Stephane Nicoll
43e5e83d9c Transparently handle migration from number to java.util.Duration
See gh-11794
2018-01-29 09:59:38 +01:00
Stephane Nicoll
d7c20be3e7 Merge pull request #11815 from vpavic:session-bom
* pr/11815:
  Use Spring Session BOM in dependency management
2018-01-29 08:26:01 +01:00
Vedran Pavic
df28ee7122 Use Spring Session BOM in dependency management
Closes gh-11815
2018-01-29 08:24:38 +01:00
Stephane Nicoll
3c1f7abbbe Merge pull request #11811 from izeye:polish-20180127-2nd
* pr/11811:
  Polish contribution
  Polish
2018-01-29 08:12:53 +01:00
Stephane Nicoll
a515c5b7d1 Polish contribution
Closes gh-11811
2018-01-29 08:12:35 +01:00
Johnny Lim
914bdb393f Polish
See gh-11811
2018-01-29 08:11:09 +01:00
Stephane Nicoll
5332bcbe28 Merge pull request #11818 from dreis2211:mockito-get-single-argument
* pr/11818:
  Use InvocationOnMock.getArgument() where possible
2018-01-29 08:06:33 +01:00
dreis2211
c1675c2d5f Use InvocationOnMock.getArgument() where possible
Closes gh-11818
2018-01-29 08:06:00 +01:00
Stephane Nicoll
fac8970366 Merge pull request #11817 from dreis2211:replace-any-with-casts
* pr/11817:
  Replace casted Mockito.any() calls
2018-01-29 08:05:04 +01:00