Commit Graph

5480 Commits

Author SHA1 Message Date
Stephane Nicoll 2af72170c6 Upgrade to Byte Buddy 1.9.12
Closes gh-16383
2019-03-29 13:36:57 +01:00
Stephane Nicoll 8ea0ecd07c Upgrade to Rxjava2 2.2.8
Closes gh-16382
2019-03-29 13:36:55 +01:00
Stephane Nicoll ab110ee39a Upgrade to Reactor Bom Californium-SR6
Closes gh-16381
2019-03-29 13:36:54 +01:00
Stephane Nicoll 59d2bc9bc6 Upgrade to Netty Tcnative 2.0.23.Final
Closes gh-16380
2019-03-29 13:36:53 +01:00
Stephane Nicoll 1d69d81f13 Upgrade to Lettuce 5.1.6.RELEASE
Closes gh-16379
2019-03-29 13:36:53 +01:00
Stephane Nicoll b4bfc4dc14 Merge branch '2.0.x' into 2.1.x 2019-03-29 13:34:52 +01:00
Stephane Nicoll 1a89087a87 Upgrade to Thymeleaf Extras Java8time 3.0.4.RELEASE
Closes gh-16378
2019-03-29 13:27:15 +01:00
Stephane Nicoll 7cff82647d Upgrade to Spring Cloud Connectors 2.0.5.RELEASE
Closes gh-16377
2019-03-29 13:27:15 +01:00
Stephane Nicoll e3e290e959 Upgrade to Quartz 2.3.1
Closes gh-16376
2019-03-29 13:27:15 +01:00
Stephane Nicoll 9ab942c54c Upgrade to Hibernate Validator 6.0.16.Final
Closes gh-16375
2019-03-29 13:27:15 +01:00
Stephane Nicoll 8c85f1a141 Upgrade to Elasticsearch 5.6.16
Closes gh-16374
2019-03-29 13:27:15 +01:00
Stephane Nicoll f7d2cc6aa7 Upgrade to Activemq 5.15.9
Closes gh-16373
2019-03-29 13:27:15 +01:00
Stephane Nicoll 49f2d1bd3e Upgrade to Netty 4.1.34.Final
Closes gh-16371
2019-03-29 13:23:25 +01:00
Stephane Nicoll ca9afa7b55 Upgrade to Micrometer 1.0.10
Closes gh-16370
2019-03-29 13:23:24 +01:00
Stephane Nicoll c88bfed669 Upgrade to Unboundid Ldapsdk 4.0.10
Closes gh-16369
2019-03-29 13:23:23 +01:00
Andy Wilkinson 5e22b421c5 Merge branch '2.1.x' 2019-03-29 11:14:06 +00:00
Andy Wilkinson 6aa78801ff Merge branch '2.0.x' into 2.1.x 2019-03-29 11:13:53 +00:00
Andy Wilkinson 21adbdef49 Upgrade to Tomcat 9.0.17
Closes gh-16367
2019-03-29 11:11:47 +00:00
Andy Wilkinson 6507d1723d Merge branch '1.5.x' into 2.0.x 2019-03-29 11:02:56 +00:00
Stephane Nicoll 270554d3cd Merge branch '2.1.x' 2019-03-29 11:40:15 +01:00
Stephane Nicoll 090f5f5397 Polish "Add error rendering support with @WebFluxTest"
Closes gh-16266
2019-03-29 11:36:27 +01:00
Ali Dehghani 53e7484d87 Add error rendering support with @WebFluxTest
See gh-16266
2019-03-29 11:07:26 +01:00
Stephane Nicoll 17a800b577 Merge branch '2.1.x' 2019-03-29 10:51:44 +01:00
Stephane Nicoll 62d9c0a8b3 Test against Gradle 5.3.1 2019-03-29 10:51:31 +01:00
Stephane Nicoll 680e2b223b Remove deprecated finalName attribute
See gh-16202
2019-03-29 10:46:28 +01:00
Stephane Nicoll cba1e8ada0 Merge branch '2.1.x' 2019-03-29 10:41:30 +01:00
Stephane Nicoll 04aadcdf2e Make sure custom finalName is ignored
A read-only plugin parameter can still be set by the user which leads
to an invalid repackaged archive. This commit actually ignores the field
and uses the standard attribute instead.

Closes gh-16202
2019-03-29 10:40:41 +01:00
Stephane Nicoll 6ab942f295 Polish 2019-03-29 10:19:43 +01:00
Stephane Nicoll 554dec1a3e Document finalName alternative for repackage goal
Closes gh-16334
2019-03-29 10:19:14 +01:00
Stephane Nicoll 465053c11e Merge branch '2.1.x' 2019-03-28 18:09:22 +01:00
Stephane Nicoll 6c3d64a2eb Test Thymeleaf auto-configuration backs off without spring integration
See gh-16341
2019-03-28 17:59:22 +01:00
Stephane Nicoll 29b1b38cc6 Migrate Thymeleaf tests to application runner 2019-03-28 17:58:18 +01:00
Andy Wilkinson ea2eaa1737 Merge branch '2.1.x' 2019-03-28 15:56:43 +00:00
Andy Wilkinson cf0811b0db Merge branch '2.0.x' into 2.1.x 2019-03-28 15:56:22 +00:00
Andy Wilkinson be32421b86 Merge branch '1.5.x' into 2.0.x 2019-03-28 15:55:32 +00:00
Johnny Lim 40d0d6b113 Polish
Closes gh-16299
2019-03-28 16:42:27 +01:00
Stephane Nicoll 89f93b28d7 Merge branch '2.1.x' 2019-03-28 16:37:33 +01:00
Krzysztof Koziol 17c0214cc6 Add missing class condition on thymeleaf-spring5
This commit adds an extra check for the presence of thymeleaf-spring5
library on the classpath. ThymeleafAutoConfiguration is now only
considered if both thymeleaf-spring5 and thymeleaf jars are present.

Closes gh-16341
2019-03-28 16:37:09 +01:00
Andy Wilkinson 24593f39f8 Polish "Use HTTPS for external links wherever possible"
See gh-16276
2019-03-28 13:55:55 +00:00
Spring Operator fb242c27d2 Use HTTPS for external links wherever possible
See gh-16276
2019-03-28 12:07:01 +00:00
Andy Wilkinson 878a635bfb Merge branch '2.1.x' 2019-03-28 11:48:47 +00:00
Andy Wilkinson 5a3474c7a8 Polish "Use HTTPS for external links wherever possible"
See gh-16320
2019-03-28 10:53:01 +00:00
Spring Operator 9fc3ac7d49 Use HTTPS for external links wherever possible
See gh-16320
2019-03-28 09:49:30 +00:00
Andy Wilkinson 864942ad4f Merge branch '2.0.x' into 2.1.x 2019-03-28 09:35:53 +00:00
Andy Wilkinson 14b21026bf Polish "Use HTTPS for external links wherever possible"
See gh-16319
2019-03-28 09:17:50 +00:00
Spring Operator 1a4c6f2dac Use HTTPS for external links wherever possible
See gh-16319
2019-03-27 20:06:52 +00:00
Andy Wilkinson ba4671f0ab Merge branch '1.5.x' into 2.0.x 2019-03-27 19:59:36 +00:00
Stephane Nicoll 3e3353e0e9 Merge branch '2.1.x' 2019-03-27 11:40:49 +01:00
Stephane Nicoll f417fa5c5b Add jaxb API to jersey starter
Closes gh-16268
2019-03-27 11:38:55 +01:00
Stephane Nicoll e57c0c0657 Do not attempt to add Jaxb customization if Jaxb is not present
See gh-16268
2019-03-27 11:38:55 +01:00
Stephane Nicoll bece962711 Merge branch '2.1.x' 2019-03-27 10:18:23 +01:00
Stephane Nicoll c2f9e7dd43 Fix StreamsBuilderFactoryBean injection definition
Closes gh-16329
2019-03-27 10:17:49 +01:00
Johnny Lim 038e213343 Restore setExtractBareNamePropertyMethods() for AssertJ
Closes gh-16325
2019-03-27 07:03:07 +01:00
Andy Wilkinson 4900505425 Merge branch '2.0.x' into 2.1.x 2019-03-26 13:53:57 +00:00
Spring Operator a5dba01cb9 Use HTTPS for external links from XML files where possible
See gh-16314
2019-03-26 13:52:17 +00:00
Andy Wilkinson fedb40a2bf Merge branch '1.5.x' into 2.0.x 2019-03-26 13:48:32 +00:00
Madhura Bhave 5bd2b349bc Merge branch '2.1.x' 2019-03-25 16:04:22 -07:00
Madhura Bhave 91c1fc3d97 Ignore unbound collection properties if collection bound
As of Spring Boot 2.0, if Collection properties are specified in
multiple property sources, only the elements from the property source
with the highest precedence are used for binding. This caused an
`UnboundConfigurationPropertiesException` if the size of the collection
from the higher order property source was smaller and `ignoreUnknownFields`
was set to true.

