d6b6a5f81f
Add auto-config for spring-security-oauth2-resource-server
...
Closes gh-13787
2018-08-06 16:53:36 -07:00
6a2cb883a5
Merge branch '2.0.x'
2018-08-06 18:35:54 +02:00
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
14a9ec8711
Polish
2018-08-06 14:44:44 +02:00
e4e8311a1a
Merge pull request #13990 from ayudovin:support-ensureUniqueRuntimeObjectNames-globally
...
* pr/13990:
Polish "Add global support for JMX unique names"
Add global support for JMX unique names
2018-08-06 14:39:04 +02:00
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
1a3f08d772
Add global support for JMX unique names
...
See gh-13990
2018-08-06 13:36:11 +02:00
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
193b2f187b
Upgrade to Maven Compiler Plugin 3.8.0
...
Closes gh-14000
2018-08-05 05:01:35 +02:00
dbe3adce5c
Merge pull request #13983 from garyrussell:kafkaClients200
...
* pr/13983:
Upgrade to Kafka 2.0.0
2018-08-04 16:59:41 +02:00
740d64242f
Upgrade to Kafka 2.0.0
...
Closes gh-13983
2018-08-04 16:59:06 +02:00
624c1306fd
Merge branch '2.0.x'
2018-08-03 18:25:24 +02:00
737b4a275b
Polish
2018-08-03 18:24:59 +02:00
8fdc9b6403
Merge branch '2.0.x'
2018-08-03 13:47:43 +02:00
0f095abded
Polish
2018-08-03 13:47:23 +02:00
e53ec5c645
Merge pull request #13988 from dreis2211:javadoc-annotations-part1
...
* pr/13988:
Include @ in javadoc links for annotations
2018-08-03 09:40:38 +02:00
8440443237
Include @ in javadoc links for annotations
...
Closes gh-13988
2018-08-03 09:40:08 +02:00
a656513cb8
Merge branch '2.0.x'
2018-08-03 09:39:29 +02:00
20ea16fe9f
Merge branch '1.5.x' into 2.0.x
2018-08-03 09:37:01 +02:00
b6dddcced8
Include @ in javadoc links for annotations
...
See gh-13988
2018-08-03 09:35:30 +02:00
0e750f982b
Merge branch '2.0.x'
2018-08-03 09:25:15 +02:00
37be894844
Merge pull request #13991 from izeye:convert-sla
...
* pr/13991:
Return null immediately when sla is null in convertSla()
2018-08-03 09:24:19 +02:00
7b6b91aae7
Return null immediately when sla is null in convertSla()
...
Closes gh-13991
2018-08-03 09:23:22 +02:00
e233c32508
Merge pull request #13989 from izeye:scan-package
...
* pr/13989:
Update assertion message in AnnotatedClassFinder.scanPackage()
2018-08-03 09:06:54 +02:00
d92441e53f
Update assertion message in AnnotatedClassFinder.scanPackage()
...
Closes gh-13989
2018-08-03 09:06:38 +02:00
b9fcb6a5e5
Merge branch '2.0.x'
2018-08-02 15:19:35 -07:00
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
c41199bad1
Merge branch '2.0.x'
2018-08-02 11:01:47 -07:00
7e2494ebdd
Set environment active profiles according to processing order
...
Fixes gh-13965
2018-08-02 11:01:22 -07:00
6c5567afb3
Merge branch '2.0.x'
2018-08-02 19:17:43 +02:00
e4442f4b14
Merge branch '1.5.x' into 2.0.x
2018-08-02 19:17:18 +02:00
b97c188aa3
Merge pull request #13985 from rajadilipkolli:patch-1
...
* pr/13985:
Upgrade maven wrapper to Maven 3.5.4
2018-08-02 19:17:00 +02:00
e4dd7ac959
Upgrade maven wrapper to Maven 3.5.4
...
Closes gh-13985
2018-08-02 19:15:39 +02:00
65f43505fe
Merge branch '2.0.x'
2018-08-02 16:20:07 +02:00
2074346447
Merge pull request #13982 from cmakinen:cloudwatch-depManagement
...
* pr/13982:
Add dependency management for micrometer-registry-cloudwatch
2018-08-02 16:19:55 +02:00
07d96689c6
Add dependency management for micrometer-registry-cloudwatch
...
Closes gh-13982
2018-08-02 16:19:15 +02:00
fdfdf2c8f6
Merge pull request #13966 from ayudovin:make-max-swallow-size-easily-configurable
...
* pr/13966:
Polish "Make "MaxSwallowSize" more easily configurable"
Make "MaxSwallowSize" more easily configurable
2018-08-02 16:15:44 +02:00
a8b9718073
Polish "Make "MaxSwallowSize" more easily configurable"
...
Closes gh-13966
2018-08-02 16:09:06 +02:00
0d40c5aecc
Make "MaxSwallowSize" more easily configurable
...
See gh-13966
2018-08-02 15:45:57 +02:00
1548dd5be9
Merge pull request #13973 from izeye:unused-dependencies
...
* pr/13973:
Remove unused dependencies
2018-08-02 15:18:05 +02:00
02e82cd22b
Remove unused dependencies
...
Closes gh-13973
2018-08-02 15:17:45 +02:00
71d26f9ceb
Add missing dependency for Javadoc generation
2018-08-01 14:16:39 +02:00
76d44ca888
Fix formatting
2018-08-01 13:12:20 +02:00
2d62e9e60f
Merge pull request #13963 from izeye:polish-20180801
...
* pr/13963:
Polish contribution
Polish
2018-08-01 11:09:19 +02:00
f7032bd8d3
Polish contribution
...
Closes gh-13963
2018-08-01 11:08:59 +02:00
7b72fe0ffa
Polish
...
See gh-13963
2018-08-01 11:08:22 +02:00
960817a8c6
Merge branch '2.0.x'
2018-08-01 11:05:49 +02:00
1f4124b695
Merge pull request #13963 from izeye:polish-20180801
...
* pr/13963:
Polish
2018-08-01 11:05:28 +02:00
94468e5865
Polish
...
See gh-13963
2018-08-01 11:04:59 +02:00
0c1b229764
Merge branch '2.0.x'
2018-08-01 10:59:05 +02:00
Madhura Bhave
Stephane Nicoll
artsiom
Gary Russell
dreis2211
Johnny Lim
Raja Kolli
cmakinen