root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
24,520 Commits 23 Branches 348 Tags 289 MiB
Commit Graph

7717 Commits

Author SHA1 Message Date
Matthias Stock adfbbcc0f6 Simplify validation pattern of EndpointId 
See gh-19584
 2020-01-09 09:42:31 +01:00
Madhura Bhave 437941cc51 Improve diagnostics when using `@ConstructorBinding` on a Kotlin class 
Closes gh-19312
 2020-01-08 13:53:47 -08:00
Andy Wilkinson 02965e9744 Fix javadoc warnings 
Fixes gh-19572
 2020-01-08 14:02:24 +00:00
Andy Wilkinson 6d8f07d899 Merge branch '2.1.x' into 2.2.x 
Closes gh-19570
 2020-01-08 11:42:56 +00:00
Andy Wilkinson bdffa860d9 Increase startup timeout for Docker containers 
Closes gh-19569
 2020-01-08 11:39:36 +00:00
Andy Wilkinson e04055650c Merge branch '2.1.x' into 2.2.x 
Closes gh-19567
 2020-01-08 11:15:29 +00:00
Andy Wilkinson 3fb1bb74ba Configure WebTestClient to be able to consume large responses 
Closes gh-19566
 2020-01-08 11:14:42 +00:00
Madhura Bhave 82dc7bcc90 HypermediaAutoConfiguration should back off when Spring MVC absent 
Fixes gh-19392
 2020-01-07 14:28:58 -08:00
Madhura Bhave 87dd11502a Refactor HypermediaAutoConfigurationTests 2020-01-07 14:28:09 -08:00
Madhura Bhave ac10ebba33 Fix checkstyle 2020-01-07 13:49:02 -08:00
Madhura Bhave 67fab60fbd Merge branch '2.1.x' into 2.2.x 
Closes gh-19560
 2020-01-07 13:33:32 -08:00
Scott Frederick 487b9cbf96 Add profiles directly to the application environment for tests 
Prior to this commit, active profiles were being added to the Spring Boot
application environment by setting the `spring.profiles.active` property.
This could result in profiles getting parsed differently than other uses of `@ActiveProfiles`.
Setting the profiles directly in the `Environment` prevents this parsing.

See gh-19556
 2020-01-07 13:23:09 -08:00
Andy Wilkinson c57359ea3b Merge branch '2.1.x' into 2.2.x 
Closes gh-19553
 2020-01-07 12:05:21 +00:00
Andy Wilkinson d46406fcb9 Remove loading of non-existent properties file from antlib 
Fixes gh-19552
 2020-01-07 12:04:59 +00:00
Brian Clozel 2f78c72f92 Avoid 406 Not Acceptable for error pages 
Prior to this commit, the `ErrorController` would override the original
error response status if the error map cannot be written due to content
negotiation with the HTTP client. In that case, the error handling
infrastructure returns a `406 Not Acceptable` response.

This commit improves the `ErrorController` so that
`HttpMediaTypeNotAcceptableException` instances thrown by that
controller are not returned as is but instead we write the error
response with an empty body and the original HTTP error status.

Fixes gh-19545
See gh-19522
 2020-01-06 18:08:35 +01:00
dreis2211 6ffe47cd06 Remove deprecated usage of WebTestClientBuilderCustomizer 
See gh-19536
 2020-01-06 12:59:12 +01:00
Rossen Stoyanchev f6947648c9 Improve Spring MVC auto-configuration section 
See gh-19521
 2020-01-04 11:37:01 +01:00
Madhura Bhave c12a3f4172 Support explicitly setting forward headers strategy to NONE 
Prior to this commit, there was no distinction between explicitly setting
forward headers strategy to a value of NONE and not setting it at all.
This meant that in a cloud environment, a cloud provider was always checked
to see if it was active and using forward headers and there was no way to
prevent that.

This commit changes the default value of the property to null so that there
is a way to determine if the property was explicitly set to NONE.

Fixes gh-19333
 2020-01-03 14:19:48 -08:00
Madhura Bhave 8e285a4387 Fix checkstyle 2020-01-03 11:42:14 -08:00
Madhura Bhave ac46f5971f Merge branch '2.1.x' into 2.2.x 
Closes gh-19526
 2020-01-03 11:19:21 -08:00
Madhura Bhave 24dd416f4b Add a test case for binding to map with wildcard types 
This commit also changes the spring framework version
to use snapshots.

Closes gh-18767
 2020-01-03 11:13:41 -08:00
Brian Clozel 1320c44a25 Use RBAC credentials for Couchbase cluster info 
Prior to this commit, the Couchbase auto-configuration would use the
bucket credentials when RBAC is configured. This commit ensures that
RBAC is used in that case.

This commit also adds new configuration properties to customize the
bootstrap ports for Couchbase:

* `spring.couchbase.env.bootstrap.http-direct-port`
* `spring.couchbase.env.bootstrap.http-ssl-port`

Fixes gh-19393
 2020-01-03 09:45:44 +01:00
Stephane Nicoll fd4829c2ea Merge branch '2.1.x' into 2.2.x 
Closes gh-19515
 2020-01-03 09:39:42 +01:00
dreis2211 9cbf5902dc Update some copyrights to 2020 
See gh-19510
 2020-01-03 09:37:22 +01:00
Geoffrey De Smet 493762a416 Add reference to OptaPlanner starter 
See gh-19508
 2020-01-02 13:18:07 +01:00
Stephane Nicoll 7d36599343 Polish "Fix outdated reference in ArtemisConfigurationCustomizer javadoc" 
See gh-19503
 2020-01-01 13:11:39 +01:00
Ochieng Olanga c6f7d12270 Fix outdated reference in ArtemisConfigurationCustomizer javadoc 
See gh-19503
 2020-01-01 13:10:34 +01:00
Stephane Nicoll a684ab8726 Merge branch '2.1.x' into 2.2.x 
Closes gh-19498
 2019-12-31 10:07:32 +01:00