This commit ignores unbound collection properties if the
collection was properly bound.

Fixes gh-16290
2019-03-25 16:03:33 -07:00
Madhura Bhave 95d10388dd Merge branch '2.1.x' 2019-03-25 11:03:10 -07:00
Madhura Bhave 0c2e71cd08 Prevent early initialization of factory beans in text context customizers
Until Spring Framework 5.1.15, a FactoryBean with a non-default constructor
defined via component scanning would cause an error. This behavior has changed
as of https://github.com/spring-projects/spring-framework/issues/22409.
Regardless of this change we want to ensure that we avoid triggering eager
initialisation. `SimpleFactoryBean` has been written this way so that the tests
fail if early initialization is triggered regardless of the Spring Framework version.

Fixes gh-15898
2019-03-25 10:55:41 -07:00
Stephane Nicoll dec5a8cc7e Merge branch '2.1.x' 2019-03-25 16:14:10 +01:00
Stephane Nicoll 567a82f4ba Update multi release test jar to include Java 12
See gh-16212
2019-03-25 16:13:24 +01:00
Stephane Nicoll b055410ab4 Fix outdated tests
Closes gh-16298
2019-03-25 11:58:09 +01:00
Valery_Yalauchuk c880e10c41 Fix LogFile conditions to check for exposure as well
Closes gh-16298
2019-03-25 11:34:32 +01:00
Stephane Nicoll 76ca467d92 Merge branch '2.1.x' 2019-03-25 11:31:24 +01:00
Stephane Nicoll bd2cc6f48b Add missing condition on LogFile endpoint
See gh-16298
2019-03-25 11:30:45 +01:00
Stephane Nicoll 90160b16aa Merge branch '2.1.x' 2019-03-25 10:20:52 +01:00
dreis2211 c2335e130c Test against Gradle 5.3
Closes gh-16294
2019-03-25 10:19:57 +01:00
Stephane Nicoll 197e1669e2 Polish 2019-03-25 09:01:13 +01:00
Madhura Bhave 2225b36299 Merge branch '2.1.x' 2019-03-22 15:18:23 -07:00
Madhura Bhave 1ad52b651a Document using the same port for the management server on CF
Closes gh-15640
2019-03-22 15:17:34 -07:00
Stephane Nicoll 3125f424ce Add metadata support for immutable ConfigurationProperties type
Closes gh-16071
2019-03-22 15:33:35 +01:00
Madhura Bhave 8f693a0277 Add support for configuration properties scanning
See gh-12602
2019-03-21 13:30:44 -07:00
Brian Clozel 711169aa8a Adapt tests after Servlet.fn added to Spring Framework
Since Servlet.fn support has been added in Spring Framework, new
infrastructure beans (like `HandlerAdapter` and `HandlerMapping`) have
been added.

This commit adapts the Spring MVC auto-configuration tests to reflect
those changes.
2019-03-21 14:31:38 +01:00
Stephane Nicoll 6e9e5e5a8b Ignore duplicate "about.html" in Jetty HTTP client
Closes gh-16272
2019-03-21 11:36:27 +01:00
Madhura Bhave 0d136f0573 Merge branch '2.1.x' 2019-03-20 18:00:48 -07:00
Madhura Bhave 0a54fb73fa Remove redundant include from WebFluxTypeExcludeFilter
For webflux, security configuration is configured via a bean of type
`SecurityWebFilterChain` and not `ServerHttpSecurity`. We would have changed
the include to be `SecurityWebFilterChain` but the filter only applies to
beans registered via component scanning and not those registered in
`@Configuration` classes, making the includes redundant.

See gh-16088
2019-03-20 17:54:04 -07:00
Madhura Bhave 8f0850a69c Merge branch '2.1.x' 2019-03-20 17:48:57 -07:00
Madhura Bhave 6bd6279eff Document slice test behavior with @Configuration classes
Closes gh-16274
2019-03-20 17:48:14 -07:00
Andy Wilkinson 41967fc629 Correct the URI used for the properties DTD
See gh-16270
2019-03-20 17:48:33 +00:00
Andy Wilkinson 36c1c051b8 Merge branch '2.1.x' 2019-03-20 16:55:10 +00:00
Andy Wilkinson e23f72c8b0 Merge branch '2.0.x' into 2.1.x 2019-03-20 16:53:48 +00:00
Andy Wilkinson 9fbd38ab3c Merge branch '1.5.x' into 2.0.x 2019-03-20 16:45:26 +00:00
Stephane Nicoll 1aaab7ecc3 Upgrade to Solr 8.0.0
Closes gh-16272
2019-03-20 17:25:22 +01:00
Stephane Nicoll 82c434d581 Upgrade to Solr 7.7.1
Closes gh-16273
2019-03-20 17:23:52 +01:00
Spring Operator 00ab30362c Use HTTPS for external links in XML files
See gh-16270
2019-03-20 14:33:25 +00:00
dreis2211 dda0b3e2a1 Remove explicit types
Closes gh-16265
2019-03-20 09:44:51 +01:00
Madhura Bhave dd70c96ead Merge branch '2.1.x' 2019-03-19 17:29:37 -07:00
Madhura Bhave 0c52c3fc55 Clarify ambiguous documentation in default security section
Closes gh-16033
2019-03-19 17:25:47 -07:00
Madhura Bhave 448115609c Merge branch '2.1.x' 2019-03-19 17:12:04 -07:00
Madhura Bhave 4a230fdec9 Document AssertJ's satisfies with extractingJsonPathNumberValue
Closes gh-16229
2019-03-19 17:11:28 -07:00
Andy Wilkinson b828b398b5 Merge branch '2.1.x' 2019-03-19 17:11:45 +00:00
Spring Operator b32c0080c3 Update build and setup configuration to use HTTPS
See gh-16247
2019-03-19 17:06:45 +00:00
Andy Wilkinson a36aa67b52 Merge branch '2.0.x' into 2.1.x 2019-03-19 17:04:41 +00:00
Spring Operator 3e2b6ac8ed Update build and setup configuration to use HTTPS
See gh-16246
2019-03-19 16:58:31 +00:00
Andy Wilkinson daba01ab94 Merge branch '2.1.x' 2019-03-19 12:37:04 +00:00
Andy Wilkinson 716b4e8acf Test the Gradle plugin against Gradle 5.3-rc-3
Closes gh-16211
2019-03-19 12:36:14 +00:00
Madhura Bhave 0611eb49c8 Merge branch '2.1.x' 2019-03-18 18:03:32 -07:00
Madhura Bhave 7ea8770524 Polish "Fix request factory used with withBasicAuth"
Fixes gh-15982
2019-03-18 18:00:17 -07:00
Dmytro Nosan 756bd890eb Fix request factory used with TestRestTemplate withBasicAuth
This commit updates the behavior of withBasicAuth on TestRestTemplate
by trying to use the same request factory type as the underlying restTemplate.
If creation of a new instance of the configured request factory class fails,
it falls back to the `ClientHttpRequestFactorySupplier`.

