Andy Wilkinson
f10377bdb7
Polish "Add support for multiple REST Docs configuration customizers"
...
Closes gh-13498
2018-08-16 09:48:03 +01:00
Eddú Meléndez
4d310f0d5a
Add support for multiple REST Docs configuration customizers
...
This commit introduces support for multiple configuration customizers
for REST Docs with MockMvc, WebTestClient, and REST Assured.
Closes gh-13498
2018-08-16 09:48:03 +01:00
Stephane Nicoll
6ac6d36395
Polish
2018-08-16 10:43:28 +02:00
Jan Groot
40d8726d47
Remove redundant spring-boot-starter dependencies from starters
...
Closes gh-14078
2018-08-16 09:30:54 +01:00
Brian Clozel
31a93035c1
Remove workaround for Netty resources cleanup
...
Closes gh-9146
2018-08-16 10:27:55 +02:00
Stephane Nicoll
9201db3200
Upgrade to Reactor Californium-M2
...
Closes gh-14077
2018-08-16 09:32:35 +02:00
Madhura Bhave
64f9d33956
Merge branch '2.0.x'
2018-08-15 16:58:21 -07:00
Johnny Lim
5f3f1a1f11
Polish
...
Closes gh-14067
2018-08-15 16:54:46 -07:00
Stephane Nicoll
5ae4b43877
Upgrade to Assertj 3.11.0
...
Closes gh-14073
2018-08-15 19:30:43 +02:00
Stephane Nicoll
4a68e2e4a1
Merge branch '2.0.x'
2018-08-15 15:00:17 +03:00
Stephane Nicoll
ca4ca15ef2
Restore Jade Templates starter as it is compatible with Spring Boot 2
2018-08-15 14:44:48 +03:00
Stephane Nicoll
c00fc6449b
Merge branch '2.0.x'
2018-08-15 14:37:40 +03:00
dreis2211
59d911d6e0
Remove @UsesUnsafeJava annotations
...
Closes gh-14072
2018-08-15 14:36:51 +03:00
Johnny Lim
d5eaaf6e2a
Polish
...
Closes gh-14049
2018-08-15 10:43:46 +03:00
Stephane Nicoll
d0f272960e
Merge branch '2.0.x'
2018-08-15 10:43:28 +03:00
Johnny Lim
b4abccc07c
Polish
...
See gh-14049
2018-08-15 10:43:04 +03:00
Madhura Bhave
baaf8c95ff
Polish "Update OIDC configuration"
...
Closes gh-14065
2018-08-14 15:31:29 -07:00
Josh Cummings
e34723efd2
Update OIDC config following Spring Security changes
...
The location changed for the class that provides a ClientRegistration
via an issuer URL, and this updates Spring Boot accordingly.
2018-08-14 15:31:29 -07:00
Spencer Gibb
8427341480
Exclude protobuf-java from mysql-connector-java
...
Closes gh-14062
2018-08-14 20:01:07 +01:00
Madhura Bhave
a8a75f1bbb
Merge branch '2.0.x'
2018-08-14 11:25:24 -07:00
Madhura Bhave
895d092640
PropertySourcesLoader with highest precedence should win
...
Fixes gh-13955
2018-08-14 11:23:55 -07:00
Andy Wilkinson
e3e3a44045
Merge branch '2.0.x'
2018-08-14 12:33:11 +01:00
Andy Wilkinson
1973e342c9
Do not use lambda for task action as it breaks up-to-date checks
...
Due to gradle/gradle#5510 , using a lambda for a task action breaks
up-to-date checks in certain circumstances.
This commit updates JavaPluginAction to use an inner-class in place
of a lambda for the action that it adds to JavaCompile tasks. A test
has not been added as it does not appear to be possible to reproduce
it with a TestKit-based test.
Closes gh-14054
2018-08-14 12:32:36 +01:00
Stephane Nicoll
f187ab72a4
Polish
2018-08-14 11:00:20 +03:00
Andy Wilkinson
9032e5b470
Update SSL tests and certs for Java 11 and TLSv1.3
...
See gh-14028
2018-08-14 08:51:38 +03:00
Stephane Nicoll
10fe9ba0d9
Merge branch '2.0.x'
2018-08-14 08:49:45 +03:00
Stephane Nicoll
da1858f620
Upgrade to Hibernate Validator 6.0.12.Final
...
Closes gh-14053
2018-08-14 08:48:16 +03:00
Madhura Bhave
727e9c6b0f
Merge branch '2.0.x'
2018-08-13 12:23:48 -07:00
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
04215e6651
Polish
2018-08-13 15:59:48 +01:00
Stephane Nicoll
e7b5d95681
Adapt ServerProperties with a default size to DataSize
...
See gh-13974
2018-08-13 16:43:23 +03:00
Stephane Nicoll
6734e11222
Adapt MultipartConfig to use DataSize support
...
See gh-13974
2018-08-13 16:43:23 +03:00
Stephane Nicoll
94013aaba6
Add support for DataSize
...
This commit adds support for Spring Framework's `DataSize` allowing to
express a size in bytes and other convenient units.
Similar to the `Duration` support introduced previously, this commit
adds transparent binding support as well as detection of default values
in `@ConfigurationProperties`-annotated object.
Closes gh-13974
2018-08-13 16:43:23 +03:00
Andy Wilkinson
78dd7bd934
Merge branch '2.0.x'
2018-08-13 13:18:55 +01: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
76d9b1cdbd
Merge branch '2.0.x'
2018-08-13 12:30:10 +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
e41519b6b1
Merge branch '2.0.x'
2018-08-13 11:38:56 +01:00
Andy Wilkinson
29e38f4af8
Merge branch '1.5.x' into 2.0.x
2018-08-13 11:35:46 +01:00
dreis2211
c9bdc98935
Add missing @Override
...
Closes gh-14043
2018-08-13 13:14:02 +03:00
Stephane Nicoll
eede660b84
Merge branch '2.0.x'
2018-08-13 13:11:08 +03:00
Stephane Nicoll
f4b0101632
Merge branch '1.5.x' into 2.0.x
2018-08-13 13:10:05 +03:00
Andy Wilkinson
da550efc6b
Merge branch '2.0.x'
2018-08-10 12:50:31 +01:00
Andy Wilkinson
263e157ef0
Merge branch '1.5.x' into 2.0.x
2018-08-10 12:50:15 +01:00
Stephane Nicoll
bfd616ac7a
Prevent JavaFX to be added to the classpath with Java 11
...
See https://hibernate.atlassian.net/browse/HV-1644
2018-08-10 13:46:39 +02:00
Stephane Nicoll
0d04d7adf8
Migrate @EventListener to ApplicationListener
...
Closes gh-14041
2018-08-10 12:52:14 +02:00
Stephane Nicoll
9d40df9a2a
Upgrade to Mockito 2.21.0
...
Closes gh-14039
2018-08-10 09:55:09 +02:00
Stephane Nicoll
ca8bdc8a72
Resume building against Spring Framework snapshots
...
See gh-14038
2018-08-10 09:53:10 +02:00
Stephane Nicoll
817a8a8302
Polish
2018-08-10 09:48:57 +02:00
Stephane Nicoll
0ca8f1083a
Fix ClassCastException message detection on Java 11
...
This commit also fixes the detection of a ClassCastException that can
be safely ignored on the module path with Java 9
Closes gh-14033
2018-08-10 09:48:22 +02:00
Stephane Nicoll
295995829f
Remove outdated Java10 profile
2018-08-09 13:33:03 +02:00
Andy Wilkinson
2756d87b3f
Merge branch '2.0.x'
2018-08-09 11:15:13 +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
Johnny Lim
b90113ac33
Align server.tomcat.max-swallow-size with Tomcat's default value
...
Closes gh-14025
2018-08-09 09:56:23 +02:00
Johnny Lim
05a7d21305
Polish ItemMetadata.buildName()
...
Closes gh-14024
2018-08-09 09:47:02 +02:00
Johnny Lim
101cc59b7d
Polish
...
Closes gh-14023
2018-08-09 09:32:10 +02:00
Stephane Nicoll
a12ca0a0dc
Merge branch '2.0.x'
2018-08-08 16:05:34 +02: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
7b191bb9ed
Merge branch '2.0.x'
2018-08-08 14:47:16 +02:00
Stephane Nicoll
21691f0b20
Merge branch '1.5.x' into 2.0.x
2018-08-08 14:46:55 +02:00
Stephane Nicoll
13d5b00fe7
Merge branch '2.0.x'
2018-08-08 11:13:15 +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
Stephane Nicoll
a96856c99a
Merge branch '2.0.x'
2018-08-08 09:54:07 +02:00
dreis2211
72707b9d58
Polish OnWebApplicationCondition
...
Closes gh-14015
2018-08-08 09:51:51 +02:00
Stephane Nicoll
cc79cbd09f
Merge branch '2.0.x'
2018-08-08 09:35:44 +02:00
dreis2211
47ed48625c
Fix typo
...
Closes gh-14013
2018-08-08 09:34:46 +02: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
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