Madhura Bhave
24ce3ecb43
Fix typo in docs
2018-04-26 13:43:51 -07:00
Madhura Bhave
6bebb931e5
Merge branch '2.0.x'
2018-04-26 12:21:51 -07:00
Madhura Bhave
228c85fe67
Improve List and Map binding documentation
...
Closes gh-12444
2018-04-26 12:18:49 -07:00
Stephane Nicoll
11d583ab46
Merge branch '2.0.x'
2018-04-26 16:45:03 +02:00
Stephane Nicoll
fbe88c483e
Prevent rabbitmq starter to bring webflux on the classpath
...
This commit excludes `com.rabbitmq:http-client` from `spring-rabbit` as
the former brings spring webflux for an optional feature. This also
prevents Spring Boot to consider that a web server should be started as
all the necessary pieces are unexpectedly present.
Closes gh-12853
2018-04-26 16:44:42 +02:00
Stephane Nicoll
25414d1b58
Merge branch '2.0.x'
2018-04-25 17:20:30 +02:00
Stephane Nicoll
9cf8080a17
Polish "Document Kotlin custom metadata generation"
...
Closes gh-12960
2018-04-25 17:19:55 +02:00
sdeleuze
c24e7a5930
Document Kotlin custom metadata generation
...
See gh-12960
2018-04-25 17:19:38 +02:00
Stephane Nicoll
03cf4fbb10
Polish "Add actuator endpoint for exposing the Spring Integration graph"
...
Closes gh-12331
2018-04-25 16:16:43 +02:00
Tim Ysewyn
8c67ef1079
Add actuator endpoint for exposing the Spring Integration graph
...
See gh-12331
2018-04-25 16:16:43 +02:00
Stephane Nicoll
518f41a4ae
Improve @ConditionalOnEnabledEndpoint to be used on any component
...
This commit adds an `endpoint` attribute so that the condition can be
used on arbitrary components, not only endpoints or extensions.
Closes gh-12945
2018-04-25 13:54:04 +02:00
Stephane Nicoll
b090280b0c
Improve Couchbase auto-configuration
...
This commit improves the couchbase auto-configuration so that it is
easier to customize the way the connection to the couchbase server is
initiated.
See gh-11146
2018-04-25 13:35:49 +02:00
Andy Wilkinson
66872a0f96
Merge branch '2.0.x'
2018-04-25 11:58:45 +01:00
Andy Wilkinson
a358f3f0e8
Merge branch '1.5.x' into 2.0.x
2018-04-25 11:58:31 +01:00
Stephane Nicoll
080e189d06
Fix broken syntax
2018-04-25 10:40:23 +02:00
Stephane Nicoll
65fda8d3d6
Merge branch '2.0.x'
2018-04-25 09:43:43 +02:00
Stephane Nicoll
11ad9bfebf
Upgrade version of gradle-git-properties in doc
...
Closes gh-12955
2018-04-25 09:43:19 +02:00
Stephane Nicoll
fd47b728c1
Properly handle values with spaces
...
Closes gh-10741
2018-04-24 16:26:51 +02:00
Stephane Nicoll
d4729f5389
Polish
2018-04-24 15:52:47 +02:00
Stephane Nicoll
40b7e02793
Polish "Add support for environment variables"
...
Closes gh-12800
2018-04-24 15:48:54 +02:00
Dmytro Nosan
95f7e3ca37
Add support for environment variables
...
See gh-12800
2018-04-24 14:48:54 +02:00
Stephane Nicoll
5dd4a7e91e
Merge branch '2.0.x'
2018-04-24 13:31:36 +02:00
Stephane Nicoll
55ef9e6dc9
Deprecate excludeArtifactIds
...
While being able to exclude all artifacts of a given group is a handy
feature, excluding all artifacts with a given artifactId does not make
much sense as it should refer to a single artifact anyway. Also the
general "exclude" mechanism is meant to do the exact same thing.
Closes gh-12885
2018-04-24 13:25:58 +02:00
Andy Wilkinson
099f61ae6d
Merge branch '2.0.x'
2018-04-24 11:04:23 +01:00
Andy Wilkinson
c9f04c3977
Avoid race between container starting and getting mapped port
2018-04-24 11:03:54 +01:00
Stephane Nicoll
03539d8e16
Polish "Add system properties support using explicit configuration tag"
...
Closes gh-10741
2018-04-24 11:46:20 +02:00
Vadeg
ba34bf6470
Add system properties support using explicit configuration tag
...
See gh-10741
2018-04-24 11:46:20 +02:00
Andy Wilkinson
fe497d70b8
Merge branch '2.0.x'
2018-04-24 10:39:11 +01:00
Andy Wilkinson
f6cc1cbd76
Make Testcontainer wait strategies final
2018-04-24 10:38:57 +01:00
Andy Wilkinson
c9b2afbd1e
Merge branch '2.0.x'
2018-04-24 10:27:32 +01:00
Andy Wilkinson
f39cea0428
Try to stabilize build by giving Cassandra longer to start
2018-04-24 10:27:11 +01:00
Andy Wilkinson
6c504a5098
Fix deprecation warnings in Testcontainers wait strategies
...
See gh-12821
2018-04-24 10:27:11 +01:00
Stephane Nicoll
760b5e8510
Merge branch '2.0.x'
2018-04-24 10:18:20 +02:00
Johnny Lim
a15319ee30
Remove ManagementServerProperties.addApplicationContextHeader
...
Closes gh-12926
2018-04-24 10:16:49 +02:00
Madhura Bhave
da6a8e8624
Merge branch '2.0.x'
2018-04-23 12:32:32 -07:00
Madhura Bhave
877c4f702e
Use empty key-store-password if storeprovider present
...
For tomcat, if an SslStoreProvider is configured,
`SslStoreProviderUrlStreamHandlerFactory` stores the keyStore with an
empty password. Previously, if a password was supplied using the
ssl.key-store-password property, that would be the password used to
load the keystore and the connector would fail with a
"Password verification failed" exception.
Fixes gh-11391
2018-04-23 12:31:47 -07:00
Andy Wilkinson
60bf4ef430
Merge branch '2.0.x'
2018-04-23 17:25:29 +01:00
Andy Wilkinson
a5f3f36b58
Test the Gradle plugin against Gradle 4.7
...
Closes gh-12952
2018-04-23 17:24:50 +01:00
Andy Wilkinson
15a70153c1
Merge branch '2.0.x'
2018-04-23 17:08:21 +01:00
Andy Wilkinson
72ec2c8644
Polish “Only analyze configurations that we've registered to check”
...
Closes gh-12784
2018-04-23 16:45:21 +01:00
danhyun
1e447ebfbf
Only analyze configurations that we've registered to check
...
See gh-12784
2018-04-23 16:25:17 +01:00
Andy Wilkinson
806978b8f1
Test unresolved dependency analysis in the Gradle plugin
...
See gh-12784
2018-04-23 15:52:56 +01:00
Brian Clozel
e39e125aa2
Merge branch '2.0.x'
2018-04-23 13:54:42 +02:00
Brian Clozel
e3e404f9f9
Fix optional ContentNegotiationStrategy for Actuator
...
Since https://jira.spring.io/browse/SPR-16624 , the contract for
`ContentNegotiationStrategy` has been refined and should never return an
empty list if it's got no preference for a media type, but it should
rather respond with a `"*/*"` instead.
This commit fixes the `OptionalPathExtensionContentNegotiationStrategy`
defined in the Spring MVC auto-configuration to have that behavior.
Fixes gh-12900
2018-04-23 13:48:42 +02:00
Stephane Nicoll
50d73285f7
Merge branch '2.0.x'
2018-04-22 11:12:12 +02:00
Stephane Nicoll
f58f23c5b8
Document that binder doesn't handle static properties
...
Closes gh-12912
2018-04-22 11:11:56 +02:00
Stephane Nicoll
49f64aab48
Merge branch '2.0.x'
2018-04-22 09:21:09 +02:00
Stephane Nicoll
469ce57016
Remove outdated note
...
As we've updated the complete ref doc to use a canonical format for
configuration keys, this not is outdated and this commit removes it.
2018-04-22 09:20:19 +02:00
Stephane Nicoll
6df1ea3544
Fix use of deprecated property in docs
...
Closes gh-12940
2018-04-22 09:19:08 +02:00
Brian Clozel
e0eadfe723
Merge branch '2.0.x'
2018-04-21 09:47:20 +02:00