Commit Graph

17825 Commits

Author SHA1 Message Date
Stephane Nicoll
cc79cbd09f Merge branch '2.0.x' 2018-08-08 09:35:44 +02:00
Stephane Nicoll
481bc94cbf Merge pull request #14013 from dreis2211:fix-typo-4
* pr/14013:
  Fix typo
2018-08-08 09:35:27 +02:00
dreis2211
47ed48625c Fix typo
Closes gh-14013
2018-08-08 09:34:46 +02:00
Madhura Bhave
c69a1f208f Remove duplicate sample from modules 2018-08-07 23:43:58 -07:00
Madhura Bhave
6512406a13 Add missing samples to pom and README 2018-08-07 21:05:15 -07:00
Madhura Bhave
bc6e4e6e55 Add auto-config for reactive OAuth2 Resource Server
Closes gh-13948
2018-08-07 20:46:55 -07:00
Madhura Bhave
319fec4be4 Polish 2018-08-07 14:48:16 -07:00
Stephane Nicoll
5cfe8dbee9 Polish 2018-08-07 17:52:47 +02:00
Stephane Nicoll
7e499590c6 Merge branch '2.0.x' 2018-08-07 17:32:16 +02:00
Stephane Nicoll
e68dc2d3c4 Prune 3rd party starters that are not compatible with Spring Boot 2
Those can be re-added at any time there is Spring Boot 2 support

Closes gh-13510
2018-08-07 17:31:03 +02:00
Stephane Nicoll
60d8c7979f Polish 2018-08-07 09:28:21 +02:00
Stephane Nicoll
ace242db7a Fix javadoc generation on Java 9/10 2018-08-07 08:54:14 +02:00
Madhura Bhave
5bf9d31d91 Fix checkstyle 2018-08-06 17:10:30 -07:00
Madhura Bhave
d6b6a5f81f Add auto-config for spring-security-oauth2-resource-server
Closes gh-13787
2018-08-06 16:53:36 -07:00
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
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
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
Stephane Nicoll
dbe3adce5c Merge pull request #13983 from garyrussell:kafkaClients200
* pr/13983:
  Upgrade to Kafka 2.0.0
2018-08-04 16:59:41 +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
Stephane Nicoll
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
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
b6dddcced8 Include @ in javadoc links for annotations
See gh-13988
2018-08-03 09:35:30 +02:00
Stephane Nicoll
0e750f982b Merge branch '2.0.x' 2018-08-03 09:25:15 +02:00
Stephane Nicoll
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
Johnny Lim
7b6b91aae7 Return null immediately when sla is null in convertSla()
Closes gh-13991
2018-08-03 09:23:22 +02:00
Stephane Nicoll
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
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
6c5567afb3 Merge branch '2.0.x' 2018-08-02 19:17:43 +02:00
Stephane Nicoll
e4442f4b14 Merge branch '1.5.x' into 2.0.x 2018-08-02 19:17:18 +02:00
Stephane Nicoll
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
Raja Kolli
e4dd7ac959 Upgrade maven wrapper to Maven 3.5.4
Closes gh-13985
2018-08-02 19:15:39 +02:00
Stephane Nicoll
65f43505fe Merge branch '2.0.x' 2018-08-02 16:20:07 +02:00
Stephane Nicoll
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
cmakinen
07d96689c6 Add dependency management for micrometer-registry-cloudwatch
Closes gh-13982
2018-08-02 16:19:15 +02:00
Stephane Nicoll
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