67fab60fbd
Merge branch '2.1.x' into 2.2.x
...
Closes gh-19560
2020-01-07 13:33:32 -08:00
6d6bbfb731
Merge pull request #19556 from scottfrederick
...
* pr/19556:
Add profiles directly to the application environment for tests
Closes gh-19556
2020-01-07 13:23:41 -08:00
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
c57359ea3b
Merge branch '2.1.x' into 2.2.x
...
Closes gh-19553
2020-01-07 12:05:21 +00:00
d46406fcb9
Remove loading of non-existent properties file from antlib
...
Fixes gh-19552
2020-01-07 12:04:59 +00:00
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
6a7e3c55b8
Merge pull request #19536 from dreis2211
...
* pr/19536:
Remove deprecated usage of WebTestClientBuilderCustomizer
Closes gh-19536
2020-01-06 13:01:56 +01:00
6ffe47cd06
Remove deprecated usage of WebTestClientBuilderCustomizer
...
See gh-19536
2020-01-06 12:59:12 +01:00
620f5801a2
Merge pull request #19521 from rstoyanchev
...
* pr/19521:
Improve Spring MVC auto-configuration section
Closes gh-19521
2020-01-04 11:40:40 +01:00
f6947648c9
Improve Spring MVC auto-configuration section
...
See gh-19521
2020-01-04 11:37:01 +01:00
58a805e607
Merge branch '2.1.x' into 2.2.x
...
Closes gh-19532
2020-01-04 11:34:25 +01:00
cb40454977
Merge pull request #19523 from dreis2211
...
* pr/19523:
Upgrade CI to Artifactory Resource 0.0.10
Closes gh-19523
2020-01-04 11:32:42 +01:00
48032acd04
Upgrade CI to Artifactory Resource 0.0.10
...
See gh-19523
2020-01-04 11:31:36 +01:00
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
8e285a4387
Fix checkstyle
2020-01-03 11:42:14 -08:00
ac46f5971f
Merge branch '2.1.x' into 2.2.x
...
Closes gh-19526
2020-01-03 11:19:21 -08:00
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
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
fd4829c2ea
Merge branch '2.1.x' into 2.2.x
...
Closes gh-19515
2020-01-03 09:39:42 +01:00
8ddcb9314e
Merge pull request #19510 from dreis2211
...
* pr/19510:
Update some copyrights to 2020
Closes gh-19510
2020-01-03 09:38:10 +01:00
9cbf5902dc
Update some copyrights to 2020
...
See gh-19510
2020-01-03 09:37:22 +01:00
727870d9c9
Merge pull request #19508 from ge0ffrey
...
* pr/19508:
Add reference to OptaPlanner starter
Closes gh-19508
2020-01-02 13:18:30 +01:00
493762a416
Add reference to OptaPlanner starter
...
See gh-19508
2020-01-02 13:18:07 +01:00
66eb2a414f
Merge pull request #19503 from ochiengolanga
...
* pr/19503:
Polish "Fix outdated reference in ArtemisConfigurationCustomizer javadoc"
Fix outdated reference in ArtemisConfigurationCustomizer javadoc
Closes gh-19503
2020-01-01 13:12:46 +01:00
7d36599343
Polish "Fix outdated reference in ArtemisConfigurationCustomizer javadoc"
...
See gh-19503
2020-01-01 13:11:39 +01:00
c6f7d12270
Fix outdated reference in ArtemisConfigurationCustomizer javadoc
...
See gh-19503
2020-01-01 13:10:34 +01:00
a684ab8726
Merge branch '2.1.x' into 2.2.x
...
Closes gh-19498
2019-12-31 10:07:32 +01:00
9dd3912a64
Merge pull request #19491 from izeye
...
* pr/19491:
Polish doc
Closes gh-19491
2019-12-31 10:07:17 +01:00
27d7727d9f
Polish doc
...
See gh-19491
2019-12-31 10:06:58 +01:00
1de30f0d00
Polish
2019-12-31 09:40:04 +01:00
b7e6febaa0
Merge branch '2.1.x' into 2.2.x
...
Closes gh-19496
2019-12-31 09:36:05 +01:00
eee1b1a98f
Merge pull request #19492 from gZack
...
* pr/19492:
Fix typo in BindHandler#onFinish javadoc
Closes gh-19492
2019-12-31 09:35:47 +01:00
f005fffbc3
Fix typo in BindHandler#onFinish javadoc
...
See gh-19492
2019-12-31 09:34:45 +01:00
07a21ec601
Harmonize property visibility in Saml2RelyingPartyProperties
...
Closes gh-19194
2019-12-30 16:53:23 +01:00
36bf05dde7
Merge branch '2.1.x' into 2.2.x
...
Closes gh-19479
2019-12-29 10:41:03 +01:00
4f237ccda6
Upgrade to nohttp 0.0.4.RELEASE
...
Closes gh-19478
2019-12-29 10:36:07 +01:00
85667ba165
Merge branch '2.1.x' into 2.2.x
...
See gh-19473
2019-12-28 10:52:01 +01:00
c0f1aaebb6
Fix Tomcat's maxConnections default value
...
Closes gh-19472
2019-12-28 10:51:42 +01:00
6ea522a90a
Merge branch '2.1.x' into 2.2.x
...
Closes gh-19473
2019-12-28 10:02:07 +01:00
d75efad0de
Upgrade to Tomcat 9.0.30
...
Closes gh-19472
2019-12-28 09:58:09 +01:00
83e594ad6a
Merge pull request #18711 from nosan
...
* pr/18711:
Polish contribution
Support commas embedded in command line arguments from Maven plugin
Closes gh-18711
2019-12-26 11:18:44 +01:00
6c016663fd
Polish contribution
...
See gh-18711
2019-12-26 11:17:51 +01:00
1fb904acee
Support commas embedded in command line arguments from Maven plugin
...
See gh-18711
2019-12-26 11:05:09 +01:00
b268b57339
Merge pull request #19458 from gintellect79
...
* pr/19458:
Polish contribution
Fix file rotation documentation according to maxHistory new default
Closes gh-19458
2019-12-25 08:32:03 +01:00
4969ecc59a
Polish contribution
...
See gh-19458
2019-12-25 08:31:50 +01:00
582a3b472d
Fix file rotation documentation according to maxHistory new default
...
See gh-19458
2019-12-25 08:27:56 +01:00
ee98855905
Merge branch '2.1.x' into 2.2.x
...
Closes gh-19453
2019-12-24 10:59:58 +01:00
5dc6491807
Clarify documentation of repackage mojo's attach property
...
Closes gh-19021
2019-12-24 10:59:36 +01:00
1a8a76082b
Merge branch '2.1.x' into 2.2.x
...
Closes gh-19451
2019-12-24 10:46:46 +01:00
2db2daeddf
Clarify which part of @ConfigurationProperties is internal API
...
Closes gh-19199
2019-12-24 10:46:01 +01:00
Madhura Bhave
Scott Frederick
Andy Wilkinson
Brian Clozel
Stephane Nicoll
dreis2211
Rossen Stoyanchev
Geoffrey De Smet
Ochieng Olanga
Johnny Lim
Zekariyas
Dmytro Nosan
Girish Kulkarni