Johnny Lim 27d7727d9f Polish doc 
See gh-19491
 2019-12-31 10:06:58 +01:00
Stephane Nicoll 1de30f0d00 Polish 2019-12-31 09:40:04 +01:00
Stephane Nicoll b7e6febaa0 Merge branch '2.1.x' into 2.2.x 
Closes gh-19496
 2019-12-31 09:36:05 +01:00
Zekariyas f005fffbc3 Fix typo in BindHandler#onFinish javadoc 
See gh-19492
 2019-12-31 09:34:45 +01:00
Stephane Nicoll 07a21ec601 Harmonize property visibility in Saml2RelyingPartyProperties 
Closes gh-19194
 2019-12-30 16:53:23 +01:00
Stephane Nicoll 85667ba165 Merge branch '2.1.x' into 2.2.x 
See gh-19473
 2019-12-28 10:52:01 +01:00
Stephane Nicoll c0f1aaebb6 Fix Tomcat's maxConnections default value 
Closes gh-19472
 2019-12-28 10:51:42 +01:00
Stephane Nicoll 6ea522a90a Merge branch '2.1.x' into 2.2.x 
Closes gh-19473
 2019-12-28 10:02:07 +01:00
Stephane Nicoll d75efad0de Upgrade to Tomcat 9.0.30 
Closes gh-19472
 2019-12-28 09:58:09 +01:00
Stephane Nicoll 6c016663fd Polish contribution 
See gh-18711
 2019-12-26 11:17:51 +01:00
Dmytro Nosan 1fb904acee Support commas embedded in command line arguments from Maven plugin 
See gh-18711
 2019-12-26 11:05:09 +01:00
Stephane Nicoll 4969ecc59a Polish contribution 
See gh-19458
 2019-12-25 08:31:50 +01:00
Girish Kulkarni 582a3b472d Fix file rotation documentation according to maxHistory new default 
See gh-19458
 2019-12-25 08:27:56 +01:00
Stephane Nicoll ee98855905 Merge branch '2.1.x' into 2.2.x 
Closes gh-19453
 2019-12-24 10:59:58 +01:00
Stephane Nicoll 5dc6491807 Clarify documentation of repackage mojo's attach property 
Closes gh-19021
 2019-12-24 10:59:36 +01:00
Stephane Nicoll 1a8a76082b Merge branch '2.1.x' into 2.2.x 
Closes gh-19451
 2019-12-24 10:46:46 +01:00
Stephane Nicoll 2db2daeddf Clarify which part of @ConfigurationProperties is internal API 
Closes gh-19199
 2019-12-24 10:46:01 +01:00
Stephane Nicoll aa54a47671 Merge branch '2.1.x' into 2.2.x 
Closes gh-19448
 2019-12-24 09:41:01 +01:00
Stephane Nicoll 8f9d9fa20e Clarify which caches are automatically bound to the metrics registry 
See gh-19412
 2019-12-24 09:40:05 +01:00
Johnny Lim e0840b690c Add JMX note for Kafka consumer metrics 
See gh-19446
 2019-12-24 09:25:20 +01:00
Stephane Nicoll c9bb17f444 Merge branch '2.1.x' into 2.2.x 
Closes gh-19443
 2019-12-23 16:54:29 +01:00
Stephane Nicoll c6dab447cd Fix visibility of inner classes of ServletWebServerFactoryConfiguration 
Closes gh-19395
 2019-12-23 16:44:52 +01:00
Stephane Nicoll 930a0ef748 Polish Spring Batch how-to guides 
See gh-19211
 2019-12-23 15:35:59 +01:00
Stephane Nicoll b3643965f0 Polish "Detect config props using builder pattern and generics" 
See gh-19099
 2019-12-23 14:57:48 +01:00
如梦技术 743f4a4cb1 Detect config props using builder pattern and generics 
See gh-19099
 2019-12-23 14:54:00 +01:00
Stephane Nicoll 5f987a67f8 Polish "Improve Spring Batch coverage in reference documentation" 
See gh-19211
 2019-12-23 10:03:34 +01:00
Jay Bryant 6bd9b2ebc6 Improve Spring Batch coverage in reference documentation 
See gh-19211
 2019-12-23 09:27:22 +01:00
Filip Hrisafov bb5c151ee0 Disable SerializationFeature.WRITE_DURATIONS_AS_TIMESTAMPS by default 
See gh-19352
 2019-12-22 08:52:07 +01:00
Stephane Nicoll 2171e7a425 Merge branch '2.1.x' into 2.2.x 
Closes gh-19433
 2019-12-22 08:44:18 +01:00
Tadaya Tsuyukubo 294267d2e0 Fix typo on ConditionMessage 
See gh-19354
 2019-12-22 08:40:43 +01:00
Johnny Lim 0bf359f4a2 Polish 
See gh-19409
 2019-12-21 16:36:06 +01:00
dark 4f99c9f281 Remove unused import statement 
See gh-19410
 2019-12-21 16:33:53 +01:00
Brian Clozel 82391a406a Polish 
See gh-19424
 2019-12-20 21:55:59 +01:00
Ferdinand Jacobs 4555123b7d Fix typo in RSocket docs 
See gh-19424
 2019-12-20 21:50:14 +01:00
Andy Wilkinson ea00ab9919 Protect against NoSuchMethodError when deploying to old Tomcats 
Fixes gh-19308
 2019-12-20 15:53:08 +00:00
Andy Wilkinson 0e6932d550 Merge branch '2.1.x' into 2.2.x 
Closes gh-19419
 2019-12-20 15:41:02 +00:00
Andy Wilkinson 35b74185e4 Fix test ordering problems by always clearing URL stream handler factory 
Closes gh-19349
 2019-12-20 15:36:39 +00:00
Andy Wilkinson 8ed0b1a231 Merge branch '2.1.x' into 2.2.x 
Closes gh-19417
 2019-12-20 15:28:11 +00:00
