Commit Graph

3266 Commits

Author SHA1 Message Date
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
cmakinen 07d96689c6 Add dependency management for micrometer-registry-cloudwatch
Closes gh-13982
2018-08-02 16:19:15 +02:00
Stephane Nicoll a8b9718073 Polish "Make "MaxSwallowSize" more easily configurable"
Closes gh-13966
2018-08-02 16:09:06 +02:00
artsiom 0d40c5aecc Make "MaxSwallowSize" more easily configurable
See gh-13966
2018-08-02 15:45:57 +02:00
Johnny Lim 02e82cd22b Remove unused dependencies
Closes gh-13973
2018-08-02 15:17:45 +02:00
Stephane Nicoll 71d26f9ceb Add missing dependency for Javadoc generation 2018-08-01 14:16:39 +02:00
Stephane Nicoll 76d44ca888 Fix formatting 2018-08-01 13:12:20 +02:00
Stephane Nicoll f7032bd8d3 Polish contribution
Closes gh-13963
2018-08-01 11:08:59 +02:00
Johnny Lim 7b72fe0ffa Polish
See gh-13963
2018-08-01 11:08:22 +02:00
Stephane Nicoll 960817a8c6 Merge branch '2.0.x' 2018-08-01 11:05:49 +02:00
Johnny Lim 94468e5865 Polish
See gh-13963
2018-08-01 11:04:59 +02:00
Stephane Nicoll 0c1b229764 Merge branch '2.0.x' 2018-08-01 10:59:05 +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
Stephane Nicoll 143e4f026f Merge branch '2.0.x' 2018-08-01 08:48:09 +02:00
dreis2211 66b1742f96 Optimize some StringBuilder.append() calls
Closes gh-13961
2018-08-01 08:41:03 +02:00
Stephane Nicoll 8367c57d96 Avoid double binding of Flyway's locations
Closes gh-4995
2018-07-31 17:19:07 +02:00
Stephane Nicoll 14b413bf08 Remove outdated hint 2018-07-31 17:00:33 +02:00
Stephane Nicoll 435c47925e Switch JMS pooling to `pooled-jms`
This commit removes support for `activemq-pool` in benefit of
`pooled-jms`. While the former is not JMS 2 compliant, the latter is and
is independent of the ActiveMQ codebase (so potentially reusable in
custom code).

Closes gh-13927
2018-07-31 16:55:52 +02:00
Stephane Nicoll fbf95b6997 Merge branch '2.0.x' 2018-07-31 16:25:11 +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
Stephane Nicoll fd85cebfef Polish "Make RabbitTemplate default receive queue configurable"
Closes gh-13930
2018-07-31 14:32:44 +02:00
artsiom d7621261b2 Make RabbitTemplate default receive queue configurable
See gh-13930
2018-07-31 14:32:44 +02:00
Stephane Nicoll f1e2abce2d Merge branch '2.0.x' 2018-07-31 14:29:52 +02:00
Muhammad Hewedy 2f69785c6a Add classpath prefix to the flyway location
Closes gh-13933
2018-07-31 14:28:59 +02:00
dreis2211 fe4b3e493d Fix deprecation in KafkaAutoConfigurationIntegrationTests
Closes gh-13937
2018-07-31 14:26:42 +02:00
dreis2211 449e1cce9f Avoid annotation attribute lookup in OnBeanCondition
Close gh-13941
2018-07-31 11:05:50 +02:00
Johnny Lim daf3f82006 Polish AutoConfigurationGroup.selectImports()
Closes gh-13943
2018-07-31 08:40:15 +02:00
Stephane Nicoll d12a099a6d Merge branch '2.0.x' 2018-07-31 08:17:46 +02:00
Johnny Lim d4fba783fb Remove ex.printStackTrace() in tests
Closes gh-13952
2018-07-31 08:16:40 +02:00
Andy Wilkinson d67611518f Merge branch '2.0.x' 2018-07-30 13:02:30 +01:00
Andy Wilkinson 06b4007ce4 Avoid installing unwanted ConsoleHandler when cleaning up
Closes gh-13470
2018-07-30 13:00:34 +01:00
Stephane Nicoll e7526a458d Upgrade to Spring Session Bean-M1
Closes gh-13889
2018-07-30 08:42:32 +02:00
Madhura Bhave d3719eed3f Merge branch '2.0.x' 2018-07-29 22:57:26 -07:00
Madhura Bhave 01abb196ef Fix typo 2018-07-29 22:56:49 -07:00
Stephane Nicoll 025142de69 Merge branch '2.0.x' 2018-07-29 19:01:40 +02:00
Stephane Nicoll 1435d83c18 Upgrade to Spring Session Apple-SR4
Closes gh-13888
2018-07-29 18:58:55 +02:00
Phillip Webb 4d86ac4713 Polish copyright date on changed files 2018-07-29 09:30:26 +01:00
Phillip Webb 1b91c0ceb7 Merge branch '2.0.x' 2018-07-29 09:29:57 +01:00
Phillip Webb 0ec22c8bf9 Polish copyright date on changed files 2018-07-29 09:29:29 +01:00
Phillip Webb 80da9cf5eb Merge branch '2.0.x' 2018-07-29 09:28:56 +01:00
Phillip Webb aeb885192e Polish ternary expressions 2018-07-29 09:24:46 +01:00
Stephane Nicoll bb7401a80d Upgrade to Spring Integration 5.1.0.M1
Closes gh-13891
2018-07-28 15:54:21 +02: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 ce9c053cbf Fix checkstyle issues on master
Fix checkstyle issues following 2.0.x merge and
spring-javaformat upgrade.