See gh-15982
2019-03-18 18:00:08 -07:00
Mohamed Rifni e3269a7e9b Switch FaviconRequestHandler visibility to package private
Closes gh-16250
2019-03-17 09:33:33 +01:00
Stephane Nicoll 09ad80b3d9 Merge branch '2.1.x' 2019-03-16 08:27:45 +01:00
Stephane Nicoll 372802a203 Polish "Order the search locations in javadoc by precedence order"
Closes gh-16099
2019-03-16 08:23:57 +01:00
Muhammad Hewedy 4bac6c6688 Order the search locations in javadoc by precedence order
See gh-16099
2019-03-16 08:23:01 +01:00
Stephane Nicoll d625025051 Polish "Add default no-op method to SpringApplicationRunListener"
Closes gh-16104
2019-03-16 08:05:52 +01:00
ayudovin 997f07d13f Add default no-op method to SpringApplicationRunListener
See gh-16104
2019-03-16 08:05:32 +01:00
Madhura Bhave 3d0219c315 Merge branch '2.1.x' 2019-03-15 18:09:47 -07:00
Johnny Lim c5b5f752ed Polish
Closes gh-16219
2019-03-15 17:54:48 -07:00
Madhura Bhave 1893eeef4f Merge branch '2.1.x' 2019-03-15 17:27:10 -07:00
Dmytro Nosan 2f3e5d65be Test server port shouldn't affect management port when random
Closes gh-16108
2019-03-15 17:21:29 -07:00
Stephane Nicoll adaa49c0df Polish
See gh-8762
2019-03-15 12:16:05 +01:00
Stephane Nicoll 19cc584530 Polish "Update Kotlin documentation"
Closes gh-16235
2019-03-15 12:09:35 +01:00
Sebastien Deleuze e8ed128850 Update Kotlin documentation
This commit updates Kotlin reference documentation according to
latest features like immutable `@ConfigurationProperties` and
Kotlin BOM support.

See gh-16235
2019-03-15 12:01:16 +01:00
Stephane Nicoll c115ee1550 Fix build failure 2019-03-14 19:34:19 +01:00
Stephane Nicoll 0e0ea7f00a Fix checkstyle violation 2019-03-14 13:22:43 +01:00
Stephane Nicoll d2164a1ca3 Document constructor binding
Closes gh-8762
2019-03-14 12:19:48 +01:00
Stephane Nicoll de21d71e20 Remove support of `@Autowired` for configuration properties bean
See gh-8762
2019-03-14 11:16:22 +01:00
Stephane Nicoll fcdc414646 Remove use of `@Autowired` for configuration properties bean
See gh-8762
2019-03-14 11:03:10 +01:00
dreis2211 b39b990a72 Use isEmpty() where possible
Closes gh-16225
2019-03-14 09:10:48 +01:00
Madhura Bhave 223f2be7d2 Inject InfoContributors instead of exposing them on InfoEndpoint
Closes gh-13586
2019-03-13 13:16:47 -07:00
Madhura Bhave 2cdc93cf19 Make TestRestTemplate withBasicAuth fault tolerant
It's part of TestRestTemplate's contract that it's fault tolerant. This
commit aligns the behavior of `withBasicAuth` with that expectation.

Closes gh-15780
2019-03-13 11:49:42 -07:00
Andy Wilkinson 0872eb0dd9 Remove use of ReflectionUtils.doWithMethods from ConfigurationBeanFactoryMetadata
Closes gh-16220
2019-03-13 18:34:45 +00:00
Stephane Nicoll 4d73211c3a Polish "Check for multiple processors in OnClassCondition"
Closes gh-16115
2019-03-13 18:13:33 +01:00
Jan Thewes a96a79ea45 Check for multiple processors in OnClassCondition
See gh-16115
2019-03-13 18:13:11 +01:00
Stephane Nicoll 9da20b7e52 Merge branch '2.1.x' 2019-03-13 17:51:38 +01:00
Ruslan Stelmachenko fcde648c50 Fix typo in logging.group property description
Closes gh-16224
2019-03-13 17:47:51 +01:00
Andy Wilkinson ae3ea186e2 Align test with change to exception in latest Framework snapshots 2019-03-13 14:22:40 +00:00
Brian Clozel 5a66dc8c6e Merge branch '2.1.x' 2019-03-13 12:53:23 +01:00
Brian Clozel 9906ef2400 Merge branch '2.0.x' into 2.1.x 2019-03-13 12:52:47 +01:00
Brian Clozel 8866a25ef7 Polish Undertow tests 2019-03-13 11:55:53 +01:00
Brian Clozel 6138041578 Polish
Fixes gh-16014
2019-03-13 11:55:41 +01:00
Johnny Lim a6ccdbe19f Handle missing exceptions in WebMvcMetricsFilter
Prior to this commit, exceptions nested in
`NestedServletExceptions` would not be recorded by the
`WebMvcMetricsFilter`. This commit ensures that exceptions
happening downstream (e.g. happening while writing the response
body itself) are properly recorded.

See https://github.com/micrometer-metrics/micrometer/issues/1190
See gh-16014
2019-03-13 11:07:32 +01:00
Stephane Nicoll 2b4845b335 Add dependency needed by javadoc generation on JDK 11 2019-03-13 09:49:18 +01:00
Stephane Nicoll 81def1f21d Polish 2019-03-13 08:25:39 +01:00
Madhura Bhave e8cb75bba8 Enable git remote linking automatically on CF
Closes gh-13586
2019-03-12 17:30:00 -07:00
Stephane Nicoll b2290107db Polish "Trim trailing whitespace from spring.server.servlet.context-path"
Closes gh-16165
2019-03-12 17:46:17 +01:00
Mohamed Rifni bde2f850b2 Trim trailing whitespace from spring.server.servlet.context-path
See gh-16165
2019-03-12 17:45:56 +01:00
Stephane Nicoll 347daf69fb Merge branch '2.1.x' 2019-03-12 17:22:39 +01:00
Stephane Nicoll 765801983b Polish "Fix typo in spring-boot-features.adoc"
Closes gh-16213
2019-03-12 17:21:18 +01:00
Orangeroad0922 47169436ed Fix typo in spring-boot-features.adoc
See gh-16213
2019-03-12 17:20:43 +01:00
Andy Wilkinson 39971bbbd3 Add dependency needed by javadoc generation on JDK 11 2019-03-12 14:19:24 +00:00
Andy Wilkinson 68bfb020aa Reduce need for bean method proxying and disable where not needed
Closes gh-9068
2019-03-12 13:18:42 +00:00
Stephane Nicoll 0f71f22f3c Polish 2019-03-12 13:57:57 +01:00
Stephane Nicoll 628e44187f Merge branch '2.1.x' 2019-03-12 11:13:25 +01:00
Stephane Nicoll f07de1bbe2 Polish "Update ambiguous documentation about ConfigurationProperties"
Closes gh-16166
2019-03-12 11:12:45 +01:00
Viktoriya Kutsarova 6b6ac28430 Update ambiguous documentation about ConfigurationProperties
See gh-16166
2019-03-12 11:12:21 +01:00
Stephane Nicoll a44a55e948 Merge branch '2.1.x' 2019-03-12 11:07:53 +01:00
Stephane Nicoll 161c0b9fad Polish contribution
Closes gh-16170
2019-03-12 11:06:19 +01:00
ayudovin 51013421f2 Add support for Mustache, FreeMarker and Thymeleaf in WebFluxTest
See gh-16170
2019-03-12 11:06:18 +01:00
Stephane Nicoll 078bd890a6 Merge branch '2.0.x' into 2.1.x 2019-03-12 11:05:23 +01:00
Andy Wilkinson 28cf63354a Merge pull request #16106 from Spring Operator
* gh-16106:
  Drop AnyEdit from Eclipse setup as it is not available over HTTPS
  Update build and setup configuration to use HTTPS