Andy Wilkinson 3cadde0900 Protect against available port actually being unavailable 
Closes gh-19355
 2019-12-20 15:22:30 +00:00
Brian Clozel 979437398c Merge branch '2.1.x' into 2.2.x 
Closes gh-19403
 2019-12-19 15:23:19 +01:00
Brian Clozel 3e48e36e47 Improve docs on running apps behind proxies 
Fixes gh-15046
 2019-12-19 15:16:13 +01:00
Stephane Nicoll b515d6ba9a Merge pull request #19397 from aklish 
* pr/19397:
  Add Elide as 3rd party Spring Boot Starter

Closes gh-19397
 2019-12-19 13:45:08 +09:00
Aaron Klish 8b149dcea9 Add Elide as 3rd party Spring Boot Starter 
See gh-19397
 2019-12-19 13:44:50 +09:00
Johnny Lim 8bbc7f7b67 Remove duplicate entry for Neo4jHealthIndicator 
See gh-19377
 2019-12-17 09:43:09 +09:00
dreis2211 b6e4c0f012 Add group property to DynatraceProperties 
See gh-19369
 2019-12-15 08:54:42 +09:00
Phillip Webb 6d372f60d9 Merge branch '2.1.x' into 2.2.x 2019-12-13 11:46:25 -08:00
Phillip Webb 8e03982bca Fix checkstyle violation 2019-12-13 11:45:56 -08:00
Phillip Webb 26ff18f37d Merge branch '2.1.x' into 2.2.x 2019-12-13 11:29:51 -08:00
Phillip Webb accd830dd5 Update copyright header of changed files 2019-12-13 11:23:24 -08:00
Phillip Webb 9bdad06c10 Polish Netty SSL key alias support 
See gh-19197
 2019-12-13 11:21:42 -08:00
Stephane Nicoll c3ae8bcfdc Merge branch '2.1.x' into 2.2.x 
Closes gh-19362
 2019-12-12 16:59:21 +01:00
dreis2211 207a5c5022 Link consistently to Tomcat 9.0 docs 
See gh-19340
 2019-12-12 16:58:37 +01:00
Stephane Nicoll fc35384b03 Merge branch '2.1.x' into 2.2.x 
Closes gh-19360
 2019-12-12 16:54:04 +01:00
dreis2211 29b602d6a0 Fix link to Vaadin Spring Boot starter 
See gh-19338
 2019-12-12 16:53:21 +01:00
dreis2211 b1158bf35d Simplify some Stream API usages 
See gh-19291
 2019-12-09 11:52:46 +01:00
Phillip Webb f1c2d36793 Upgrade to Spring Batch 4.2.1 
Closes gh-19073
 2019-12-05 20:16:37 -08:00
Huluvu424242 95d6dff56f Document Nitrite starter in README 
See gh-19196
 2019-12-05 13:30:54 -08:00
Madhura Bhave ed571bab24 Merge branch '2.1.x' into 2.2.x 
Closes gh-19313
 2019-12-05 12:03:50 -08:00
dreis2211 20ff764756 Increase cache ttl in CachingOperationInvokerTests 
See gh-19193
 2019-12-05 11:58:23 -08:00
Andy Wilkinson 9b0569cf81 Merge branch '2.1.x' into 2.2.x 
Closes gh-19309
 2019-12-05 16:15:15 +00:00
Andy Wilkinson bc53fe0344 Recommend mockito-inline for mocking and spying of CGLib proxies 
This reverts commit 52050c173c.

See gh-17817
Closes gh-19020
 2019-12-05 16:13:02 +00:00
Andy Wilkinson 3c0e7ccba6 Merge branch '2.1.x' into 2.2.x 
Closes gh-19304
 2019-12-05 12:53:36 +00:00
Andy Wilkinson effdc8f359 Polish "Honour SSL key alias when using Netty" 
See gh-19197
 2019-12-05 12:48:13 +00:00
cbono eda7b7c3e6 Honour SSL key alias when using Netty 
See gh-19197
 2019-12-05 12:10:04 +00:00
Andy Wilkinson 758b80a0fe Merge branch '2.1.x' into 2.2.x 
Closes gh-19299
 2019-12-05 11:53:55 +00:00
luoyuan c6a184474c Remove redundant hasText check as query always has text 
See gh-19290
 2019-12-05 11:51:35 +00:00
tongluyang 95aad5b556 Add missing closing parenthesis to the document 
See gh-19218
 2019-12-05 11:45:22 +00:00
dreis2211 f190affa6b Upgrade to Testcontainers 1.12.4 
See gh-19292
 2019-12-05 11:37:46 +00:00
Andy Wilkinson 264d4f54ec Merge branch '2.1.x' into 2.2.x 2019-12-05 11:34:36 +00:00
Andy Wilkinson 38340522de Fix Asciidoc syntax 2019-12-05 11:33:58 +00:00
Andy Wilkinson 47b47c28a0 Reduce visibility of the Gradle plugin's test methods 
See gh-19287
 2019-12-05 10:24:48 +00:00
Andy Wilkinson a2451a4f29 Merge branch '2.1.x' into 2.2.x 
Closes gh-19152
 2019-12-05 10:06:32 +00:00
Andy Wilkinson b46bb726ca Clarify limitations of @PropertySource 
Closes gh-18900
 2019-12-05 10:05:50 +00:00
Madhura Bhave 2c4a1f1c15 Display @Validated constructor bound properties in configprops endpoint 
Fixes gh-19219
 2019-12-04 14:41:34 -08:00
Andy Wilkinson 05d460a974 Upgrade to Spring Integration 5.2.2.RELEASE 
Closes gh-19070
 2019-12-04 19:55:33 +00:00
Andy Wilkinson 2ab5089338 Upgrade to Spring Cloud Connectors 2.0.7.RELEASE 
Closes gh-19247
 2019-12-04 19:48:38 +00:00
