root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity
21,445 Commits 23 Branches 345 Tags 278 MiB
Commit Graph

5480 Commits

Author SHA1 Message Date
Andy Wilkinson 7661287760 Upgrade to Thymeleaf Layout Dialect 2.4.1 
Closes gh-16431
 2019-04-03 14:40:28 +01:00
Andy Wilkinson 674a96e369 Upgrade to Classmate 1.5.0 
Closes gh-16430
 2019-04-03 14:40:28 +01:00
Andy Wilkinson ca0119950f Align with new fail-fast behaviour in Micrometer 1.1.4 
Closes gh-16425
 2019-04-03 14:39:29 +01:00
Stephane Nicoll 5f4bd37eb1 Merge branch '2.1.x' 2019-04-03 13:56:58 +02:00
Stephane Nicoll 3c058585bf Upgrade to Micrometer 1.1.4 
Close gh-16425
 2019-04-03 13:54:41 +02:00
Andy Wilkinson e3f4d4a165 Merge branch '2.1.x' 2019-04-03 11:40:31 +01:00
Andy Wilkinson 961b0307d6 Upgrade to Netty Tcnative 2.0.24.Final 
Closes gh-16429
 2019-04-03 11:40:21 +01:00
Andy Wilkinson 1db848af0d Upgrade to Solr 6.6.6 
Closes gh-16428
 2019-04-03 11:38:16 +01:00
Stephane Nicoll c5d0ebccff Merge branch '2.1.x' 2019-04-03 12:09:42 +02:00
Brian Clozel f221061d81 Avoid bean method proxying in WebMVC and WebFlux config 
This commit applies changes similar to what's been done in gh-9068, for
MVC and WebFlux configurations. This is now possible thanks to the
changes done in Spring Framework in
https://github.com/spring-projects/spring-framework/pull/22596

Fixes gh-16427
 2019-04-03 12:08:29 +02:00
Stephane Nicoll a90d0a224f Upgrade to Spring Batch 4.1.2 
Closes gh-16423
 2019-04-03 12:07:09 +02:00
Stephane Nicoll 3fb8d504c5 Upgrade to Spring Batch 4.0.3 
Closes gh-16422
 2019-04-03 12:04:40 +02:00
Stephane Nicoll edb5937571 Merge branch '2.1.x' 2019-04-03 11:46:58 +02:00
Johnny Lim 9fae1e5d0e Check for Reactor Netty disconnected client errors 
Closes gh-16046
 2019-04-03 11:45:51 +02:00
Andy Wilkinson 5c4537add9 Merge branch '2.1.x' 2019-04-03 09:52:58 +01:00
Andy Wilkinson 52ebf20cbf Merge branch '2.0.x' into 2.1.x 2019-04-03 09:52:45 +01:00
Andy Wilkinson bfe65c8a5c Merge branch '1.5.x' into 2.0.x 2019-04-03 09:52:28 +01:00
Stephane Nicoll 445870941f Upgrade to Spring Session Bean-SR4 
Closes gh-16357
 2019-04-03 10:11:49 +02:00
Stephane Nicoll 03762d5a96 Upgrade to Spring Session Apple-SR9 
Closes gh-16356
 2019-04-03 10:10:27 +02:00
Stephane Nicoll c57b4fcb04 Upgrade to Spring Integration 5.1.4 
Closes gh-16350
 2019-04-03 10:08:48 +02:00
Stephane Nicoll 1acc3d7161 Upgrade to Spring Integration 5.0.13 
Closes gh-16349
 2019-04-03 10:07:29 +02:00
Andy Wilkinson bc00ad0fc5 Merge branch '2.1.x' 2019-04-03 08:32:34 +01:00
Andy Wilkinson 7b151f2a11 Merge branch '2.0.x' into 2.1.x 2019-04-03 08:32:22 +01:00
Andy Wilkinson 49423645f7 Merge branch '1.5.x' into 2.0.x 2019-04-03 08:32:11 +01:00
Andy Wilkinson 925850f267 Upgrade to Kafka 2.2.0 
Closes gh-16420
 2019-04-03 08:16:52 +01:00