Closes gh-16106
2019-03-12 10:05:06 +00:00
Stephane Nicoll 50d0b4df46 Polish 2019-03-12 11:04:00 +01:00
Spring Operator c9c554b834 Update build and setup configuration to use HTTPS
See gh-16106
2019-03-12 10:02:44 +00:00
Stephane Nicoll 3831aeeb39 Merge branch '2.1.x' 2019-03-12 10:52:31 +01:00
Johnny Lim 00bda4dc2a Add dependency management for micrometer-registry-stackdriver
Closes gh-16178
2019-03-12 10:51:54 +01:00
Stephane Nicoll 8ff0a9c5a9 Merge branch '2.1.x' 2019-03-12 10:51:08 +01:00
Johnny Lim bcfbabe6cd Polish
Closes gh-16193
2019-03-12 10:50:32 +01:00
Andy Wilkinson 4b98fa7d94 Alias proxyBeanMethods on annotations meta-annotated with @Configuration
Closes gh-16201
2019-03-12 09:24:20 +00:00
Phillip Webb 50425bd441 Rollback to Maven Invoker 3.1.0
Closes gh-16205
2019-03-11 23:59:11 -07:00
Phillip Webb 64a2e8d67f Update copyright year for changed files 2019-03-11 22:15:36 -07:00
Phillip Webb dd3e8154d9 Merge branch '2.1.x' 2019-03-11 22:15:19 -07:00
Phillip Webb fc3aa43cc2 Update copyright year for changed files 2019-03-11 22:14:53 -07:00
Phillip Webb f02887b6c6 Merge branch '2.0.x' into 2.1.x 2019-03-11 22:14:21 -07:00
Phillip Webb 9c3af103e0 Fix ScheduledTasksEndpointAutoConfigurationTests
Update the `CustomEndpointConfiguration` class in
`ScheduledTasksEndpointAutoConfigurationTests` to be package private
so that it can be enhanced by cglib.

Prior to merge commit 361437f4 the class was a lite configuration so
it didn't matter that it was a private class.
2019-03-11 22:12:36 -07:00
Phillip Webb ccfe20d3d3 Merge branch '2.1.x' 2019-03-11 21:10:22 -07:00
Phillip Webb 45ae97a4e9 Merge branch '2.0.x' into 2.1.x 2019-03-11 21:09:35 -07:00
Phillip Webb 03beed603c Fix ScheduledTasksEndpointTests BaseConfiguration
Update the `BaseConfiguration` class in `ScheduledTasksEndpointTests`
to be package private so that it can be enhanced by cglib.

Prior to merge commit 361437f4 the class was a lite configuration so
it didn't matter that it was a private class.
2019-03-11 21:07:20 -07:00
Madhura Bhave d92c2f7023 DefaultProperties profiles shouldn't take precedence over config files
Fixes gh-15445
2019-03-11 16:17:46 -07:00
Andy Wilkinson 404f5d33f3 Align Gradle plugin's tests with Kotlin 1.3's restructuring
See gh-16195
2019-03-11 21:21:18 +00:00
Stephane Nicoll fed145e195 Replace manual dependency management by Kotlin's bom
Closes gh-9486
2019-03-11 17:44:27 +01:00
Andy Wilkinson aa2008bc5a Merge branch '2.1.x' 2019-03-11 16:40:19 +00:00
Andy Wilkinson f0ef693376 Merge branch '2.0.x' into 2.1.x 2019-03-11 16:28:29 +00:00
Andy Wilkinson c2eeeb032c Work around javac bug 2019-03-11 16:27:56 +00:00
Stephane Nicoll 09d51089ba Polish 2019-03-11 17:24:52 +01:00
Stephane Nicoll fd0a11b7a7 Reuse Kotlin parameter names if possible
This commit detects a Kotlin constructor so that it is not required to
transmit the parameter names information to the Java side.

See gh-8762
2019-03-11 17:23:45 +01:00
Andy Wilkinson 8c3cec8f13 Merge branch '2.0.x' into 2.1.x 2019-03-11 16:14:19 +00:00
Andy Wilkinson 361437f4e2 Merge branch '1.5.x' into 2.0.x 2019-03-11 15:53:34 +00:00
Stephane Nicoll b34b217d1e Upgrade to Kotlin 1.3.21
Closes gh-16195
2019-03-11 15:56:13 +01:00
Stephane Nicoll 341859b5fe Start building against Spring Framework 5.2 snapshots
See gh-16173
2019-03-11 15:22:14 +01:00
Stephane Nicoll c30f9815c1 Fix detection of Autowired constructor with Kotlin
Previously, the import selector wrongly assumed that we should not
use constructor injection with Kotlin. Rather than looking up for the
primary constructor, we retrieve available constructors on the Java
counter-part.

This commit applies the same logic as in the constructor parameter
binder and checks for the primary constructor for Kotlin types.

See gh-8762
2019-03-11 10:19:25 +01:00
Andy Wilkinson 7675802338 Merge branch '2.1.x' 2019-03-11 08:32:03 +00:00
Andy Wilkinson f574213cc8 Mark log file endpoint as producing text/plain
Closes gh-16188
2019-03-11 08:30:31 +00:00
Andy Wilkinson 7d0317419d Polish 2019-03-10 12:42:09 +00:00
Andy Wilkinson 89bb973745 Merge branch '2.1.x' 2019-03-09 20:02:05 +00:00
Andy Wilkinson 7153525ee2 Annotation @JsonTest with @ExtendWith(SpringExtension.class)
Closes gh-16183
2019-03-09 20:00:06 +00:00
Stephane Nicoll d07a6ff0bb Fix binding of bean with no bean definition
See gh-16180
2019-03-09 20:49:47 +01:00
Andy Wilkinson f5eb853f26 Update web starter to depend on validator starter
Previously, the web starter declared direct dependencies on Hibernate Validator
and the Jakarta EE validation API. This meant that it required two exclusions to
exclude validation from a web application that did not need it.

This commit updates the web starter to get its validation dependencies via a
dependency on the validation starter. This allows validation to be excluded
using a single exclusion. The EL dependency from the validation starter has
been excluded to allow the EL implementation from the underlying container
starter (Tomcat, Jetty, or Undertow) to continue to be used instead.

Closes gh-16176
2019-03-08 17:54:03 +00:00
Stephane Nicoll 430571b37b Perform binding at creation time if possible
Previously, environment binding always happened in a post processor once
the bean has been created. Constructor binding requires to perform the
binding at creating time so this commit performs binding at creation
time if possible.

When this happens, a special `ConfigurationPropertiesBeanDefinition` is
created with a supplier that invokes the binder. To avoid a case where
a bean is processed twice, the post-processor now ignores any bean that
has already been bound to the environment.

Closes gh-8762

Co-authored-by: Madhura Bhave <mbhave@pivotal.io>
2019-03-08 15:50:44 +01:00
Madhura Bhave 7ca589d43c Add constructor based binding support
See gh-8762

Co-authored-by: Stephane Nicoll <snicoll@pivotal.io>
2019-03-08 15:50:44 +01:00
Andy Wilkinson 2bd3d19bee Ensure that DevTools' beans use eager init even when app is lazy
Closes gh-15870
2019-03-08 10:05:40 +00:00
Andy Wilkinson 1431a0f585 Upgrade to Spring Data Moore-M2
Closes gh-15197
2019-03-08 08:21:06 +00:00
Brian Clozel 8325fce53e Fix formatting 2019-03-07 21:02:41 +01:00
Brian Clozel 6586bae889 Guard Endpoint bean declarations with ConditionalOnExposedEndpoint
This commit adds the newly introduced `@ConditionalOnExposedEndpoint`
conditional annotation to all auto-configured `Endpoint` in Actuator.

With that change, `EndPoint` instances and related infrastructure will
only be created when they are meant to be exposed and used. This will
save CPU and memory resources when Actuator is present.

Closes gh-16093
2019-03-07 20:13:44 +01:00
Brian Clozel 4ffbe6c9e8 Add @ConditionalOnExposedEndpoint condition
Prior to this commit, Actuator `Endpoint` instantiations would be
guarded by `@ConditionalOnEnabledEnpoint` condition annotations. This
feature saves resources as disabled endpoints aren't unnecessarily
instantiated.

By default, only `"health"` and `"info"` endpoints are exposed over the
web and all endpoints are exposed over JMX.

As of gh-16090, JMX is now disabled by default. This is an opportunity
to avoid instantiating endpoints if they won't be exposed at all, which
is more likely due to the exposure defaults.

This commit adds a new `@ConditionalOnExposedEndpoint` conditional
annotation that checks the `Environment` for configuration properties
under `"management.endpoints.web.exposure.*"` and
`"management.endpoints.jmx.exposure.*"`. In the case of JMX, an
additional check is perfomed, checking that JMX is enabled first.
The rules implemented in the condition itself are following the ones
described in `ExposeExcludePropertyEndpointFilter`.