Andy Wilkinson 89fbdb9fc0 Upgrade to Neo4j Ogm 3.2.3 
Closes gh-19246
 2019-12-04 19:48:36 +00:00
Andy Wilkinson fc2bb1d3ef Upgrade to Jetty El 8.5.49 
Closes gh-19245
 2019-12-04 19:48:35 +00:00
Andy Wilkinson 4cc1c6eb19 Upgrade to Liquibase 3.8.2 
Closes gh-19244
 2019-12-04 19:48:33 +00:00
Andy Wilkinson 197350c21e Upgrade to Kotlin 1.3.61 
Closes gh-19243
 2019-12-04 19:48:31 +00:00
Andy Wilkinson d3b3ee6a6a Upgrade to Aspectj 1.9.5 
Closes gh-19242
 2019-12-04 19:48:30 +00:00
Andy Wilkinson a8463ff538 Upgrade to Activemq 5.15.11 
Closes gh-19241
 2019-12-04 19:48:28 +00:00
Andy Wilkinson 0071e2be3f Upgrade to Byte Buddy 1.10.4 
Closes gh-19240
 2019-12-04 19:48:27 +00:00
Andy Wilkinson 255eb498c4 Upgrade to Netty Tcnative 2.0.28.Final 
Closes gh-19239
 2019-12-04 19:48:25 +00:00
Andy Wilkinson d2c5d971f2 Upgrade to Unboundid Ldapsdk 4.0.13 
Closes gh-19238
 2019-12-04 19:48:24 +00:00
Andy Wilkinson ca7ef3daec Upgrade to Couchbase Client 2.7.11 
Closes gh-19237
 2019-12-04 19:48:22 +00:00
Andy Wilkinson 3d35efb485 Upgrade to Spring Batch 4.1.3.RELEASE 
Closes gh-19072
 2019-12-04 17:57:45 +00:00
Andy Wilkinson 6a0ec7e1f4 Upgrade to Spring Data Lovelace-SR14 
Closes gh-19068
 2019-12-04 17:57:03 +00:00
Andy Wilkinson 72d3137941 Upgrade to Spring Cloud Connectors 2.0.7.RELEASE 
Closes gh-19234
 2019-12-04 17:55:29 +00:00
Andy Wilkinson 66639702be Upgrade to Jetty El 8.5.49 
Closes gh-19233
 2019-12-04 17:55:28 +00:00
Andy Wilkinson ff1d2ea381 Upgrade to Aspectj 1.9.5 
Closes gh-19232
 2019-12-04 17:55:27 +00:00
Andy Wilkinson 7ea088e5fb Upgrade to Activemq 5.15.11 
Closes gh-19231
 2019-12-04 17:55:26 +00:00
Andy Wilkinson cf80ad46e4 Upgrade to Netty Tcnative 2.0.28.Final 
Closes gh-19230
 2019-12-04 17:55:24 +00:00
Andy Wilkinson a2b06bbf45 Upgrade to Micrometer 1.1.9 
Closes gh-19229
 2019-12-04 17:55:23 +00:00
Andy Wilkinson 677f2bc80c Upgrade to Unboundid Ldapsdk 4.0.13 
Closes gh-19228
 2019-12-04 17:55:22 +00:00
Andy Wilkinson f451145d03 Upgrade to Couchbase Client 2.7.11 
Closes gh-19227
 2019-12-04 17:55:21 +00:00
Andy Wilkinson 278b5fcc7d Upgrade to Spring Hateoas 1.0.2.RELEASE 
Closes gh-19223
 2019-12-04 17:50:05 +00:00
Andy Wilkinson e6567a2410 Upgrade to Spring Amqp 2.2.2.RELEASE 
Closes gh-19222
 2019-12-04 17:50:04 +00:00
Andy Wilkinson bfb4c86801 Upgrade to Spring Data Moore-SR3 
Closes gh-19069
 2019-12-04 17:48:27 +00:00
Andy Wilkinson 4910ace6e5 Upgrade to Spring Kafka 2.3.4.RELEASE 
Closes gh-19071
 2019-12-04 17:48:24 +00:00
Madhura Bhave 68bc82cfc2 Ignore CannotLoadBeanClassException in config props validator 
If the bean definition type contains a placeholder value, beanFactory.getType
can throw a CannotLoadBeanClassException. We can ignore this exception while
validating the bean definitions for constructor binding beans.

Fixes gh-19207
 2019-12-03 18:21:53 -08:00
Madhura Bhave f4db8c89d4 Use generic type when binding constructor parameters 
Fixes gh-19156
 2019-12-03 09:29:51 -08:00
Brian Clozel 116699e295 Upgrade to Spring Framework 5.1.12.RELEASE 
Closes gh-19051
 2019-12-03 15:53:56 +01:00
Brian Clozel 3f798db9ed Upgrade to Spring Framework 5.2.2.RELEASE 
Closes gh-19053
 2019-12-03 12:09:40 +01:00
Madhura Bhave 5b461843db Merge branch '2.1.x' into 2.2.x 
Closes gh-19209
 2019-12-02 10:36:22 -08:00
Madhura Bhave fcc790aa15 Document how properties are applied in JPA auto-config 
Closes gh-15361
 2019-12-02 10:34:54 -08:00
Andy Wilkinson 189f74220c Merge branch '2.1.x' into 2.2.x 
Closes gh-19190
 2019-11-29 09:52:17 +00:00
Andy Wilkinson e8eace2d5b Polish "Fix Liquibase endpoint's output with multiple datasources" 
See gh-19171
 2019-11-29 09:50:48 +00:00
Leo Li 5302d91930 Fix Liquibase endpoint's output with multiple datasources 
Previously, the endpoint used the same change log history service for
for each SpringLiquibase bean that it processed. This resulted in
pollution of the reported changes as the history of each bean was not
isolated.

This commit updates the endpoint to use a new history service for each
SpringLiquibase bean that is processed.

See gh-19171
 2019-11-29 09:50:43 +00:00