See gh-13932
2018-07-28 01:36:04 +01:00
Phillip Webb a6c9c92f2e Merge branch '2.0.x' 2018-07-28 01:35:43 +01: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 f2a9030788 Merge branch '2.0.x' 2018-07-27 12:23:51 -07: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 e9a42e27d6 Merge branch '2.0.x' 2018-07-27 11:36:25 +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
Stephane Nicoll 3d43bf7797 Upgrade to Spring Security 5.1.0.M2
Closes gh-13899
2018-07-27 09:23:40 +02:00
Stephane Nicoll dea1e29683 Merge branch '2.0.x' 2018-07-27 01:56:52 +02:00
Johnny Lim 8a9224b78c Polish NoSuchBeanDefinitionFailureAnalyzer
Closes gh-13923
2018-07-27 01:55:38 +02:00
Stephane Nicoll 4139e1b9ab Upgrade to Spring Kafka 2.2.0.M1
Closes gh-13023
2018-07-27 01:51:51 +02:00
Stephane Nicoll 73fe8d482e Merge branch '2.0.x' 2018-07-27 01:47:54 +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 d8192d7e04 Upgrade to Spring Amqp 2.1.0.M1
Closes gh-13885
2018-07-27 01:41: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
Stephane Nicoll ec2e3c4c0e Merge branch '2.0.x' 2018-07-27 01:03:37 +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
Stephane Nicoll 4b3c40ff10 Merge branch '2.0.x' 2018-07-27 00:47:09 +02:00
Stephane Nicoll 85cffd1ab5 Upgrade to Spring Web Services 3.0.3.RELEASE
Closes gh-13912
2018-07-27 00:46:19 +02:00
Stephane Nicoll 37f1146c31 Fix formatting 2018-07-27 00:45:31 +02:00
Madhura Bhave db1d3fa282 Merge branch '2.0.x' 2018-07-26 12:36:40 -07:00
Madhura Bhave c775ff8f60 Fix import 2018-07-26 12:33:52 -07:00
Madhura Bhave 6fe366bd64 Merge branch '2.0.x' 2018-07-26 12:19:57 -07:00
Madhura Bhave 6bd438a737 Document `@ConditionalOnProperty` limitation with collections
Closes gh-7483
2018-07-26 12:19:06 -07:00
Madhura Bhave 78cb802f98 Merge branch '2.0.x' 2018-07-26 11:39:42 -07:00
Madhura Bhave 57515dfa78 Fix typo 2018-07-26 11:38:23 -07:00
Stephane Nicoll f780179777 Polish contribution
Closes gh-13904
2018-07-26 17:22:58 +02:00
artsiom df6feb3e2a Make SpringBootConfigurationFinder public and usable with other annotations
See gh-13904
2018-07-26 17:07:55 +02:00
dreis2211 4bb78d5a48 Fix unchecked assignment in AutoConfigurationImportSelector
Closes gh-13908
2018-07-26 17:06:04 +02:00
Phillip Webb b5b60c2053 Merge branch '2.0.x' 2018-07-26 13:23:07 +01:00
Stephane Nicoll 276f978261 Upgrade to Spring Data Lovelace RC1
Closes gh-13740
2018-07-26 13:19:16 +02:00
Phillip Webb 9a9111af21 Support path discovery for main dispatcher servlet
Add an `DispatcherServletPath` interface which provides a much more
consistent way to discover the path of the main dispatcher servet.

Prior to this commit, auto-configurations would often make use of the
`ServerProperties` class to discover the dispatcher servlet path. This
mechanism isn't very explicit and also makes it hard for us to relocate
that property in Spring Boot 2.1.

This commit also reverts most of fddc9e9c7e since it is now clear that
the supporting multiple dispatcher servlet paths will be much more
involved that we originally anticipated.