See gh-16093
2019-03-07 20:05:23 +01:00
Andy Wilkinson b8dff5fe17 Merge branch '2.1.x' 2019-03-07 10:20:29 +00:00
Andy Wilkinson 9d06d22b99 Merge branch '2.0.x' into 2.1.x 2019-03-07 10:17:01 +00:00
Andy Wilkinson affdbeef41 Polish 2019-03-07 10:08:39 +00:00
Andy Wilkinson e1a7f1e085 Upgrade to Cassandra Driver 3.7.1
Closes gh-16163
2019-03-07 09:44:30 +00:00
Andy Wilkinson c4756e9057 Merge branch '2.1.x' 2019-03-07 09:43:16 +00:00
Andy Wilkinson f46894dfd3 Merge branch '2.0.x' into 2.1.x 2019-03-07 09:43:02 +00:00
Andy Wilkinson 17a1b2822c Isolate LoggerContext state to each test
Closes gh-16162
2019-03-07 09:37:41 +00:00
Andy Wilkinson 3f3966adb0 Merge branch '2.1.x' 2019-03-07 09:25:45 +00:00
Andy Wilkinson 9963ed1249 Merge branch '2.0.x' into 2.1.x 2019-03-07 09:25:31 +00:00
Andy Wilkinson 83216c34e5 Merge branch '1.5.x' into 2.0.x 2019-03-07 09:25:17 +00:00
Andy Wilkinson 7c58d72734 Upgrade to Mongo Driver Reactivestreams 1.11.0
Closes gh-16159
2019-03-06 19:51:03 +00:00
Andy Wilkinson 36cbd00853 Disable AssertJ's bare-named property accessor discovery
AssertJ includes a change in 3.12 that means that, by default, it now incorrectly
identifies some of the builder methods on CacheControl as accessor methods for its fields.
This commit restores the behaviour of 3.11 so that a method is only considered to be a
property accessor if a matches the Java bean naming conventions.

Closes gh-16145
2019-03-06 19:42:38 +00:00
Andy Wilkinson e667911f91 Merge branch '2.1.x' 2019-03-06 15:11:28 +00:00
Andy Wilkinson 80f2e2260e Merge branch '2.0.x' into 2.1.x 2019-03-06 15:11:09 +00:00
Andy Wilkinson e56580ddc6 Merge branch '1.5.x' into 2.0.x 2019-03-06 15:10:25 +00:00
Andy Wilkinson 87d696d697 Align with breaking API change in AssertJ 3.12
Closes gh-16145
2019-03-06 14:38:17 +00:00
Andy Wilkinson c2e9f98655 Upgrade to Spring Plugin 2.0.0.M1
Closes gh-15940
2019-03-06 13:40:34 +00:00
Andy Wilkinson 7c568bb277 Upgrade to Spring HATEOAS 1.0.0.M1
Closes gh-15939
2019-03-06 13:40:04 +00:00
Andy Wilkinson c6811d6427 Upgrade to Maven Javadoc Plugin 3.1.0
Closes gh-16157
2019-03-06 13:38:48 +00:00
Andy Wilkinson 12c1271bcb Upgrade to Maven Invoker Plugin 3.2.0
Closes gh-16156
2019-03-06 13:38:46 +00:00
Andy Wilkinson 970f9abc9c Upgrade to Snakeyaml 1.24
Closes gh-16155
2019-03-06 13:38:45 +00:00
Andy Wilkinson 85f42df77f Upgrade to Webjars Locator Core 0.37
Closes gh-16154
2019-03-06 13:38:44 +00:00
Andy Wilkinson 3635885058 Upgrade to Selenium Htmlunit 2.34.0
Closes gh-16153
2019-03-06 13:38:43 +00:00
Andy Wilkinson 44bc3b0f7a Upgrade to Mongodb 3.10.1
Closes gh-16152
2019-03-06 13:38:42 +00:00
Andy Wilkinson cd68579851 Upgrade to Mockito 2.25.0
Closes gh-16151
2019-03-06 13:38:41 +00:00
Andy Wilkinson 22ef0285bd Upgrade to Mariadb 2.4.0
Closes gh-16150
2019-03-06 13:38:40 +00:00
Andy Wilkinson 12e9160fff Upgrade to Junit Jupiter 5.4.0
Closes gh-16149
2019-03-06 13:38:39 +00:00
Andy Wilkinson d4d0db017e Upgrade to Influxdb Java 2.15
Closes gh-16148
2019-03-06 13:38:38 +00:00
Andy Wilkinson 614931755c Upgrade to Elasticsearch 6.6.1
Closes gh-16147
2019-03-06 13:38:37 +00:00
Andy Wilkinson 52a934faae Upgrade to Ehcache3 3.7.0
Closes gh-16146
2019-03-06 13:38:36 +00:00
Andy Wilkinson ad8f2fb409 Upgrade to Assertj 3.12.1
Closes gh-16145
2019-03-06 13:38:35 +00:00
Andy Wilkinson 419a1bd5b3 Upgrade to Kafka 2.1.1
Closes gh-16144
2019-03-06 13:38:33 +00:00
Andy Wilkinson 708551e9d5 Upgrade to Commons Dbcp2 2.6.0
Closes gh-16143
2019-03-06 13:38:32 +00:00
Andy Wilkinson a491fd3d05 Upgrade to Htmlunit 2.34.1
Closes gh-16142
2019-03-06 13:38:31 +00:00
Andy Wilkinson 4fff84c65c Upgrade to Rest Assured 3.3.0
Closes gh-16141
2019-03-06 13:38:30 +00:00
Andy Wilkinson 10c90a8845 Upgrade to Rxjava2 2.2.7
Closes gh-16140
2019-03-06 13:38:29 +00:00
Andy Wilkinson d8e94f2b6e Upgrade to Commons Codec 1.12
Closes gh-16139
2019-03-06 13:38:28 +00:00
Andy Wilkinson 35a2dc0133 Upgrade to Hikaricp 3.3.1
Closes gh-16138
2019-03-06 13:38:27 +00:00
Andy Wilkinson 2609e27f5f Upgrade to Rabbit Amqp Client 5.6.0
Closes gh-16137
2019-03-06 13:38:26 +00:00
Andy Wilkinson 236cae5727 Upgrade to Hazelcast Hibernate5 1.3.2
Closes gh-16136
2019-03-06 13:38:25 +00:00
Andy Wilkinson cd7eed92a9 Upgrade to Caffeine 2.7.0
Closes gh-16135
2019-03-06 13:38:24 +00:00
Andy Wilkinson eaf055382b Merge branch '2.1.x' 2019-03-06 13:35:31 +00:00
Andy Wilkinson a09713ee30 Upgrade to Infinispan 9.4.8.Final
Closes gh-16134
2019-03-06 13:34:02 +00:00
Andy Wilkinson de042114af Upgrade to Jetty Reactive Httpclient 1.0.3
Closes gh-16133
2019-03-06 13:34:00 +00:00
Andy Wilkinson c54ac68afa Upgrade to Undertow 2.0.19.Final
Closes gh-16132
2019-03-06 13:33:59 +00:00
Andy Wilkinson 33fdc5b471 Upgrade to Rxjava2 2.2.7
Closes gh-16131
2019-03-06 13:33:58 +00:00
Andy Wilkinson 2568bd6a83 Upgrade to Netty Tcnative 2.0.22.Final
Closes gh-16130
2019-03-06 13:33:57 +00:00
Andy Wilkinson 4f5eff6fa4 Upgrade to Lettuce 5.1.5.RELEASE
Closes gh-16129
2019-03-06 13:33:56 +00:00
Andy Wilkinson e01b76aa45 Upgrade to Hazelcast 3.11.2
Closes gh-16128
2019-03-06 13:33:56 +00:00
Andy Wilkinson ff64e112c9 Merge branch '2.0.x' into 2.1.x 2019-03-06 13:33:00 +00:00
Andy Wilkinson 4cfc532890 Upgrade to Spring Ws 3.0.7.RELEASE
Closes gh-16127
2019-03-06 13:30:51 +00:00
Andy Wilkinson 51657e1ad0 Upgrade to Spring Integration 5.0.12.RELEASE
Closes gh-16126
2019-03-06 13:30:49 +00:00
Andy Wilkinson ab05a07807 Upgrade to Neo4j Ogm 3.1.8
Closes gh-16125
2019-03-06 13:30:48 +00:00
Andy Wilkinson 7a26a092aa Upgrade to Hibernate Validator 6.0.15.Final
Closes gh-16124
2019-03-06 13:30:46 +00:00
Andy Wilkinson 31892a3488 Upgrade to Elasticsearch 5.6.15
Closes gh-16123
2019-03-06 13:30:45 +00:00
Andy Wilkinson 5f35a1d089 Merge branch '1.5.x' into 2.0.x 2019-03-06 13:30:09 +00:00
Andy Wilkinson acdbd18a7b Merge branch '2.1.x' 2019-03-06 13:24:33 +00:00
Andy Wilkinson 31ed042190 Return 503 when component or instance is down with WebFlux
Closes gh-16109
2019-03-06 13:24:23 +00:00
Andy Wilkinson 0959698c32 Upgrade to Jersey 2.28
Closes gh-16114
2019-03-06 12:58:35 +00:00
Andy Wilkinson d6a869fa98 Switch to Jakarta EE API dependencies where possible
Closes gh-16113
Closes gh-16112
Closes gh-16111
Closes gh-15916
Closes gh-15689
2019-03-06 11:20:51 +00:00
Brian Clozel ce9626d00f Disable JMX by default
This commit switches the default value for the `spring.jmx.enabled`
configuration property.
JMX is now disabled by default and can be enabled with
`spring.jmx.enabled=true`.