dreis2211 aea37b5d81 Fix deprecation info in CompositeHealthIndicatorConfiguration 
See gh-19180
 2019-11-28 16:50:46 +01:00
Stephane Nicoll e02ccd16bb Merge branch '2.1.x' into 2.2.x 
Closes gh-19177
 2019-11-28 10:58:55 +01:00
Johnny Lim 3df9fa6228 Add missing indentations for pom.xml in doc 
See gh-19170
 2019-11-28 10:57:20 +01:00
Stephane Nicoll d8d7129f9d Upgrade to Reactor Dysprosium-SR2 
Closes gh-19077
 2019-11-27 18:39:38 +01:00
Stephane Nicoll e394772864 Upgrade to Reactor Californium-SR14 
Closes gh-19052
 2019-11-27 18:37:47 +01:00
Andy Wilkinson 76f03a8cad Fix reflective access to archiveBaseName property 
Previously, reflective access to the archiveBaseName property
incorrectly treated the property as a String. It should have been
treated as a Property<String>. This caused an exception to be thrown
and the deprecated baseName property to be used as a fallback.

This commit corrects the reflective access to the archiveBaseName
property. It also updates the tests to fail if a build outputs a
deprecation warning. Tests that use Gradle's Maven plugin have been
updated to expect deprecation warnings when run with Gradle 6.0 where
the plugin is deprecated. Tests that configure an archive's base name
have been updated to use archiveBaseName when running with Gradle 6.0
and later.

Closes gh-18663
 2019-11-27 12:52:05 +00:00
Johnny Lim f234d9c0ec Remove ConditionEvaluationReportLoggingListener usage if possible 
See gh-19159
 2019-11-27 13:49:27 +01:00
Stephane Nicoll ce16c9e945 Merge branch '2.1.x' into 2.2.x 
Closes gh-19157
 2019-11-27 11:47:23 +01:00
Stephane Nicoll 2356462587 Polish "Remove '.' and '-' reference in the EndpointId javadoc" 
See gh-19101
 2019-11-27 11:45:35 +01:00
Lars Grefer 58e599b6c1 Remove '.' and '-' reference in the EndpointId javadoc 
Endpoint ID's which contain '-' or '.' cause a deprecation warning.
Therefore they shouldn't be doumented as valid characters.

See gh-19101
 2019-11-27 11:44:13 +01:00
Andy Wilkinson f2bd27f4a3 Merge branch '2.1.x' into 2.2.x 
See gh-19150
 2019-11-27 09:56:41 +00:00
Andy Wilkinson f117dbe8a1 Add metadata for spring.main.log-startup.info 
See gh-19026
 2019-11-27 09:55:06 +00:00
Stephane Nicoll abe070051e Merge branch '2.1.x' into 2.2.x 
Closes gh-19154
 2019-11-27 09:53:32 +01:00
dreis2211 87caa0a331 Add missing health indicators to docs 
See gh-19149
 2019-11-27 09:52:15 +01:00
Madhura Bhave c10c9934dd Merge branch '2.1.x' into 2.2.x 
Closes gh-19152
 2019-11-26 17:36:48 -08:00
Madhura Bhave 53da8da50a Clarify contradictory advice on the use of `@PropertySource` 
In general we do not recommend using @PropertySource due to them being
added to the environment too late for auto-configuration to use them. This
commit updates the documentation to mention them in the list of external
sources along with a note.

Closes gh-18900
 2019-11-26 17:35:44 -08:00
Madhura Bhave d52935e103 Merge branch '2.1.x' into 2.2.x 
Closes gh-19150
 2019-11-26 15:30:29 -08:00
Madhura Bhave 49e111aef5 Document logging of startup info 
Closes gh-19026
 2019-11-26 15:29:59 -08:00
Madhura Bhave 51478cabcd Fix typo 2019-11-26 13:18:54 -08:00
Stephane Nicoll 75e8b49153 Upgrade to Maven Enforcer Plugin 3.0.0-M3 
Closes gh-19140
 2019-11-25 16:18:29 +01:00
Stephane Nicoll c4a646867e Upgrade to Liquibase 3.8.1 
Closes gh-19139
 2019-11-25 16:18:27 +01:00
Stephane Nicoll d746b7a47a Upgrade to Hibernate 5.4.9.Final 
Closes gh-19138
 2019-11-25 16:18:26 +01:00
Stephane Nicoll 2b0570ff10 Upgrade to Jaybird 3.0.8 
Closes gh-19137
 2019-11-25 16:18:24 +01:00
Stephane Nicoll 7a77474e89 Upgrade to Elasticsearch 6.8.5 
Closes gh-19136
 2019-11-25 16:18:23 +01:00
Stephane Nicoll 198879007b Upgrade to Jetty 9.4.24.v20191120 
Closes gh-19135
 2019-11-25 16:18:21 +01:00
Stephane Nicoll 5950cdda10 Upgrade to Tomcat 9.0.29 
Closes gh-19134
 2019-11-25 16:18:20 +01:00
Stephane Nicoll 93dd6e69a8 Upgrade to Johnzon Jsonb 1.2.2 
Closes gh-19133
 2019-11-25 16:18:18 +01:00
Stephane Nicoll 2a1cab4fad Upgrade to Byte Buddy 1.10.3 
Closes gh-19132
 2019-11-25 16:18:16 +01:00
Stephane Nicoll 7acb9f3c95 Upgrade to Undertow 2.0.28.Final 
Closes gh-19131
 2019-11-25 16:18:15 +01:00
Stephane Nicoll 0601aad5a7 Upgrade to Rxjava2 2.2.15 
Closes gh-19130
 2019-11-25 16:18:14 +01:00
Stephane Nicoll f7054d4a24 Upgrade to Netty Tcnative 2.0.27.Final 
Closes gh-19129
 2019-11-25 16:18:13 +01:00
