Commit Graph

2997 Commits

Author SHA1 Message Date
Stephane Nicoll
16331616dc Merge branch '2.0.x' 2018-08-16 16:31:57 +02:00
Stephane Nicoll
376ef83dc0 Merge branch '1.5.x' into 2.0.x 2018-08-16 16:31:39 +02:00
Stephane Nicoll
de470540ea Add auto-configuration support for TaskScheduler
This commit adds support for providing a default ThreadPoolTaskScheduler
with sensible defaults. A new TaskSchedulerBuilder is provided with
defaults from the `spring.task.scheduler.*` namespace and can be used
to create custom instances.

If no custom `TaskScheduler` bean is present, `@EnableScheduling` now
uses the auto-configured task scheduler.

Closes gh-1397
2018-08-16 14:55:57 +02:00
Stephane Nicoll
dcd80c087e Harmonize task execution naming 2018-08-16 14:55:57 +02:00
Andy Wilkinson
bb8dd25d24 Polish "Stop Elasticsearch REST client from pulling in commons-logging"
Closes gh-14004
2018-08-16 12:16:52 +01:00
Filip Procházka
7c43c89e11 Stop Elasticsearch REST client from pulling in commons-logging
See gh-14004
2018-08-16 12:16:31 +01:00
Andy Wilkinson
075a745e32 Polish "Allow properties to be configured using slice test annotations"
Closes gh-14052
2018-08-16 11:27:49 +01:00
artsiom
0cf1749e85 Allow properties to be configured using slice test annotations
See gh-14052
2018-08-16 11:27:49 +01:00
Andy Wilkinson
971caad6f8 Merge branch '2.0.x' 2018-08-16 10:19:05 +01:00
Andy Wilkinson
3e093035b4 Merge branch '1.5.x' into 2.0.x 2018-08-16 10:18:52 +01:00
Stephane Nicoll
91e3856947 Polish 2018-08-16 10:52:09 +02:00
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