Madhura Bhave
dfb97eb0f5
Convert environment if webApplicationType changes
...
If the web application type is set via properties,
it is available only after binding. The environment needs
to be converted to the appropriate type if it does not match.
If a custom environment is set, it is not converted.
Fixes gh-13977
2018-08-13 12:12:30 -07:00
Andy Wilkinson
6e5ff77bb0
Merge branch '1.5.x' into 2.0.x
...
The 3.0.1 version of the Maven Javadoc Plugin contains a bug [1] that
means that a link URL must redirect otherwise it is ignored.
[1] https://issues.apache.org/jira/browse/MJAVADOC-532
2018-08-13 13:16:50 +01:00
Andy Wilkinson
58aaf4863f
Merge pull request #14032 from Nikolay Rybak
...
* gh-14032:
Propagate retryWrites flag from connection URI to ReactiveMongoClient
2018-08-13 12:30:00 +01:00
Nikolay Rybak
7759dcd9df
Propagate retryWrites flag from connection URI to ReactiveMongoClient
...
Closes gh-14032
2018-08-13 12:10:47 +01:00
Andy Wilkinson
29e38f4af8
Merge branch '1.5.x' into 2.0.x
2018-08-13 11:35:46 +01:00
Stephane Nicoll
f4b0101632
Merge branch '1.5.x' into 2.0.x
2018-08-13 13:10:05 +03:00
Andy Wilkinson
263e157ef0
Merge branch '1.5.x' into 2.0.x
2018-08-10 12:50:15 +01:00
Andy Wilkinson
27f5e46587
Polish "Fix NPE in FlywayEndpoint when migration.installedOn is null"
...
Closes gh-14019
2018-08-09 11:10:21 +01:00
artsiom
83fbdc6ea8
Fix NPE in FlywayEndpoint when migration.installedOn is null
...
See gh-14019
2018-08-09 11:10:02 +01:00
Stephane Nicoll
a023bd030a
Add configurable timeout for Couchbase health indicator
...
This commit makes sure to use a configurable timeout to check if the
Couchbase cluster is up, rather than relying on the default that can be
quite long.
Closes gh-13879
2018-08-08 16:01:58 +02:00
Stephane Nicoll
21691f0b20
Merge branch '1.5.x' into 2.0.x
2018-08-08 14:46:55 +02:00
Stephane Nicoll
fbf3c48bf8
Fix setter detection in configprops endpoint
...
Previously, the setter of a property whose second letter is upper-case (
such as `oAuth2Uri`) was not detected properly. The JavaBean spec states
that, in such a case, the first letter should not be capitalized (i.e.
the setter should be `setoAuth2Uri` rather than `setOAuth2Uri`).
This commit makes sure that Jackson uses standard bean names and fixes
the setter detection algorithm to take this case into account.
Closes gh-13878
2018-08-08 11:13:03 +02:00
dreis2211
72707b9d58
Polish OnWebApplicationCondition
...
Closes gh-14015
2018-08-08 09:51:51 +02:00
dreis2211
47ed48625c
Fix typo
...
Closes gh-14013
2018-08-08 09:34:46 +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
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
737b4a275b
Polish
2018-08-03 18:24:59 +02:00
Stephane Nicoll
0f095abded
Polish
2018-08-03 13:47:23 +02:00
Stephane Nicoll
20ea16fe9f
Merge branch '1.5.x' into 2.0.x
2018-08-03 09:37:01 +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
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
7e2494ebdd
Set environment active profiles according to processing order
...
Fixes gh-13965
2018-08-02 11:01:22 -07:00
cmakinen
07d96689c6
Add dependency management for micrometer-registry-cloudwatch
...
Closes gh-13982
2018-08-02 16:19:15 +02:00
Johnny Lim
94468e5865
Polish
...
See gh-13963
2018-08-01 11:04:59 +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
dreis2211
66b1742f96
Optimize some StringBuilder.append() calls
...
Closes gh-13961
2018-08-01 08:41:03 +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
Muhammad Hewedy
2f69785c6a
Add classpath prefix to the flyway location
...
Closes gh-13933
2018-07-31 14:28:59 +02:00
Johnny Lim
d4fba783fb
Remove ex.printStackTrace() in tests
...
Closes gh-13952
2018-07-31 08:16:40 +02:00
Andy Wilkinson
06b4007ce4
Avoid installing unwanted ConsoleHandler when cleaning up
...
Closes gh-13470
2018-07-30 13:00:34 +01:00
Madhura Bhave
01abb196ef
Fix typo
2018-07-29 22:56:49 -07:00
Stephane Nicoll
1435d83c18
Upgrade to Spring Session Apple-SR4
...
Closes gh-13888
2018-07-29 18:58:55 +02:00
Phillip Webb
0ec22c8bf9
Polish copyright date on changed files
2018-07-29 09:29:29 +01:00
Phillip Webb
aeb885192e
Polish ternary expressions
2018-07-29 09:24:46 +01:00
Stephane Nicoll
b24bb688b8
Upgrade to Spring Integration 5.0.7.RELEASE
...
Closes gh-13886
2018-07-28 15:48:39 +02:00
Phillip Webb
63b609827e
Fix checkstyle method order issues
...
Fix checkstyle issues with method ordering following the
spring-javaformat upgrade.
See gh-13932
2018-07-28 01:11:53 +01:00
Phillip Webb
e6a68b39a3
Fix checkstyle javadoc issues
...
Fix checkstyle issues in javadoc following the spring-javaformat
upgrade.
See gh-13932
2018-07-28 01:11:52 +01:00
Phillip Webb
7fc455654a
Fix checkstyle ternary issues
...
Fix checkstyle issues with ternary expressions following the
spring-javaformat upgrade.
See gh-13932
2018-07-28 01:11:52 +01:00
Phillip Webb
ec1100a896
Upgrade to spring-javaformat 0.0.6
...
Closes gh-13932
2018-07-28 01:11:48 +01:00
Phillip Webb
cddd794a07
Polish
2018-07-28 00:05:25 +01:00
Madhura Bhave
e753b530fa
EndpointRequest should match links with trailing slash
...
Fixes gh-13921
2018-07-27 12:23:27 -07:00
Stephane Nicoll
f7b90a73a0
Upgrade to Spring Kafka 2.1.8.RELEASE
...
Closes gh-13887
2018-07-27 19:53:47 +02:00
Stephane Nicoll
2a0d1918f1
Merge branch '1.5.x' into 2.0.x
2018-07-27 11:36:10 +02:00
Stephane Nicoll
659535d1ec
Upgrade to Spring Data Kay SR9
...
Closes gh-13890
2018-07-27 10:02:18 +02:00
Johnny Lim
8a9224b78c
Polish NoSuchBeanDefinitionFailureAnalyzer
...
Closes gh-13923
2018-07-27 01:55:38 +02:00
Stephane Nicoll
54a6ee7a06
Upgrade to Spring HATEOAS 0.25.0.RELEASE
...
Closes gh-13742
2018-07-27 01:46:08 +02:00
Stephane Nicoll
8603fdddb1
Upgrade to Spring Amqp 2.0.5.RELEASE
...
Closes gh-3884
2018-07-27 01:38:20 +02:00
Stephane Nicoll
d98b23bdd9
Upgrade to Spring Framework 5.0.8
...
Closes gh-13704
2018-07-27 01:30:47 +02:00
dreis2211
bfbf57b0eb
Fix typo
...
Closes gh-13919
2018-07-27 01:03:01 +02:00
Stephane Nicoll
0f15b72fab
Upgrade to Spring Security 5.0.7.RELEASE
...
Closes gh-13898
2018-07-27 01:01:08 +02:00