Andy Wilkinson 967aafedec Start building against Spring Kafka 2.3.0 snapshots 
See gh-16302
 2019-04-03 08:16:52 +01:00
dreis2211 03a5bb7857 Avoid using deprecated @SolrDocument#solrCoreName 
Closes gh-16419
 2019-04-03 09:02:23 +02:00
Phillip Webb 52e635b823 Merge branch '2.1.x' 2019-04-02 20:50:22 -07:00
Phillip Webb 912e0a87a8 Merge branch '2.0.x' into 2.1.x 2019-04-02 20:49:44 -07:00
Phillip Webb 8c2e0a61ae Merge branch '1.5.x' into 2.0.x 2019-04-02 20:48:00 -07:00
Madhura Bhave 04517495af Merge branch '2.1.x' 2019-04-02 15:52:35 -07:00
Madhura Bhave ddc52502f5 Document @MockBean behavior during context refresh 
Closes gh-16333
 2019-04-02 15:50:51 -07:00
Phillip Webb 2376f973f4 Merge branch '2.1.x' 2019-04-02 13:46:36 -07:00
Phillip Webb 47c6bf741d Merge branch '2.0.x' into 2.1.x 2019-04-02 13:40:21 -07:00
Phillip Webb 07c000c5b7 Merge branch '1.5.x' into 2.0.x 2019-04-02 13:34:28 -07:00
Andy Wilkinson 4e337f7466 Merge branch '2.1.x' 2019-04-02 19:55:12 +01:00
Andy Wilkinson b969d55e05 Upgrade to Spring Kafka 2.2.5 
Closes gh-16351
 2019-04-02 19:51:08 +01:00
Andy Wilkinson 08673c0191 Upgrade to Spring Security 5.1.5 
Closes gh-16354
 2019-04-02 19:49:48 +01:00
Andy Wilkinson da4a7203c7 Upgrade to Spring Security 5.0.12 
Closes gh-16353
 2019-04-02 19:45:35 +01:00
mmitropolitsky deaf5fa433 Replace ${sys:PID} with %pid in log4j2 configuration 
Replacing property sys:PID which was set in the code with the default
log4j2 Pattern in log4j2.xml and log4j2-file.xml files.

Closes gh-16174
 2019-04-02 17:07:54 +02:00
Stephane Nicoll df79808d38 Polish 2019-04-02 16:52:02 +02:00
Stephane Nicoll c4b1a22e89 Polish "Add Spring-specific styling to Gradle Plugin's documentation" 
Closes gh-16327
 2019-04-02 16:49:11 +02:00
Hendrig Sellik 466b57cd44 Add Spring-specific styling to Gradle Plugin's documentation 
This commit replaces the default Asciidoctor styling with
Spring specific styling.

First, we need to unzip the contents of the Spring Asciidoctor
documentation resources provided by the
`io.spring.docsresources:spring-docs-resources` distribution zip. This
is done in a `/target/refdocs` folder. We then copy all files from
`src/main/asciidoc` to the same location, and then launch the generation
process.

See gh-16327
 2019-04-02 16:38:50 +02:00
Stephane Nicoll 8c8a088c20 Fix zip structure of Actuator documentation 
Closes gh-16326
 2019-04-02 16:38:11 +02:00
Andy Wilkinson 9e7d922555 Allow processor cache to be configured to be unlimited 
Closes gh-16415
 2019-04-02 15:26:40 +01:00
Andy Wilkinson ea80ca2ffc Do not assume HTTP protocol when customizing processor cache 
Closes gh-16413
 2019-04-02 15:10:55 +01:00
Andy Wilkinson c5024f21a4 Merge branch '2.1.x' 2019-04-02 14:40:35 +01:00
Andy Wilkinson 6aa4fe579a Polish 
See gh-16068
 2019-04-02 14:40:18 +01:00
Stephane Nicoll 57cad53ea9 Adapt to latest API change 2019-04-02 15:17:23 +02:00
Andy Wilkinson e1a6726d76 Polish "Update CORS handling according to Framework changes" 
See gh-16410
 2019-04-02 12:48:00 +01:00
