Stephane Nicoll
6a2cb883a5
Merge branch '2.0.x'
2018-08-06 18:35:54 +02:00
Stephane Nicoll
f731f6aa39
Restore customization of HTTP trace request headers
...
This commit restore the use of the `postProcessRequestHeaders` method
when overridden in a custom HttpExchangeTracer implementation.
Closes gh-13924
2018-08-06 18:35:12 +02:00
Stephane Nicoll
14a9ec8711
Polish
2018-08-06 14:44:44 +02:00
Stephane Nicoll
e6b44189e0
Polish "Add global support for JMX unique names"
...
This commit ensures that the new "spring.jmx.unique-names" property
deprecates the Endpoint's specific property as they share the same goal.
If both are set with an incompatible value, an exception is thrown
inviting the user to update their configuration.
Closes gh-13990
2018-08-06 14:35:18 +02:00
artsiom
1a3f08d772
Add global support for JMX unique names
...
See gh-13990
2018-08-06 13:36:11 +02:00
Stephane Nicoll
c071f34a4a
Add auto-configuration support for TaskExecutor
...
This commit adds support for providing a default ThreadPoolTaskExecutor
with sensible defaults. A new TaskExecutorBuilder is provided with
defaults from the `spring.task.*` namespace and can be used to create
custom instances.
If no custom `Executor` bean is present, `@EnableAsync` now uses the
auto-configure application task executor. Same goes for the async support
in Spring MVC.
Closes gh-1563
2018-08-06 11:00:40 +02:00
Stephane Nicoll
193b2f187b
Upgrade to Maven Compiler Plugin 3.8.0
...
Closes gh-14000
2018-08-05 05:01:35 +02:00
Gary Russell
740d64242f
Upgrade to Kafka 2.0.0
...
Closes gh-13983
2018-08-04 16:59:06 +02:00
Stephane Nicoll
624c1306fd
Merge branch '2.0.x'
2018-08-03 18:25:24 +02:00
Stephane Nicoll
737b4a275b
Polish
2018-08-03 18:24:59 +02:00
Stephane Nicoll
8fdc9b6403
Merge branch '2.0.x'
2018-08-03 13:47:43 +02:00
Stephane Nicoll
0f095abded
Polish
2018-08-03 13:47:23 +02:00
dreis2211
8440443237
Include @ in javadoc links for annotations
...
Closes gh-13988
2018-08-03 09:40:08 +02:00
Stephane Nicoll
a656513cb8
Merge branch '2.0.x'
2018-08-03 09:39:29 +02:00
Stephane Nicoll
20ea16fe9f
Merge branch '1.5.x' into 2.0.x
2018-08-03 09:37:01 +02:00
Stephane Nicoll
0e750f982b
Merge branch '2.0.x'
2018-08-03 09:25:15 +02:00
Johnny Lim
7b6b91aae7
Return null immediately when sla is null in convertSla()
...
Closes gh-13991
2018-08-03 09:23:22 +02:00
Johnny Lim
d92441e53f
Update assertion message in AnnotatedClassFinder.scanPackage()
...
Closes gh-13989
2018-08-03 09:06:38 +02:00
Madhura Bhave
b9fcb6a5e5
Merge branch '2.0.x'
2018-08-02 15:19:35 -07:00
Madhura Bhave
16aff4cd2c
Refactor PropertySourcesDeducer
...
Prior to the changes that fixed #12451 ,
`FilteredPropertySources` and `CompositePropertySources` were required
by the `PropertySourcesDeducer` to ensure that configuration properties binding
could see changes to the environment even when there was a
PropertySourcesPlaceholderConfigurer in the context. #12451 changed the way
property sources are adapted by `SpringConfigurationPropertySources`, removing the
need for `FilteredPropertySources` and `CompositePropertySources`.
Fixes gh-13738
2018-08-02 15:00:01 -07:00
Madhura Bhave
c41199bad1
Merge branch '2.0.x'
2018-08-02 11:01:47 -07:00
Madhura Bhave
7e2494ebdd
Set environment active profiles according to processing order
...
Fixes gh-13965
2018-08-02 11:01:22 -07:00
Stephane Nicoll
65f43505fe
Merge branch '2.0.x'
2018-08-02 16:20:07 +02:00
cmakinen
07d96689c6
Add dependency management for micrometer-registry-cloudwatch
...
Closes gh-13982
2018-08-02 16:19:15 +02:00
Stephane Nicoll
a8b9718073
Polish "Make "MaxSwallowSize" more easily configurable"
...
Closes gh-13966
2018-08-02 16:09:06 +02:00
artsiom
0d40c5aecc
Make "MaxSwallowSize" more easily configurable
...
See gh-13966
2018-08-02 15:45:57 +02:00
Johnny Lim
02e82cd22b
Remove unused dependencies
...
Closes gh-13973
2018-08-02 15:17:45 +02:00
Stephane Nicoll
71d26f9ceb
Add missing dependency for Javadoc generation
2018-08-01 14:16:39 +02:00
Stephane Nicoll
76d44ca888
Fix formatting
2018-08-01 13:12:20 +02:00
Stephane Nicoll
f7032bd8d3
Polish contribution
...
Closes gh-13963
2018-08-01 11:08:59 +02:00
Johnny Lim
7b72fe0ffa
Polish
...
See gh-13963
2018-08-01 11:08:22 +02:00
Stephane Nicoll
960817a8c6
Merge branch '2.0.x'
2018-08-01 11:05:49 +02:00
Johnny Lim
94468e5865
Polish
...
See gh-13963
2018-08-01 11:04:59 +02:00
Stephane Nicoll
0c1b229764
Merge branch '2.0.x'
2018-08-01 10:59:05 +02:00
Stephane Nicoll
4e45f36bd1
Clean basePath if necessary
...
This commit makes sure that ServletEndpointRegistrar does not add a
duplicate `/` if the basePath is suffixed with it already
Close gh-13964
2018-08-01 10:58:40 +02:00
Stephane Nicoll
143e4f026f
Merge branch '2.0.x'
2018-08-01 08:48:09 +02:00
dreis2211
66b1742f96
Optimize some StringBuilder.append() calls
...
Closes gh-13961
2018-08-01 08:41:03 +02:00
Stephane Nicoll
8367c57d96
Avoid double binding of Flyway's locations
...
Closes gh-4995
2018-07-31 17:19:07 +02:00
Stephane Nicoll
14b413bf08
Remove outdated hint
2018-07-31 17:00:33 +02:00
Stephane Nicoll
435c47925e
Switch JMS pooling to `pooled-jms`
...
This commit removes support for `activemq-pool` in benefit of
`pooled-jms`. While the former is not JMS 2 compliant, the latter is and
is independent of the ActiveMQ codebase (so potentially reusable in
custom code).
Closes gh-13927
2018-07-31 16:55:52 +02:00
Stephane Nicoll
fbf95b6997
Merge branch '2.0.x'
2018-07-31 16:25:11 +02:00
Stephane Nicoll
d31f68380a
Deprecate PooledConnectionFactory properties
...
This commit deprecated the properties of `PooledConnectionFactory` that
are no longer supported by an alternative that is a JMS 2 compliant.
This commit also adds a note to warn users that this pool implementation
is not JMS 2 compliant.
Closes gh-13956
2018-07-31 16:17:43 +02:00
Stephane Nicoll
fd85cebfef
Polish "Make RabbitTemplate default receive queue configurable"
...
Closes gh-13930
2018-07-31 14:32:44 +02:00
artsiom
d7621261b2
Make RabbitTemplate default receive queue configurable
...
See gh-13930
2018-07-31 14:32:44 +02:00
Stephane Nicoll
f1e2abce2d
Merge branch '2.0.x'
2018-07-31 14:29:52 +02:00
Muhammad Hewedy
2f69785c6a
Add classpath prefix to the flyway location
...
Closes gh-13933
2018-07-31 14:28:59 +02:00
dreis2211
fe4b3e493d
Fix deprecation in KafkaAutoConfigurationIntegrationTests
...
Closes gh-13937
2018-07-31 14:26:42 +02:00
dreis2211
449e1cce9f
Avoid annotation attribute lookup in OnBeanCondition
...
Close gh-13941
2018-07-31 11:05:50 +02:00
Johnny Lim
daf3f82006
Polish AutoConfigurationGroup.selectImports()
...
Closes gh-13943
2018-07-31 08:40:15 +02:00
Stephane Nicoll
d12a099a6d
Merge branch '2.0.x'
2018-07-31 08:17:46 +02:00