Stephane Nicoll ddbd8c7eb5 Upgrade to Querydsl 4.2.2 
Closes gh-19128
 2019-11-25 16:18:11 +01:00
Stephane Nicoll cc29054c0b Upgrade to Appengine Sdk 1.9.77 
Closes gh-19127
 2019-11-25 16:18:10 +01:00
Stephane Nicoll 7374895507 Upgrade to Jackson 2.10.1 
Closes gh-19126
 2019-11-25 16:18:09 +01:00
Stephane Nicoll 901b8dab14 Upgrade to Couchbase Client 2.7.10 
Closes gh-19125
 2019-11-25 16:18:07 +01:00
Stephane Nicoll 01e0a27159 Upgrade to Maven Enforcer Plugin 3.0.0-M3 
Closes gh-19124
 2019-11-25 15:32:42 +01:00
Stephane Nicoll a1884d2c10 Upgrade to Hibernate 5.3.14.Final 
Closes gh-19123
 2019-11-25 15:32:40 +01:00
Stephane Nicoll 90acbb124a Upgrade to Jaybird 3.0.8 
Closes gh-19122
 2019-11-25 15:32:39 +01:00
Stephane Nicoll f83b08eb59 Upgrade to Jetty 9.4.24.v20191120 
Closes gh-19121
 2019-11-25 15:32:38 +01:00
Stephane Nicoll f64c6fc0c3 Upgrade to Tomcat 9.0.29 
Closes gh-19120
 2019-11-25 15:32:37 +01:00
Stephane Nicoll 4a76787c60 Upgrade to Undertow 2.0.28.Final 
Closes gh-19119
 2019-11-25 15:32:35 +01:00
Stephane Nicoll 1387067208 Upgrade to Rxjava2 2.2.15 
Closes gh-19118
 2019-11-25 15:32:33 +01:00
Stephane Nicoll ab6d163f73 Upgrade to Netty Tcnative 2.0.27.Final 
Closes gh-19117
 2019-11-25 15:32:32 +01:00
Stephane Nicoll 4868124371 Upgrade to Querydsl 4.2.2 
Closes gh-19116
 2019-11-25 15:32:31 +01:00
Stephane Nicoll 3a86a6922c Upgrade to Appengine Sdk 1.9.77 
Closes gh-19115
 2019-11-25 15:32:29 +01:00
Stephane Nicoll 49433ccef1 Upgrade to Couchbase Client 2.7.10 
Closes gh-19114
 2019-11-25 15:32:28 +01:00
Stephane Nicoll a4ca1d02b3 Merge branch '2.1.x' into 2.2.x 
Closes gh-19112
 2019-11-25 13:59:45 +01:00
Stephane Nicoll 5d8fe860d7 Polish "Use ssl.enabled flag when RabbitMQ address has no protocol" 
There is a direct link between the sslEnabled flag and the default port
that should be used by an address. The checks are currently set in two
places:

* Determine which port should be used
* Determine if SSL should be enabled

This commit polishes the initial proposal so that secureConnection is
only set if a protocol is available.

See gh-19109
 2019-11-25 13:52:27 +01:00
cbono 2210236f82 Use ssl.enabled flag when RabbitMQ address has no protocol 
See gh-19109
 2019-11-25 11:16:56 +01:00
thelproad 65ab82b3cd Remove redundant code 
See gh-19000
 2019-11-23 12:01:19 +01:00
Brian Clozel 0c5bb60384 Fix responseCommitted test in webflux error handling 
This commit updates the `responseCommitted` after changes were made in
`WebTestClient` with spring-projects/spring-framework#24051.

Fixes gh-19083
 2019-11-22 20:58:38 +01:00
Stephane Nicoll 58bfbb92b9 Merge branch '2.1.x' into 2.2.x 
Closes gh-19091
 2019-11-21 14:38:09 +01:00
Adam Michalik c154a014a1 Remove invalid example of spring.mvc.async.request-timout property 
See gh-19057
 2019-11-21 14:13:22 +01:00
dreis2211 0bdcd2ee67 Handle ApiVersion in CachingOperationInvoker 
Prior to this commit, ApiVersion was treated as a mandatory parameter in
CachingOperationInvokerAdvisor and thus prevented the
CachingOperationInvoker to kick in. By skipping ApiVersion in the same
way we're skipping SecurityContext we can avoid this.

In order to not return the same cached response, this commit also
changes the cache handling in CachingOperationInvoker to account for
different ApiVersions being passed.

See gh-18961
 2019-11-21 13:46:49 +01:00
dreis2211 347434ba81 Test the Gradle Plugin against Gradle 6.0.1 
See gh-19065
 2019-11-21 13:44:55 +01:00
Stephane Nicoll d8c64abdbb Merge branch '2.1.x' into 2.2.x 
Closes gh-19086
 2019-11-21 13:42:32 +01:00
Stephane Nicoll b23a3712c6 Polish "Fix logging in CloudFoundryVcapEnvironmentPostProcessor" 
See gh-19027
 2019-11-21 13:41:47 +01:00
Mark Bigler f1489e41ec Fix logging in CloudFoundryVcapEnvironmentPostProcessor 
See gh-19027
 2019-11-21 13:35:50 +01:00
Brian Clozel 9fe721d75c Temporarily ignore failing error web handler test 
See gh-19083
 2019-11-21 11:07:23 +01:00
Madhura Bhave 8ec3ca74e1 Fix loading of devtools yaml files 
Fixes gh-19081
 2019-11-20 17:30:26 -08:00
Stephane Nicoll 9c4136898d Start building against Spring Data Moore-SR3 snapshots 
See gh-19069
 2019-11-20 11:49:06 +01:00
Stephane Nicoll 511c75cbe8 Start building against Spring Framework 5.2.2 snapshots 
See gh-19053
 2019-11-20 11:48:32 +01:00
Stephane Nicoll 13f4e8a591 Start building against Reactor Dysprosium-SR2 snapshots 
See gh-19054
 2019-11-20 11:48:26 +01:00