Closes gh-13834
2018-07-26 11:35:12 +01:00
Phillip Webb d37e717500 Polish 2018-07-26 11:35:12 +01:00
Stephane Nicoll 406d848406 Merge branch '2.0.x' 2018-07-26 11:30:00 +02:00
Stephane Nicoll 12f8ef1b6e Upgrade to Spring Web Services 3.0.2.RELEASE
Closes gh-13912
2018-07-26 11:24:47 +02:00
Stephane Nicoll 787927ba81 Upgrade to Spring Framework 5.1.0.RC1
Closes gh-13911
2018-07-26 11:11:58 +02:00
Stephane Nicoll 1e7aa7c4bc Fix Spring Integration imports 2018-07-25 16:25:06 +02:00
Stephane Nicoll 37f5e69173 Start building against Spring Security 5.0.7 snapshots
See gh-13898
2018-07-25 15:48:09 +02:00
Stephane Nicoll bdf028a2e6 Merge branch '2.0.x' 2018-07-25 15:39:01 +02:00
Stephane Nicoll 99f33d5070 Start building against Spring Data Kay snapshots
See gh-13890
2018-07-25 15:34:52 +02:00
Andy Wilkinson 1ab98ca33f Start building against Spring HATEOAS 0.25.0 snapshots
See gh-13742
2018-07-25 15:21:20 +02:00
Stephane Nicoll 56542ef809 Start building against Spring Integration 2.1.0 snapshots
See gh-13891
2018-07-25 14:50:14 +02:00
Stephane Nicoll 9e34938ce0 Start building against Spring Amqp 2.1.0 snapshots
See gh-13885
2018-07-25 14:43:25 +02:00
Stephane Nicoll 21160da9f5 Use SNAPSHOTs for upcoming releases 2018-07-25 14:32:02 +02:00
Stephane Nicoll a2494df596 Merge branch '2.0.x' 2018-07-25 11:48:20 +02:00
Stephane Nicoll e6cf082dbc Fix typo 2018-07-25 11:44:55 +02:00
dreis2211 2399092f16 Fix deprecation in UndertowServletWebServerFactory
Closes gh-13873
2018-07-25 10:19:42 +02:00
Stephane Nicoll af0aa11d15 Polish "Add reactive health indicator for Cassandra"
Closes gh-13864
2018-07-25 10:16:17 +02:00
artsiom 61c41555c8 Add reactive health indicator for Cassandra
See gh-13864
2018-07-25 10:16:17 +02:00
Stephane Nicoll 0c41384e50 Merge branch '2.0.x' 2018-07-25 09:18:04 +02:00
Stephane Nicoll a25b6bd473 Restore support for TransactionAwareCacheDecorator
This commit makes sure to unwrap any transaction aware cache before
collecting metrics for them.

Closes gh-13861
2018-07-25 09:17:49 +02:00
Madhura Bhave e524adb2fc Merge branch '2.0.x' 2018-07-24 17:43:47 -07:00
Madhura Bhave 1831f3be16 Fix NPE when Collection contains unbound children
Fixes gh-13636
2018-07-24 17:42:51 -07:00
Madhura Bhave eefa0ada9f Allow property overrides for OIDC Configuration Provider
Closes gh-13869
2018-07-24 15:11:05 -07:00
Madhura Bhave 5011bc6451 Merge branch '2.0.x' 2018-07-24 14:28:01 -07:00
Madhura Bhave 6032b454b0 Polish 2018-07-24 14:11:01 -07:00
Madhura Bhave f5617601aa Polish "Register OAuth2AuthorizedClientRepository bean"
Closes gh-13870
2018-07-24 13:31:03 -07:00
artsiom 2dcf19938d Register OAuth2AuthorizedClientRepository bean 2018-07-24 13:30:36 -07:00
Stephane Nicoll b163120ece Upgrade to Reactor Californium-M1
Closes gh-12849
2018-07-24 18:20:11 +02:00
Brian Clozel 57dbea0db3 Finalize upgrade to Reactor Netty 0.8
This commit fixes the last issue for the upgrade to Reactor Netty 0.8.

Closes: gh-13321
2018-07-24 14:56:23 +02:00
Brian Clozel e15ca514c8 Update HttpResources cleaning for Reactor Netty
This commit updates the workaround for issue gh-9146
2018-07-24 14:07:57 +02:00
Brian Clozel dd79143d1a Support http/2 configuration with Reactor-Netty
Just like Jetty, Reactor Netty supports ALPN with JDK8 or with a
dependency that delegates TLS to a native library using boringSSL.

Closes gh-13333
2018-07-24 14:07:57 +02:00
Stephane Nicoll c98bb40136 Adapt NoSuchBeanDefinitionFailureAnalyzer to framework change
This commit adapts to a Spring Framework change based on SPR-11419 and
SPR-15338. Rather than throwing an exception when injecting a List or
Map of a candidate bean that is not present, an empty collection/map is
injected.
2018-07-24 13:36:38 +02:00
Stephane Nicoll f3ef7caf09 Merge branch '2.0.x' 2018-07-24 13:35:25 +02:00
Stephane Nicoll 829ac3fbef Prevent headers to be mutated
This commit rework 1189ccc to prevent a mutate call on the original
headers map.