Closes gh-16090
2019-03-05 18:51:00 +01:00
Stephane Nicoll 4f029d6df9 Polish "Add loadOnStartup property to EndpointServlet"
Closes gh-16053
2019-03-05 10:59:18 +01:00
Gómez Díaz, Julio José b99c05329f Add loadOnStartup property to EndpointServlet
loadOnStartup property was missing from EndpointServlet and cannot be set
inside ServletEndpointRegistrar. Now it can be set and register a Servlet
with that integer property ready to act upon registration.

See gh-16053
2019-03-05 10:34:55 +01:00
Johnny Lim 4a738e3c49 Polish
Closes gh-16094
2019-03-05 08:19:29 +01:00
Stephane Nicoll d83a614bd9 Merge branch '2.1.x' 2019-03-05 08:18:41 +01:00
Stephane Nicoll 8d033e73d1 Polish
See gh-16094
2019-03-05 08:18:14 +01:00
Andy Wilkinson 19851c98c9 Merge branch '2.1.x' 2019-03-04 15:21:16 +00:00
Andy Wilkinson bdab9c4e31 Upgrade to Couchbase Client 2.7.4
Closes gh-15914
2019-03-04 15:21:09 +00:00
Stephane Nicoll 6b273279fb Merge branch '2.1.x' 2019-03-04 15:58:35 +01:00
Stephane Nicoll 4eb73e0050 Recommend that DevTools is excluded with custom packaging arrangement
Closes gh-15382
2019-03-04 15:57:47 +01:00
Stephane Nicoll 4f2e788835 Fix import in docs
Closes gh-16017
2019-03-04 15:45:59 +01:00
Johnny Lim f4786d7d2e Polish
Closes gh-16083
2019-03-04 15:19:57 +01:00
Stephane Nicoll 1b55f0ccf9 Merge branch '2.1.x' 2019-03-04 15:19:35 +01:00
Johnny Lim 3242e89271 Polish
See gh-16083
2019-03-04 15:18:51 +01:00
Stephane Nicoll 3febf56e93 Merge branch '2.1.x' 2019-03-04 15:13:05 +01:00
Johnny Lim 907058d845 Rename Maven version property for PooledJMS
Closes gh-16086
2019-03-04 15:12:28 +01:00
Stephane Nicoll f90bfff132 Merge branch '2.1.x' 2019-03-04 15:00:21 +01:00
Stephane Nicoll 2099093978 Merge branch '2.0.x' into 2.1.x 2019-03-04 15:00:00 +01:00
Stephane Nicoll b8cbd0c17f Merge branch '1.5.x' into 2.0.x 2019-03-04 14:55:10 +01:00
Stephane Nicoll 75c248dcba Move setter attribute in PropertyDescriptor proper 2019-03-04 10:53:13 +01:00
Stephane Nicoll a90c8d01a9 Polish 2019-03-04 10:53:08 +01:00
Stephane Nicoll 7b8563a877 Merge branch '2.1.x' 2019-03-04 09:29:13 +01:00
Stephane Nicoll 235fbfb4b6 Polish "Use AssertJ facilities for expected exceptions"
Closes gh-16066
2019-03-04 08:58:28 +01:00
dreis2211 be445f6346 Use AssertJ facilities for expected exceptions
See gh-16066
2019-03-04 08:45:42 +01:00
Madhura Bhave 64b7466d51 Remove secure flag from AutoConfigureMockMvc
Closes gh-13822
2019-02-28 13:15:00 -08:00
Stephane Nicoll baa5a00d26 Merge branch '2.1.x' 2019-02-28 14:58:41 +01:00
Stephane Nicoll c224eebef3 Polish "Fix NullPointerException with empty X-Forwarded-For header"
Closes gh-16046
2019-02-28 14:56:42 +01:00
Dmytro Nosan 64a74c3bbb Fix NullPointerException with empty X-Forwarded-For header
See gh-16046
2019-02-28 14:51:25 +01:00
Stephane Nicoll 3bcd93bd35 Merge branch '2.1.x' 2019-02-28 14:44:27 +01:00
Stephane Nicoll 2a6791aa20 Polish "Add `jaxb-runtime` to TldSkipPatterns"
Closes gh-16027
2019-02-28 14:39:52 +01:00
Rupert Madden-Abbott 946ada62fb Add `jaxb-runtime` to TldSkipPatterns
See gh-16027
2019-02-28 14:37:45 +01:00
Dmytro Nosan c0a458e9d0 Remove unused constructor argument
Closes gh-16059
2019-02-28 14:09:34 +01:00
Stephane Nicoll d5448eb124 Polish "Add failure analyzer for Flyway's bootstrap failure"
Closes gh-16015
2019-02-28 13:46:04 +01:00
anand 96315372ef Add failure analyzer for Flyway's bootstrap failure
See gh-16015
2019-02-28 13:46:04 +01:00
Stephane Nicoll 2ad234b605 Adapt to breaking change in Spring Hateoas 2019-02-28 13:42:27 +01:00
Stephane Nicoll ad6e58e489 Merge branch '2.1.x' 2019-02-28 09:37:30 +01:00
XYUU 7aedb0a33d Fix a colon format
Closes gh-16054
2019-02-28 09:36:22 +01:00
Stephane Nicoll c8e46f66e2 Merge branch '2.1.x' 2019-02-27 16:04:45 +01:00
Stephane Nicoll ce17a923dd Polish contribution
Closes gh-15978
2019-02-27 16:03:28 +01:00
Dmytro Nosan cf89ebcf92 Add an example showing how to use Spring REST Docs with WebTestClient
See gh-15978
2019-02-27 16:03:15 +01:00
Stephane Nicoll 554bff6145 Merge branch '2.1.x' 2019-02-27 15:19:37 +01:00
Stephane Nicoll eebd906c8a Polish contribution
Closes gh-16047
2019-02-27 15:10:43 +01:00
Dan Zheng 2c4afb3bd8 Fix NamedParameterJdbcTemplate precedence with database migration tools
See gh-16047
2019-02-27 15:10:20 +01:00
Stephane Nicoll 7beb64043d Fix build failure 2019-02-27 13:55:28 +01:00
Stephane Nicoll 7f817e339b Merge branch '2.1.x' 2019-02-27 13:45:26 +01:00
Stephane Nicoll 978f80122b Polish "Debug mode is not logging web and sql related loggers"
Closes gh-16018
2019-02-27 13:37:18 +01:00
Dmytro Nosan c3430d5883 Debug mode is not logging web and sql related loggers
See gh-16018
2019-02-27 13:25:08 +01:00
Stephane Nicoll 715db153e3 Polish "Remove code deprecated in 2.1"
Closes gh-16013
2019-02-27 11:15:48 +01:00
Mehmed Baždar 246111cd84 Remove code deprecated in 2.1
See gh-16013
2019-02-27 10:08:48 +01:00
Stephane Nicoll 5e4418973e Merge branch '2.1.x' 2019-02-26 16:59:32 +01:00
Stephane Nicoll c47edd15af Polish "Update instructions on how to use JAXB as XML renderer"
Closes gh-16005
2019-02-26 16:57:47 +01:00
Lars Grefer 221ff8d69f Update instructions on how to use JAXB as XML renderer
See gh-16005
2019-02-26 16:50:30 +01:00
dreis2211 2ab4ce03db Fix deprecations
Closes gh-16037
2019-02-26 16:49:13 +01:00
Stephane Nicoll 00a18c32ab Restructure metadata generation
This commit restructures the annotation processor to off-load most of
its logic in a PropertyDescriptor abstraction that is consumed to
generate the relevant metadata.