Stephane Nicoll 3c3614d8ef Start building against Spring Batch 4.1.3 snapshots 
See gh-19072
 2019-11-20 11:20:48 +01:00
Stephane Nicoll 6fa5f0c1d0 Start building against Spring Data Lovelace-SR14 snapshots 
See gh-19068
 2019-11-20 11:05:09 +01:00
Stephane Nicoll 80eaa16b0d Start building against Spring Framework 5.1.12 snapshots 
See gh-19051
 2019-11-20 11:04:27 +01:00
Stephane Nicoll 586a5d2c14 Start building against Reactor Californium-SR14 snapshots 
See gh-19068
 2019-11-20 11:03:18 +01:00
Madhura Bhave 6e22ddc1a6 Merge branch '2.1.x' into 2.2.x 2019-11-19 12:09:49 -08:00
Madhura Bhave 849a76c6c2 Polish 2019-11-19 12:07:05 -08:00
Madhura Bhave ff22bd4827 Merge branch '2.1.x' into 2.2.x 
Closes gh-19059
 2019-11-19 11:52:26 -08:00
Madhura Bhave a3a53d299f Check authorities when exposing health details 
Fixes gh-18998
 2019-11-19 11:18:07 -08:00
Stephane Nicoll a003a5c8ab Upgrade to Kotlin 1.3.60 
Closes gh-19046
 2019-11-19 17:56:40 +01:00
Stephane Nicoll 3d418263bc Merge branch '2.1.x' into 2.2.x 
Closes gh-19032
 2019-11-16 09:40:32 +03:00
dreis2211 355505d236 Fix syntax error in configuration metadata sample in docs 
See gh-19028
 2019-11-16 09:39:46 +03:00
Stephane Nicoll b842f16848 Polish "Use caps in docker file example for consistency" 
See gh-19029
 2019-11-16 09:36:48 +03:00
Dave Syer b95e8a4df6 Use caps in docker file example for consistency 
See gh-19029
 2019-11-16 09:36:12 +03:00
Madhura Bhave b6ff0b7c5f Support constructor binding on 3rd party classes 
Closes gh-18935
 2019-11-13 14:28:58 -08:00
Stephane Nicoll d08b436735 Polish "Improve Deploying to Containers section" 
See gh-18932
 2019-11-13 13:36:00 +01:00
Guillaume Lours 6cf05aeb50 Improve Deploying to Containers section 
See gh-18932
 2019-11-13 13:19:10 +01:00
Johnny Lim 96a029e44f Polish a test name 
See gh-18999
 2019-11-13 08:52:32 +01:00
Johnny Lim ddb22f5a52 Polish test methods 
See gh-18962
 2019-11-12 14:09:44 +01:00
dreis2211 6b500d82b4 Polish 
See gh-18918
 2019-11-12 14:06:47 +01:00
Stephane Nicoll 51487c7c45 Merge branch '2.1.x' into 2.2.x 2019-11-12 14:04:47 +01:00
Stephane Nicoll cad2365237 Polish 2019-11-12 14:03:39 +01:00
Andy Wilkinson 379ba0dc00 Support Gradle 6.0 
Previously, our Gradle plugin was not tested against Gradle 6.0,
a number of deprecation warnings were output when using the plugin
with Gradle 6, and some functionality related to the application
plugin did not work as expected.

This commit tests the plugin against Gradle 6. It also avoids calling
deprecated APIs. The plugin is compatibile against Gradle 4.10 where
the deprecated APIs' replacements are not available so reflection is
used to call the replcaements. Lastly, the way in which the base name
of the boot distribution that is created when the application plugin
is applied has been modified to ensure that it is effective when using
Gradle 6.

Closes gh-18663
 2019-11-11 16:36:40 +00:00
Madhura Bhave f9dc81558a Remove samples references from docs 
Fixes gh-18904
 2019-11-08 14:56:52 -08:00
Andy Wilkinson e715a5f689 Merge branch '2.1.x' into 2.2.x 
Closes gh-18943
 2019-11-08 15:01:19 +00:00
Andy Wilkinson 3f0367e2dd Apply changes recommended by Jetty team to JettyEmbeddedErrorHandler 
Closes gh-18842
 2019-11-08 14:57:46 +00:00
Andy Wilkinson fc3f6a930d Merge branch '2.1.x' into 2.2.x 
Closes gh-18940
 2019-11-08 13:32:49 +00:00
Andy Wilkinson 5765cfe010 Allow 5 seconds for child to handle SIGINT before destroying it 
Previously, when RunProcess handled a SIGINT it would immediately
attempt to destroy the process that it had run. This created a race
condition between the SIGINT being handled by the child process
and RunProcess destroying the child. The exact behavior of destroy
is implementation dependent and it may result in forcible termination
of the process where shutdown hooks are not called. This is what
happens on Windows. The exit code in such a case is 1 which prevents
anything from waiting for the process to complete from detecting
that it ended as a result of a SIGINT, leaving it with no choice but
to report an error. This is what happens with mvn spring-boot:run
with a forked process on Windows and results in the build failing.

This commit updates RunProcess to allow the child process to handle
the SIGINT itself, waiting for up to five seconds for that to happen
before the process is then destroyed. Given this time, the child
process exits with 130 which RunMojo already handles correctly as
indicating that the process died due to SIGINT and the build completes
with success as a result.

Fixes gh-18936
 2019-11-08 12:41:13 +00:00
Stephane Nicoll 08067fb816 Polish "Remove reference to ConfigurationPropertiesScan in javadoc" 
See gh-18920
 2019-11-08 11:10:14 +01:00
wonwoo 92b00255a1 Remove reference to ConfigurationPropertiesScan in javadoc 
See gh-18920
 2019-11-08 11:09:57 +01:00
Andy Wilkinson 0a8a0daff8 Merge branch '2.1.x' 
Closes gh-18913
 2019-11-07 09:56:49 +00:00