Closes gh-13871
2018-07-24 13:34:49 +02:00
Stephane Nicoll 5fb2060566 Polish "Add configuration for Tomcat's cachingAllowed property"
Closes gh-13614
2018-07-24 11:20:35 +02:00
Rob Tompkins 200ac6db30 Add configuration for Tomcat's cachingAllowed property
See gh-13614
2018-07-24 11:18:33 +02:00
Stephane Nicoll dcd230fc00 Merge branch '2.0.x' 2018-07-24 10:38:48 +02:00
Stephane Nicoll 7d2e25f6f8 Merge branch '1.5.x' into 2.0.x 2018-07-24 10:37:31 +02:00
dreis2211 d0918f87b2 Fix OAuth2WebSecurityConfigurationTests
Closes gh-13872
2018-07-24 09:57:42 +02:00
Stephane Nicoll 2ad548485c Merge branch '2.0.x' 2018-07-24 09:40:38 +02:00
Stephane Nicoll 1a0afc6bbe Polish "Use Collection.removeIf() where possible"
Closes gh-13871
2018-07-24 09:38:51 +02:00
dreis2211 1189ccc936 Use Collection.removeIf() where possible
See gh-13871
2018-07-24 09:38:34 +02:00
Stephane Nicoll 6dc0cb4f67 Merge branch '2.0.x' 2018-07-24 09:33:22 +02:00
Stephane Nicoll 7176c54f5e Polish "Add metric description and base unit to metrics endpoint"
Closes gh-13813
2018-07-24 09:32:22 +02:00
Johannes Edmeier ab1f8cf77b Add metric description and base unit to metrics endpoint
See gh-13813
2018-07-24 09:32:22 +02:00
Stephane Nicoll ecb8da2536 Polish "Upgrade to Micrometer 1.0.6"
Closes gh-13819
2018-07-24 09:25:54 +02:00
Jon Schneider f478911c54 Upgrade to Micrometer 1.0.6
See gh-13819
2018-07-24 09:12:06 +02:00
Stephane Nicoll ccabf83815 Merge branch '2.0.x' 2018-07-23 09:31:54 +02:00
Stephane Nicoll dcb68d4c64 Deprecate unused property
Closes gh-13836
2018-07-23 09:31:02 +02:00
Andy Wilkinson 70dbcba7b6 Merge branch '2.0.x' 2018-07-20 17:04:25 +01:00
Andy Wilkinson daad992c96 Merge branch '1.5.x' into 2.0.x 2018-07-20 17:03:59 +01:00
Andy Wilkinson c7f6fb8660 Upgrade to Mockito 2.19.1
Closes gh-13859
2018-07-20 16:39:24 +01:00
Andy Wilkinson f8c8c47351 Upgrade to Jooq 3.11.3
Closes gh-13858
2018-07-20 16:39:24 +01:00
Andy Wilkinson 0ea85800c4 Upgrade to Infinispan 9.3.1.Final
Closes gh-13857
2018-07-20 16:39:23 +01:00
Andy Wilkinson 2d340fcae1 Upgrade to Hibernate 5.3.3.Final
Closes gh-13856
2018-07-20 16:39:22 +01:00
Andy Wilkinson 3b79802c19 Upgrade to Flyway 5.1.4
Closes gh-13855
2018-07-20 16:39:22 +01:00
Andy Wilkinson 98f19fcc81 Upgrade to Elasticsearch 6.3.1
Closes gh-13854
2018-07-20 16:39:21 +01:00
Andy Wilkinson e9d1abf2ce Upgrade to Groovy 2.5.1
Closes gh-13853
2018-07-20 16:39:20 +01:00
Andy Wilkinson 921d883559 Upgrade to Kafka 1.1.1
Closes gh-13852
2018-07-20 16:39:20 +01:00
Andy Wilkinson 7a706b1581 Upgrade to Commons Pool2 2.6.0
Closes gh-13851
2018-07-20 16:39:19 +01:00
Andy Wilkinson f28ae9e4c5 Upgrade to Commons Dbcp2 2.5.0
Closes gh-13850
2018-07-20 16:39:19 +01:00
Andy Wilkinson 1df725fddc Upgrade to Byte Buddy 1.8.13
Closes gh-13849
2018-07-20 16:39:18 +01:00
Andy Wilkinson a19d340b60 Upgrade to Undertow 2.0.11.Final
Closes gh-13848
2018-07-20 16:39:17 +01:00
Andy Wilkinson 9d72838796 Upgrade to Hazelcast 3.10.3
Closes gh-13847
2018-07-20 16:39:17 +01:00
Andy Wilkinson 5e58a50311 Upgrade to Couchbase Client 2.6.0
Closes gh-13846
2018-07-20 16:39:16 +01:00
Andy Wilkinson 13337c648c Merge branch '2.0.x' 2018-07-20 16:35:19 +01:00
Andy Wilkinson 136be5916c Upgrade to Postgresql 42.2.4
Closes gh-13845
2018-07-20 16:30:17 +01:00
Andy Wilkinson 8f2a8576a6 Upgrade to Mariadb 2.2.6
Closes gh-13844
2018-07-20 16:30:16 +01:00
Andy Wilkinson e5a4cfabc3 Upgrade to Hibernate Validator 6.0.11.Final
Closes gh-13843
2018-07-20 16:30:15 +01:00
Andy Wilkinson 1c6e75ff10 Upgrade to Kafka 1.0.2
Closes gh-13842
2018-07-20 16:30:15 +01:00
Andy Wilkinson 4003c3c6e5 Upgrade to Jna 4.5.2
Closes gh-13841
2018-07-20 16:30:14 +01:00
Andy Wilkinson 3fd6f00155 Upgrade to Netty 4.1.27.Final
Closes gh-13840
2018-07-20 16:30:13 +01:00
Andy Wilkinson 478181eb2c Merge branch '1.5.x' into 2.0.x 2018-07-20 16:26:30 +01:00
Stephane Nicoll 0f0fc9ec62 Adapt assertion to logging change in Spring Framework 2018-07-20 17:12:56 +02:00
Stephane Nicoll 11d9a7c30d Merge branch '2.0.x' 2018-07-20 15:51:28 +02:00
Stephane Nicoll fc0a687ee0 Migrate test to ApplicationContextRunner 2018-07-20 15:51:14 +02:00
Madhura Bhave 14a0064c53 Merge branch '2.0.x' 2018-07-19 16:32:59 -07:00
Madhura Bhave 660d284f45 Document when and how to use brackets when binding to maps
Closes gh-13506
2018-07-19 16:31:59 -07:00
Madhura Bhave d958e83799 Merge branch '2.0.x' 2018-07-19 15:48:29 -07:00
Madhura Bhave 56235187d0 Fix typo 2018-07-19 15:47:14 -07:00
Andy Wilkinson a33dd8b9cb Merge branch '2.0.x' 2018-07-19 20:43:58 +01:00
Andy Wilkinson 10b91602e9 Increase connect and read timeouts when testing against Cassandra 2018-07-19 20:43:39 +01:00
Andy Wilkinson 1852ecc444 Merge branch '2.0.x' 2018-07-19 19:59:08 +01:00
Andy Wilkinson de7899fba4 Improve reliability by give Cassandra more time and attempts to start 2018-07-19 19:57:54 +01:00
Andy Wilkinson d11ee29fa1 Merge branch '2.0.x' 2018-07-19 18:32:49 +01:00
Andy Wilkinson bfc4cad692 Upgrade to Spring REST Docs 2.0.2.RELEASE
Closes gh-13505
2018-07-19 18:32:38 +01:00
Stephane Nicoll 5be84dd32b Merge branch '2.0.x' 2018-07-19 17:58:14 +02:00
Stephane Nicoll cdbe6fa122 Document properties migrator usage
Closes gh-13600
2018-07-19 17:57:42 +02:00
Andy Wilkinson 13835c5dc7 Upgrade to Spring Batch 4.1.0.M2
Closes gh-13820
2018-07-19 16:56:38 +01:00
Stephane Nicoll 1c0eb8de36 Merge branch '2.0.x' 2018-07-19 16:42:51 +02:00
Stephane Nicoll a1ef3f070a Improve documentation for using a mock environment with @SpringBootTest
Closes gh-13827
2018-07-19 16:40:24 +02:00
Stephane Nicoll 237f2fb494 Merge branch '2.0.x' 2018-07-19 14:55:21 +02:00
Stephane Nicoll 592754d806 Polish "Make sure exception tag values are not empty in web metrics"
Closes gh-13187
2018-07-19 14:53:29 +02:00
Jon Schneider ee37dc1c31 Make sure exception tag values are not empty in web metrics
See gh-13187
2018-07-19 14:40:58 +02:00
Stephane Nicoll bc7db86c8c Consistently apply exclude on auto-configuration
Previously, exclude of an import selector was applied only locally. In
other words, if one import selector imports `AcmeAutoConfiguration` and
another one exclude it, it would still be imported because exclude were
applied separately

