Commit Graph

7514 Commits

Author SHA1 Message Date
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