This has the benefit to isolate the various way properties can be
identified (java bean and lombok for now).

Closes gh-16036
2019-02-26 10:10:33 +01:00
Stephane Nicoll 99c0b4561d Polish test to request the type under test 2019-02-23 09:30:15 +01:00
Stephane Nicoll c44a1e129d Polish 2019-02-22 14:04:37 +01:00
Stephane Nicoll 8a064b0da2 Move main test annotation processor to test package 2019-02-22 14:04:29 +01:00
Stephane Nicoll 4bee913fb2 Add shared test processor
This commit adds a simple annotation processor that can be used to run
more fine grained assertions.
2019-02-22 14:04:22 +01:00
Madhura Bhave adea7014a9 Add support to detect Kubernetes platform in CloudPlatform
Closes gh-15537
2019-02-21 15:27:23 -08:00
Andy Wilkinson 0f0adb4cd0 Polish formatting 2019-02-21 22:04:56 +00:00
Stephane Nicoll 7b0004d6c3 Fix formatting 2019-02-21 14:17:34 +01:00
Stephane Nicoll 8773a2fed3 Polish 2019-02-21 11:37:11 +01:00
Andy Wilkinson f2e3e274a8 Merge branch '2.1.x' 2019-02-21 08:19:43 +00:00
Andy Wilkinson 53326695ea Polish 2019-02-21 08:13:54 +00:00
Madhura Bhave 6f045d8891 Merge branch '2.1.x' 2019-02-20 16:13:20 -08:00
Madhura Bhave c3e47541ad EndpointRequest should check that the request is to the mgmt context
Fixes gh-15702
2019-02-20 16:08:26 -08:00
Andy Wilkinson f4bd0b8b4b Merge branch '2.1.x' 2019-02-20 18:18:06 +00:00
Andy Wilkinson 59430a2642 Only include zips in BOOT-INF/lib, WEB-INF/lib, and WEB-INF/lib-provided
Closes gh-16001
2019-02-20 18:15:27 +00:00
Andy Wilkinson 43c9a789ac Merge branch '2.1.x' 2019-02-20 17:28:39 +00:00
Andy Wilkinson 55fe26b075 Polish "Use kotlin_module not kotlin-module to identify Kotlin module metadata"
See gh-16004
2019-02-20 17:19:03 +00:00
Robert Thornton cb6362df82 Use kotlin_module not kotlin-module to identify Kotlin module metadata
See gh-16004
2019-02-20 17:19:03 +00:00
Andy Wilkinson de0c065625 Inject single-use configuration dependencies into bean methods
Closes gh-15751
2019-02-20 17:02:43 +00:00
Stephane Nicoll 34f28b4cbd Merge branch '2.1.x' 2019-02-20 13:25:01 +01:00
Stephane Nicoll 91a005f578 Resolve generic types in generated metadata
Closes gh-15850
2019-02-20 13:24:40 +01:00
Stephane Nicoll 0c45019200 Upgrade to Spring Doc Resources 0.1.0.RELEASE
Closes gh-15805
2019-02-19 14:24:20 +01:00
Andy Wilkinson 52aa7e1e09 Include source of NoSuchMethodError in its failure analysis
Closes gh-15995
2019-02-19 12:38:21 +00:00
Stephane Nicoll 4992b7fb29 Polish "Migrate Kotlin tests to Mockk"
Closes gh-15993
2019-02-19 13:36:06 +01:00
Sebastien Deleuze cca79b8d4d Migrate Kotlin tests to Mockk
See gh-15993
2019-02-19 13:35:43 +01:00
Andy Wilkinson 51776af45d Include source of NoSuchMethodError in its failure analysis
Closes gh-15995
2019-02-19 12:34:52 +00:00
Stephane Nicoll 967eecfbf8 Remove redundant dependency management for dom4j:dom4j
Closes gh-15199
2019-02-19 13:31:09 +01:00
Stephane Nicoll eee07efee1 Switch Logback's file size properties to DataSize
This commit changes the target type of file size-based properties to
`DataSize` and tolerates Logback's specific format.

Closes gh-15930
2019-02-19 11:16:31 +01:00
Andy Wilkinson e6764bdc5a Merge branch '2.1.x' 2019-02-19 09:39:38 +00:00
Andy Wilkinson 55426208ab Provide type information for optional thread dump endpoint response fields
Closes gh-15989
2019-02-19 09:12:54 +00:00
Johnny Lim 55f5f2f910 Polish
Closes gh-15987
2019-02-19 09:14:40 +01:00
Stephane Nicoll ddfdc48161 Merge branch '2.1.x' 2019-02-18 21:25:25 +01:00
Stephane Nicoll 42c246cacb Polish contribution
Closes gh-15984
2019-02-18 21:18:51 +01:00
isank e546ed4834 Order TaskExecution auto-config before TaskScheduling auto-config
See gh-15984
2019-02-18 21:18:09 +01:00
Stephane Nicoll fa49dfcaaf Add support for task scheduling shutdown related properties
See gh-15951
2019-02-18 21:13:32 +01:00
Stephane Nicoll d2cbf08f09 Polish "Add support for task executor shutdown related properties"
Closes gh-15951
2019-02-18 21:13:32 +01:00
Filip Hrisafov 3b47ba21a8 Add support for task executor shutdown related properties
See gh-15951
2019-02-18 21:13:32 +01:00
Andy Wilkinson 9540905e73 Merge branch '2.1.x' 2019-02-18 17:30:02 +00:00
Andy Wilkinson 68e3de0357 Use name from header not alias when checking entry has expected name
Previously, an entry’s potentially aliased name would be used when
checking that it has a particular name. The alias would always be
applied, irrespective of the name in the header. As a result, when
there was a clashing hash and an entry with a particular index did
not have the expected name, this would be concealed by the alias
being applied and the name check being done with the alias.

This commit reworks JarEntry to store the name in its header in
addition to its alias, if any. When checking that the entry has the
expected name, the unaliased name is passed in and the entry compares
it with the name from the header rather than the alias.

Closes gh-15981
2019-02-18 17:29:25 +00:00
Stephane Nicoll ff6ef1e55d Merge branch '2.1.x' 2019-02-18 16:49:42 +01:00
Stephane Nicoll 20c39dc554 Document missing keys mapped on third party types
Closes gh-15980
2019-02-18 16:48:51 +01:00
Brian Clozel 2a2bfb9915 Auto-generate the "Common application properties"
Prior to this commit, the application properties listed in the reference
documentation would be manually managed and updated.

This commit adds a new `spring-boot-configuration-docs` project that
extracts that information from the available JSON metadata and writes
Asciidoctor tables ready for inclusion in the reference documentation.

The `generateConfigurationPropertyTables.groovy` is using this library
and configures the sections and how namespaces should be organized.