Sebastien Deleuze 2f9db7eec6 Update CORS handling according to Framework changes 
This commit updates CORS handling according to Framework changes
introduced via [1]. It also fixes tests according to the new behavior.

See gh-16410

[1] d27b5d0ab6.
 2019-04-02 12:47:07 +01:00
Andy Wilkinson 8ebe5f9983 Merge branch '2.1.x' 2019-04-02 11:17:28 +01:00
Andy Wilkinson f20d9a62ae Polish "Ensure that MongoClient's EventLoopGroup is shut down during context close" 
See gh-16087
 2019-04-02 11:09:14 +01:00
Dmytro Nosan ee7bed1849 Ensure that MongoClient's EventLoopGroup is shut down during context close 
See gh-16087
 2019-04-02 11:04:42 +01:00
Andy Wilkinson 4f42597aca Merge branch '2.1.x' 2019-04-02 10:53:14 +01:00
Andy Wilkinson 02b24b6ed3 Specify that log file endpoint's response is UTF-8 encoded 
Closes gh-16189
 2019-04-02 10:52:18 +01:00
Andy Wilkinson 512fbae715 Merge branch '2.1.x' 2019-04-02 10:47:30 +01:00
Andy Wilkinson 22c9364237 Only use AprLifecycleListener when native library is available 
Closes gh-16040
 2019-04-02 10:47:24 +01:00
Andy Wilkinson ac4d6bb10f Merge branch '2.1.x' 2019-04-02 10:27:45 +01:00
Andy Wilkinson db4623c519 Merge branch '2.0.x' into 2.1.x 2019-04-02 10:27:34 +01:00
Andy Wilkinson 7b5f46d6e3 Add Spring-Boot-* manifest attributes to jars and wars built with Gradle 
Closes gh-16068
 2019-04-02 10:13:09 +01:00
Andy Wilkinson 76450ec7ea Merge branch '2.1.x' 2019-04-02 09:52:16 +01:00
Andy Wilkinson d2c059f25f Upgrade to Spring AMQP 2.1.5 
Closes gh-16347
 2019-04-02 09:51:13 +01:00
Andy Wilkinson 336af93c7e Update to Spring AMQP 2.0.12 
Closes gh-16346
 2019-04-02 09:44:22 +01:00
Andy Wilkinson d33050220d Upgrade to Spring Data Lovelace-SR6 
Closes gh-16360
 2019-04-02 09:35:27 +01:00
Andy Wilkinson f4942b76f0 Upgrade to Spring Data Kay-SR14 
Closes gh-16359
 2019-04-02 09:33:28 +01:00
Madhura Bhave 8daa8c48fb Merge branch '2.1.x' 2019-04-01 15:51:25 -07:00
Madhura Bhave 768aa5dfcc Ignore exception if ValidationAdapter can't get a MessageInterpolator 
Fixes gh-16177
 2019-04-01 15:48:32 -07:00
Madhura Bhave c592e71449 Override missing methods in FilteredClassLoader 
Closes gh-16404
 2019-04-01 15:42:02 -07:00
Andy Wilkinson e74582d263 Merge branch '2.1.x' 2019-04-01 14:08:18 +01:00
Andy Wilkinson 23d237928b Merge branch '2.0.x' into 2.1.x 2019-04-01 14:08:07 +01:00
Andy Wilkinson 922ab115ab Switch custom repository to one with JDK 9-friendly SSL certification chain 2019-04-01 14:07:01 +01:00
Andy Wilkinson 2adb6b1fa4 Override version of Maven Site Plugin for JDK 9+181 compatibility 
See gh-16400
 2019-04-01 11:53:31 +01:00
Stephane Nicoll bd72ff5d83 Switch to snapshots 2019-03-31 19:41:05 +02:00
Stephane Nicoll 695dc8e992 Switch to snapshots 2019-03-31 19:37:43 +02:00
Stephane Nicoll 085ca0f915 Upgrade to Spring Framework 5.1.6.RELEASE 
Closes gh-16340
 2019-03-31 15:28:04 +02:00