This commit collects the outcome of all auto-configuration import
selectors and then apply exclusions in a single pass.

Closes gh-12586
2018-07-19 14:08:10 +02:00
Stephane Nicoll 184cd0c708 Avoid CGLIB requirement in MessageSourceAutoConfiguration
Closes gh-13824
2018-07-19 13:58:19 +02:00
Madhura Bhave ceaac98847 Update docs with OIDC provider configuration
See gh-13210
2018-07-18 12:27:13 -07:00
Madhura Bhave 6333edbe16 Merge branch '2.0.x' 2018-07-18 11:01:38 -07:00
Madhura Bhave 66156cc24f Polish 2018-07-18 10:29:43 -07:00
Andy Wilkinson b58314f214 Merge branch '2.0.x' 2018-07-18 14:17:35 +01:00
Andy Wilkinson 681717d07a Merge branch '1.5.x' into 2.0.x 2018-07-18 14:17:15 +01:00
Andy Wilkinson 147a08eb4c Merge branch '2.0.x' 2018-07-18 13:47:31 +01:00
Andy Wilkinson b9ad0d9992 Test the Gradle plugin against Gradle 4.8.1 instead of 4.8
Closes gh-13809
2018-07-18 13:34:27 +01:00
Andy Wilkinson 8deea933b9 Test the Gradle plugin against Gradle 4.9
Closes gh-13808
2018-07-18 13:33:39 +01:00
Andy Wilkinson 93daac7ba8 Merge branch '2.0.x' 2018-07-18 11:22:15 +01:00
Andy Wilkinson 53400b1d81 Merge branch '1.5.x' into 2.0.x 2018-07-18 11:15:40 +01:00
Madhura Bhave dcb172fe2a Merge branch '2.0.x' 2018-07-17 17:09:25 -07:00
Madhura Bhave e907ae605d Fix tests
See gh-13783
2018-07-17 17:08:53 -07:00
Madhura Bhave 9bd723ddad Fix exception message
Fixes gh-13783
2018-07-17 17:05:29 -07:00
Madhura Bhave 9b6a069903 Merge branch '2.0.x' 2018-07-17 16:54:43 -07:00
Johnny Lim 86ccb26c58 Polish EndpointRequest.RequestMatcherFactory.antPath()
Closes gh-13775
2018-07-17 16:53:33 -07:00
Madhura Bhave ddce819e6f Merge branch '2.0.x' 2018-07-17 16:44:23 -07:00
Madhura Bhave c36804908c Merge branch '1.5.x' into 2.0.x 2018-07-17 16:43:02 -07:00
Madhura Bhave f88ebc06ff Add support for OIDC Configuration Provider
Closes gh-13210
2018-07-17 16:02:03 -07:00
Madhura Bhave 4fee54cf24 Expose a TestDispatcherServlet bean in the MockMvcAutoConfiguration
This commit also contains changes to `ServletContextInitializerBeans`.
`ServletContextInitializerBeans` can now be configured to only look
for specific ServletContextInitializer subclasses, defaulting to
ServletContextIntializer.class. `SpringBootMockMvcBuilderCustomizer`
only cares about filters so it was unnecessary to look for all
`ServletContextInitializer`s. Additionally, adapting `Servlet` beans
caused a cycle once the `DispatcherServlet` bean was added and the
customizer only needs to adapt `Filter` beans.