Andy Wilkinson a11661d284 Trim whitespace in BasicJsonParser 
Previously, whitespace in between the keys and values in the JSON was
not trimmed correctly in BasicJsonParser which lead to it incorrectly
parsing JSON with whitespace between the opening of a list ([) and the
opening of a map ({).

This commit updates the parser to trim unwanted whitespace and adds a
test to AbstractJsonParserTests to verify the whitespace handling
behaviour across all JsonParser implementations.

Closes gh-18911
 2019-11-07 09:56:00 +00:00
Andy Wilkinson dd4377e69c Merge branch '2.1.x' 
Closes gh-18912
 2019-11-07 09:33:11 +00:00
Andy Wilkinson d1ead884c4 Fix @ServletComponentScan with a component index 
Previously @ServletComponentScan did not work when there was a
component index on the classpath as it made an assumption about
the concrete type of the BeanDefinitions produced by scanning that
does not hold true when an index is present.

This commit updates the scanning and the handlers to correct the
assumpution by working with a bean definition type that is produced
by scanning both when there is and when there is not an index present.

To prevent the problem from reoccuring, a test that uses and index
has been added and the import of ScannedGenericBeanDefinition is now
prohibited by Checkstyle.

Closes gh-18910
 2019-11-07 09:20:19 +00:00
Stephane Nicoll 86a1c96224 Make sure health endpoint is available with no contributor 
This commit makes sure that the health endpoint returns a default health
status when no contributors are available. Previously, it was returning
`null` which leads to a 404 when exposed via HTTP.

Closes gh-18676
 2019-11-06 12:46:47 +01:00
Stephane Nicoll 684d7cfe38 Upgrade to Mongodb 3.11.2 
Closes gh-18898
 2019-11-06 09:44:38 +01:00
Stephane Nicoll c413e5b54e Upgrade to Hazelcast 3.11.5 
Closes gh-18897
 2019-11-06 09:40:11 +01:00
Johnny Lim ea51947741 Use try-with-resources blocks in JarFileArchiveTests 
See gh-18883
 2019-11-06 08:01:50 +01:00
Madhura Bhave 471ca01ccf Do not validate value object bean definion when singleton present 
Prior to this commit constructor bound configuration properties could
not be mocked because it would fail validation from
ConfigurationPropertiesBeanDefinitionValidator. The MockitoPostProcessor
registers the mocked bean as a singleton and validation can be skipped if a
singleton for the type is found in the bean factory.

Fixes gh-18652
 2019-11-05 21:54:16 -08:00
Madhura Bhave f9785d2bda Fix constructor binding issues 
This commit fixes a few bugs related to constructor binding.
The ContructorFilter on the Bindable has been replaced with a
Binder level BinderConstructorProvider so that it can be used to
determine the constructor to use for nested properties as well.

Fixes gh-18810
Fixes gh-18670
Closes gh-18685
Closes gh-18894

Co-authored-by: Phillip Webb <pwebb@pivotal.io>
 2019-11-05 14:44:31 -08:00
Phillip Webb 90e1046d53 Upgrade to Spring Kafka 2.3.3.RELEASE 
Closes gh-18892
 2019-11-05 10:17:55 -08:00
Andy Wilkinson f1af8c5510 Merge branch '2.1.x' 
Closes gh-18889
 2019-11-05 15:50:51 +00:00
Andy Wilkinson 59bc3c5602 Prevent recursive config props from causing a stack overflow 
Previously, when the configuration properties annotation processor
encountered a property that was the same as an outer type that had
already been processed, it would fail with a stack overflow error.

This commit introduces the use of a stack to track the types that
have been processed. Types that have been seen before are skipped,
thereby preventing a failure from occurring. We do not fail upon
encountering a recursive type to allow metadata generation to
complete. At runtime, the recursive property will not cause a problem
if it is not bound.

Fixes gh-18365
 2019-11-05 15:35:11 +00:00
Andy Wilkinson d8545bdead Merge branch '2.1.x' 
Closes gh-18887
 2019-11-05 14:23:11 +00:00
Andy Wilkinson 8b62f448ba Improve documentation on using Jersey alongside Spring MVC 
Previously, the documentation did not provide any guidance on using
Jersey alongside Spring MVC or any other web framework.

This improves the documentation in two ways:

1. It notes that, in the presence of both Jersey and Spring MVC, the
   Actuator will prefer Spring MVC for exposing HTTP endpoints.
2. It adds a how-to describing how to configure Jersey to forward
   requests for which it has no handler on to the rest of the filter
   chain. When Spring MVC is the other framework, this allows them to
   be handled by its dispatcher servlet.

Closes gh-17523
 2019-11-05 14:21:34 +00:00
Andy Wilkinson 571e4640de Merge branch '2.1.x' 
Closes gh-18877
 2019-11-05 13:26:45 +00:00
Andy Wilkinson bd06a91ac0 Recommend more overrides when using starter parent 
This commit is a continuation of the work done in 987a5f81. In
addition to developers and licenses that are covered in the earlier
commit, a number of other settings are still inherited from the
starter parent. This commit updates the documentation to show them
being overridden as well.

Closes gh-18532
 2019-11-05 13:25:53 +00:00
Stephane Nicoll d331f28222 Merge branch '2.1.x' 
Closes gh-18885
 2019-11-05 14:17:35 +01:00
dreis2211 1b2112ea8c Reduce method visibility in EndpointDiscovererTests 
See gh-18884
 2019-11-05 14:14:24 +01:00
Stephane Nicoll 4d1373c94d Polish "Support amqps:// URIs in spring.rabbitmq.addresses" 
See gh-18808
 2019-11-05 14:07:24 +01:00
Mark Pollack 0fedb24c6f Support amqps:// URIs in spring.rabbitmq.addresses 
See gh-18808

Co-Authored-By: Bryan Kelly <xyloman@gmail.com>
 2019-11-05 14:07:24 +01:00