Stephane Nicoll 165b9d950a Upgrade to Spring Framework 5.0.13.RELEASE 
Closes gh-16339
 2019-03-31 15:26:57 +02:00
Stephane Nicoll 076e327481 Polish "Complete support for customizing Tomcat's access log" 
Closes gh-16039
 2019-03-29 17:47:53 +01:00
Andrew McGhie f823ae488d Complete support for customizing Tomcat's access log 
See gh-16039
 2019-03-29 17:47:53 +01:00
Andy Wilkinson 6615e11e65 Merge branch '2.1.x' 2019-03-29 16:12:40 +00:00
Andy Wilkinson 4e734669fe Merge branch '2.0.x' into 2.1.x 2019-03-29 16:12:27 +00:00
Andy Wilkinson 7990c8ba68 Merge branch '1.5.x' into 2.0.x 2019-03-29 16:06:47 +00:00
Stephane Nicoll f4c4b1d3f0 Polish "Permit use of https for configuring Prometheus push gateway" 
Closes gh-16084
 2019-03-29 17:03:28 +01:00
Dmytro Nosan eed4e9ea56 Permit use of https for configuring Prometheus push gateway 
See gh-16084
 2019-03-29 16:48:27 +01:00
Stephane Nicoll d7d2c345c1 Merge branch '2.1.x' 2019-03-29 15:58:00 +01:00
Stephane Nicoll b894696efb Polish "Automatically detect log4j2.properties" 
Closes gh-16262
 2019-03-29 15:57:06 +01:00
Mohamed Rifni 2cb4403cd0 Automatically detect log4j2.properties 
See gh-16262
 2019-03-29 15:55:49 +01:00
Stephane Nicoll 1bc47b7e74 Polish "Add Spring-specific styling to Actuator's API documentation" 
Closes gh-16326
 2019-03-29 15:36:35 +01:00
Stephane Nicoll 604b0891d0 Use asciidoctor 1.5.8 
This commit uses asciidoctor 1.5.8 for the time being. Once a new
version of the plugin is released, this override will be unnecessary.
 2019-03-29 15:35:45 +01:00
simionAndrei 26cfbe04b2 Add Spring-specific styling to Actuator's API documentation 
This commit replaces the default Asciidoctor styling with
Spring specific styling.

First, we need to unzip the contents of the Spring Asciidoctor
documentation resources provided by the
`io.spring.docsresources:spring-docs-resources` distribution zip. This
is done in a `/target/refdocs` folder. We then copy all files from
`src/main/asciidoc` to the same location, and then launch the generation
process.

See gh-16326
 2019-03-29 15:35:45 +01:00
Stephane Nicoll d1507497d8 Merge branch '2.1.x' 2019-03-29 14:16:58 +01:00
Stephane Nicoll 1261c3960d Merge branch '2.0.x' into 2.1.x 2019-03-29 14:16:38 +01:00
Stephane Nicoll 28b38ddc9a Upgrade to Reactor Bom Bismuth-SR17 
Closes gh-16372
 2019-03-29 14:15:40 +01:00
Stephane Nicoll 4c1186cbd8 Merge branch '1.5.x' into 2.0.x 2019-03-29 14:12:52 +01:00
Stephane Nicoll 241171fcfa Merge branch '2.1.x' 2019-03-29 14:09:01 +01:00
liucheng.zhang 4d1717f18e Disable nulls serialization when serialize-nulls property is false 
Closes gh-16332
 2019-03-29 13:57:08 +01:00
Stephane Nicoll e80b6cfc44 Merge branch '2.1.x' 2019-03-29 13:41:01 +01:00
Stephane Nicoll 877a47f22b Upgrade to Jooq 3.11.10 
Closes gh-16386
 2019-03-29 13:36:59 +01:00
Stephane Nicoll e03f9e2467 Upgrade to Infinispan 9.4.11.Final 
Closes gh-16385
 2019-03-29 13:36:58 +01:00
Stephane Nicoll 3ae7257171 Upgrade to Hibernate 5.3.9.Final 
Closes gh-16384
 2019-03-29 13:36:57 +01:00
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