Fixes gh-8237
2019-02-18 15:46:15 +01:00
Andy Wilkinson add8c6f295 Align HypermediaAutoConfigurationTests with latest HATEOAS API changes
See gh-15939
2019-02-18 09:41:11 +00:00
Stephane Nicoll 6e8cc49a1e Merge branch '2.1.x' 2019-02-15 09:39:51 +01:00
Stephane Nicoll 5916393b20 Upgrade to Spring Integration 5.1.3
Closes gh-15866
2019-02-15 09:38:34 +01:00
Madhura Bhave 9bc9639954 Merge branch '2.1.x' 2019-02-14 21:54:37 -08:00
Madhura Bhave 012a956454 Fix typo in doc 2019-02-14 19:39:01 -08:00
Andy Wilkinson bd504e68fc Merge branch '2.1.x' 2019-02-14 15:21:30 +00:00
Andy Wilkinson 33b9321071 Track condition evaluation per-context when determining delta
Closes gh-15766
2019-02-14 15:11:18 +00:00
Stephane Nicoll 71df2f311b Polish "Expose Tomcat AccessLog Max days property"
Closes gh-15954
2019-02-14 16:01:21 +01:00
Dmytro Nosan 596f0c28c0 Expose Tomcat AccessLog Max days property
See gh-15954
2019-02-14 16:01:21 +01:00
Andy Wilkinson be40d000ba Merge branch '2.1.x' 2019-02-14 14:46:59 +00:00
Andy Wilkinson 1be794fe65 Retry upload for any SocketException not just a ConnectException
Previously, DevTools would retry the upload of the changes to an
application in the event of a ConnectException. If a different
network-level failure occurred, it would not be retried and would
cause the file watching thread to die.

This commit attempts to make things more robust by retrying all
SocketExceptions and not just ConnectExceptions. A warning is
logged when a failure occurs. A separate debug message that
includes the exception is also logged.

Closes gh-10317
2019-02-14 14:46:52 +00:00
Stephane Nicoll 8939a7eec3 Merge branch '2.1.x' 2019-02-14 15:35:18 +01:00
Stephane Nicoll f3e142cb7c Polish "Stop using imports from shaded dependencies"
Closes gh-15950
2019-02-14 15:34:03 +01:00
Michael Simons de7812aa3a Stop using imports from shaded dependencies
See gh-15950
2019-02-14 15:34:03 +01:00
Andy Wilkinson 8bcc0caa06 Merge branch '2.1.x' 2019-02-14 14:25:55 +00:00
Andy Wilkinson 90f059cf3a Upgrade to Spring Session Bean-SR3
Closes gh-15868
2019-02-14 14:25:51 +00:00
Stephane Nicoll c1cccc886a Merge branch '2.1.x' 2019-02-14 15:22:35 +01:00
Stephane Nicoll cd322d7b9c Polish "Add a link to SpringMockK in the Kotlin documentation"
Closes gh-15943
2019-02-14 15:22:02 +01:00
Sebastien Deleuze da6de215a6 Add a link to SpringMockK in the Kotlin documentation
See gh-15943
2019-02-14 15:21:12 +01:00
Andy Wilkinson 3a4a431eaa Provide a configuration option to enable lazy initialization
Closes gh-15870
2019-02-14 12:41:49 +00:00
Andy Wilkinson 6519e85b5a Merge branch '2.1.x' 2019-02-14 08:23:38 +00:00
Andy Wilkinson 027f9182a8 Generate Javadoc with same source level as used for compilation
This works around a change in javadoc generation in JDK 11.0.2. See
https://bugs.openjdk.java.net/browse/JDK-8212233 for details.
2019-02-14 08:23:20 +00:00
Madhura Bhave 862ffcbbf4 Merge branch '2.1.x' 2019-02-13 13:33:14 -08:00
Madhura Bhave bbe555a4f5 Split Jersey management context configuration
This commit splits the management context configuration for jersey
into two separate configurations depending on if the type is SAME or
CHILD. The configuration for the SAME context should only kick in if
there is no existing ResourceConfig bean.

Fixes gh-15891
2019-02-13 13:27:54 -08:00
Andy Wilkinson 44046b767f Merge branch '2.1.x' 2019-02-13 21:18:47 +00:00
Andy Wilkinson b645e0a581 Upgrade to Spring Kafka 2.2.4.RELEASE
Closes gh-15867
2019-02-13 21:16:32 +00:00
Andy Wilkinson 2460454eb4 Merge branch '2.1.x' 2019-02-13 21:15:35 +00:00
Andy Wilkinson a69eb3729c Upgrade to Spring Security 5.1.4.RELEASE
Closes gh-15863
2019-02-13 21:15:09 +00:00
Andy Wilkinson b27242f27b Merge branch '2.1.x' 2019-02-13 18:00:15 +00:00
Andy Wilkinson e3806dca42 Upgrade to Micrometer 1.1.3
Closes gh-15869
2019-02-13 17:56:59 +00:00
Andy Wilkinson fbf67c4dec Upgrade to Spring AMQP 2.1.4.RELEASE
Closes gh-15865
2019-02-13 17:56:25 +00:00
Andy Wilkinson 5c1fc52252 Upgrade to Spring Data Lovelace-SR5
Closes gh-15864
2019-02-13 17:55:20 +00:00
Andy Wilkinson 08b0560a86 Upgrade to Lettuce 5.1.4.RELEASE
Closes gh-15945
2019-02-13 17:55:13 +00:00
Andy Wilkinson dd1686bea8 Upgrade to Commons Pool2 2.6.1
Closes gh-15946
2019-02-13 17:54:51 +00:00
Andy Wilkinson cc87bb28aa Merge branch '2.0.x' into 2.1.x 2019-02-13 17:54:18 +00:00
Andy Wilkinson 5dc285f2cf Upgrade to Spring Hateoas 0.25.1.RELEASE
Closes gh-15944
2019-02-13 17:49:00 +00:00
Andy Wilkinson 747e419db1 Merge branch '2.1.x' 2019-02-13 17:45:45 +00:00
Andy Wilkinson 9fb0b97f96 Decorate test containers so tests are skipped without Docker
Closes gh-15901
Closes gh-15638
2019-02-13 17:44:45 +00:00
Stephane Nicoll 3d6def9f81 Handle BatchMessagingMessageConverter with Kafka batch listeners
Closes gh-15942
2019-02-13 17:06:38 +01:00
Andy Wilkinson 18174a8e9e Polish "Add opt-in support for Neo4j-OGM native types"
See gh-15637
2019-02-13 15:04:54 +00:00
Michael Simons af21b847a0 Add opt-in support for Neo4j-OGM native types
This includes tests for the autoconfiguration using that new property.
The test require the native types for Bolt and embedded in the test
scope, so the Neo4j-OGM native types have been added to managed
dependencies.

The enhanced autoconfiguration throws an
InvalidConfigurationPropertyValueException when native types cannot be
used due to missing dependencies or wrong transport mode.

See gh-15637
2019-02-13 14:38:44 +00:00
Stephane Nicoll 7413584b00 Polish "Support expressing application `args` in `@SpringBootTest`"
Closes gh-14823
2019-02-13 15:07:11 +01:00
Justin Griffin 422e6b7d41 Support expressing application `args` in `@SpringBootTest`
Add `args` property to the `@SpringBootTest` annotation so tests
can easily supply application arguments to pass to their app under test.

See gh-14823
2019-02-13 14:38:26 +01:00
Andy Wilkinson b3312d7de4 Upgrade to Jedis 3.0.1
Closes gh-15941
2019-02-13 12:43:16 +00:00
Andy Wilkinson a0b826ce4d Start building against Spring Plugin 2.0.0.M1 snapshots
See gh-15940
2019-02-13 11:37:44 +00:00
Andy Wilkinson bb4cdd3ba1 Start building against Spring HATEOAS 1.0.0.M1 snapshots
See gh-15939
2019-02-13 11:34:21 +00:00
Michael Simons 330f5b70f2 Upgrade to Neo4j-OGM 3.2.0-alpha04
Closes gh-15937
2019-02-13 11:26:37 +00:00
Andy Wilkinson 7a8104ac0e Upgrade to Elasticsearch 6.5.4
Closes gh-15938
2019-02-13 11:26:37 +00:00
Andy Wilkinson e924745bf8 Start building against Spring Data Moore M2 snapshots
See gh-15197
2019-02-13 11:26:37 +00:00
Stephane Nicoll c3c22c0a8a Polish "Fix broken links to appendix"
Closes gh-15933
2019-02-13 10:58:55 +01:00
Govinda 3428c0efa2 Fix broken links to appendix
See gh-15933
2019-02-13 10:52:17 +01:00