Closes gh-13241
2018-07-17 13:00:54 -07:00
Andy Wilkinson 6a189cee06 Merge branch '2.0.x' 2018-07-17 19:26:08 +01:00
Andy Wilkinson a57d0f0853 Reinstate order of WebMvcMetricsFilter
Closes gh-13781
2018-07-17 19:14:17 +01:00
Stephane Nicoll a98b020ee4 Merge branch '2.0.x' 2018-07-17 17:04:49 +02:00
Stephane Nicoll 944ed767ac Add dependency management for elasticsearch integration tests distro
Closes gh-13547
2018-07-17 17:03:45 +02:00
Stephane Nicoll 526b50645e Merge branch '2.0.x' 2018-07-17 15:48:26 +02:00
dreis2211 e9a8d4c949 Remove unused AbstractCouchbaseAutoConfigurationTests
Closes gh-13797
2018-07-17 15:48:00 +02:00
Stephane Nicoll 8bf22db9c3 Merge branch '2.0.x' 2018-07-17 15:46:20 +02:00
Stephane Nicoll 6e749ef276 Improve NoSuchBeanDefinitionFailureAnalyzer to handle null beans
Previously, if a user defines a `@Bean` with a method that returns
`null`, injection by type will ignore that definition but the report
doesn't mention that candidate.

This commit improves the failure analyzer to look for user-defined beans
as well, detecting beans that are `null` matching the requested type
and including them in the report.

Closes gh-13531
2018-07-17 15:45:49 +02:00
Stephane Nicoll c0b9c72d74 Merge branch '2.0.x' 2018-07-17 14:07:34 +02:00
Stephane Nicoll e679690a74 Clarify the WebTestClient requires WebFlux on the classpath
Closes gh-13469
2018-07-17 14:06:41 +02:00
Stephane Nicoll 070c26d6c3 Merge branch '2.0.x' 2018-07-17 12:03:58 +02:00
Stephane Nicoll d6c7eff8f7 Add check for empty values for lookup
Closes gh-13419
2018-07-17 12:01:26 +02:00
Stephane Nicoll ada699a9f6 Allow to customize the RabbitMQ RetryTemplate
This commit adds the ability to customize the RetryTemplate used in the
RabbitMQ infrastructure. The customizer is slightly unusual and offer
a `Target` enum that define the component that will use the retry
template: `SENDER` for the auto-configured `RabbitTemplate` and
`LISTENER` for a listener container created by a
`RabbitListenerContainerFactoryConfigurer`.

Closes gh-13793
2018-07-17 11:31:20 +02:00
Stephane Nicoll fd6023fe49 Polish contribution
Closes gh-13790
2018-07-17 10:25:55 +02:00
Johnny Lim 58df752af4 Polish
See gh-13790
2018-07-17 10:25:38 +02:00
Stephane Nicoll 43091150d8 Merge branch '2.0.x' 2018-07-17 10:23:12 +02:00
Stephane Nicoll 8095ee4a5b Polish contribution
See gh-13790
2018-07-17 10:12:34 +02:00
Johnny Lim f363fe7dd1 Polish
See gh-13790
2018-07-17 10:03:41 +02:00
Stephane Nicoll ac01409332 Merge branch '2.0.x' 2018-07-17 08:22:58 +02:00
Stephane Nicoll ec2ebf52de Merge branch '1.5.x' into 2.0.x 2018-07-17 08:22:15 +02:00
Brian Clozel 624cbe08d5 Merge branch '2.0.x' 2018-07-16 23:37:31 +02:00
Brian Clozel 58e886fddf Remove @Lazy injection for HttpMessageConverters
This commit turns a lazy injection point for `HttpMessageConverters`
into an `ObjectProvider`-backed injection.

This allows to lazily rely on that bean without creating for it; in some
environments, such proxy creation can lead to issues like SPR-16990.

See gh-13785
2018-07-16 23:12:47 +02:00
Stephane Nicoll b7274966c4 Merge branch '2.0.x' 2018-07-16 14:12:36 +02:00
Stephane Nicoll ffe994335e Merge branch '1.5.x' into 2.0.x 2018-07-16 14:12:16 +02:00
Stephane Nicoll 3c67edafcd Expose more Quartz properties
Closes gh-13782
2018-07-16 14:07:10 +02:00
Stephane Nicoll 66cb4ce3c7 Polish "Allow to configure Quartz's "overwriteExistingJobs" property"
Closes gh-13582
2018-07-16 14:06:13 +02:00
Taras Danylchuk 910e6dc4cc Allow to configure Quartz's "overwriteExistingJobs" property
See gh-13582
2018-07-16 14:06:13 +02:00
Brian Clozel 0654dd4de2 Add JUnit Jupiter API to spring-boot-docs build
This is required for the docs module to inspect Spring Boot
annotations for meta-annotations.

See gh-13739
2018-07-16 13:49:37 +02:00
Stephane Nicoll 9c0ce3d20a Merge branch '2.0.x' 2018-07-16 10:51:27 +02:00
Johnny Lim f2cef87878 Fix since on JdbcOperationsDependsOnPostProcessor
Closes gh-13778
2018-07-16 10:50:55 +02:00
Brian Clozel 9b60eef0e2 Fix build after SPR-17034 in Spring Framework
Since SPR-17034, the core container now behaves a bit differently when
dealing with `null` beans.

Given a `null` `HandlerMapping` bean named "resourceHandlerMapping":

* `context.getBean("resourceHandlerMapping", HandlerMapping.class)`
still returns a `NullBean`
* `ListableBeanFactory.getBeansOfType` will return a Map of all existing
beans, not including the `null` ones as values of the map.

Closes gh-13760
2018-07-16 10:39:56 +02:00
Johnny Lim 1ae420670a Polish
Closes gh-13776
2018-07-16 10:38:40 +02:00
Stephane Nicoll 48962718d1 Merge branch '2.0.x' 2018-07-16 10:37:43 +02:00
Johnny Lim 068e22d60b Polish
See gh-13776
2018-07-16 10:34:00 +02:00
Stephane Nicoll 635986299c Merge branch '2.0.x' 2018-07-16 10:28:49 +02:00
Johnny Lim 4314dc2972 Remove a List creation in CompositePropertySources.iterator()
Closes gh-13774
2018-07-16 10:20:49 +02:00
Andy Wilkinson ac1f2a5817 Polish 2018-07-14 08:45:34 +01:00
Madhura Bhave c0574c8437 Update docs to reflect new health & info security
See gh-13722
2018-07-13 13:40:01 -07:00
Madhura Bhave d1b8558430 Make /health and /info insecure by default
Closes gh-13722
2018-07-13 13:35:52 -07:00
Stephane Nicoll 42bba4e1c5 Document Liquibase default values
Closes gh-13765
2018-07-13 13:41:32 +02:00
Andy Wilkinson c59f31218a Revert "Ignore Data Elasticsearch test that fails due to DATAES-470"
Closes gh-13744
2018-07-13 10:59:37 +01:00
Stephane Nicoll 4c7c328972 Polish "Upgrade to Liquibase 3.6.2"
Closes gh-13625
2018-07-13 11:40:45 +02:00
Miguel Gomes b5cb074219 Upgrade to Liquibase 3.6.2
See gh-13625
2018-07-13 11:37:26 +02:00
Stephane Nicoll fa171671b1 Merge branch '2.0.x' 2018-07-13 09:39:29 +02:00
Stephane Nicoll e6ea28dec5 Polish 2018-07-13 09:36:37 +02:00
Johnny Lim 13202eb278 Prevent duplicate RequestMatcher in RequestMatcherFactory.antPath()
Closes gh-13706
2018-07-13 09:35:34 +02:00
Stephane Nicoll d17d6374f0 Merge branch '2.0.x' 2018-07-13 09:27:44 +02:00
Stephane Nicoll 174cc2bc4e Merge branch '1.5.x' into 2.0.x 2018-07-13 09:25:42 +02:00
Stephane Nicoll 8fc1e0ed4e Merge branch '2.0.x' 2018-07-13 07:55:59 +02:00
dreis2211 ac8eebfbad Fix typos
Closes gh-13762
2018-07-13 07:54:03 +02:00
Stephane Nicoll 04bca3f37f Merge branch '2.0.x' 2018-07-12 16:58:16 +02:00
Stephane Nicoll 19709f7dea Polish 2018-07-12 16:57:52 +02:00
Johnny Lim 1b3fa3ff0d Remove @since tag from getServlet()
Closes gh-13757
2018-07-12 09:36:13 +01:00
Brian Clozel 2e5f0c2873 Fix WebMvc auto-conf tests after Framework change
This commit adapts to a recent Spring Framework change (a40d25a) that
turns no-op Spring MVC beans (infrastructure components that, given
their configuration, won't contribute anything to the application) into
`NullBean` instances.
2018-07-12 10:04:45 +02:00
Madhura Bhave dba0e1b778 Merge branch '2.0.x' 2018-07-11 15:26:08 -07:00
Madhura Bhave d7822ba135 Update copyright header for modified files 2018-07-11 15:25:39 -07:00
Madhura Bhave 34ebf1a97c Merge branch '2.0.x' 2018-07-11 15:23:00 -07:00
Madhura Bhave c8c32cfa33 Migrate tests to ApplicationContextRunner 2018-07-11 15:06:36 -07:00
Madhura Bhave 6d9fabf5bc Harmonize mongo auto-configuration
Provides a way to easily exclude `MongoAutoConfiguration` or
`MongoReactiveAutoConfiguration` so that multiple mongo clients
are not present.

Fixes gh-12407
2018-07-11 13:15:08 -07:00
Andy Wilkinson 1ea91ece23 Merge branch '2.0.x' 2018-07-11 17:49:19 +01:00
Andy Wilkinson cced3514a7 Polish 2018-07-11 17:49:10 +01:00
Andy Wilkinson 6a48a440b2 Annotate our test annotations with @ExtendWith(SpringExtension.class)
Closes gh-13739
2018-07-11 17:25:21 +01:00
Andy Wilkinson 889f1bce3f Merge branch '2.0.x' 2018-07-11 17:13:59 +01:00
Andy Wilkinson c489c6c5f6 Polish test following forward merge 2018-07-11 17:13:45 +01:00
Andy Wilkinson f32ab6eade Merge branch '2.0.x' 2018-07-11 16:51:58 +01:00
Andy Wilkinson 67dfa0a720 Merge branch '1.5.x' into 2.0.x 2018-07-11 16:51:43 +01:00
Andy Wilkinson 7b4096ab50 Merge branch '2.0.x' 2018-07-11 14:39:04 +01:00
Andy Wilkinson 44273ee093 Merge branch '1.5.x' into 2.0.x 2018-07-11 14:38:49 +01:00
Stephane Nicoll 611f2332e6 Polish Flyway keys 2018-07-11 14:56:36 +02:00
Stephane Nicoll 29fcb10f8d Polish 2018-07-11 14:51:24 +02:00
Stephane Nicoll 59749d53b8 Merge branch '2.0.x' 2018-07-11 11:24:06 +02:00
Stephane Nicoll 48819253eb Fix dependency order between JdbcTemplate and database migration tools
This commit makes sure that Flyway/Liquibase migrates the schema if
necessary before a `JdbcTemplate` is made available as an injection
point.

This commit also adds a test that validates simple datasource
initialization (spring.datasource.*) happens before a `JdbcTemplate`
bean can be used.

Closes gh-13155
2018-07-11 11:23:44 +02:00
Stephane Nicoll 42f4f2ded8 Merge branch '2.0.x' 2018-07-11 10:13:57 +02:00
Stephane Nicoll 331775d6c0 Document latest version of gradle-git-properties plugin
Closes gh-13747
2018-07-11 10:13:41 +02:00