Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
24,445 Commits 23 Branches 0 Tags
84dfb3eae91d58963931fb9592ca7f9017fbd376
Commit Graph

24445 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephane Nicoll
84dfb3eae9 Merge branch '2.2.x' 
Closes gh-19533
 2020-01-04 11:35:17 +01:00
Stephane Nicoll
58a805e607 Merge branch '2.1.x' into 2.2.x 
Closes gh-19532
 2020-01-04 11:34:25 +01:00
Stephane Nicoll
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
dreis2211
48032acd04 Upgrade CI to Artifactory Resource 0.0.10 
See gh-19523
 2020-01-04 11:31:36 +01:00
Madhura Bhave
bb55bad170 Merge branch '2.2.x' 
Closes gh-19529
 2020-01-03 14:27:31 -08: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
f94c6d7458 Merge branch '2.2.x' 2020-01-03 11:42:42 -08:00
Madhura Bhave
8e285a4387 Fix checkstyle 2020-01-03 11:42:14 -08:00
Madhura Bhave
743cf3b2a7 Merge branch '2.2.x' 
Closes gh-19527
 2020-01-03 11:21:50 -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
cc154bbefb 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-19522
 2020-01-03 14:51:53 +01:00
Brian Clozel
c2f8741e2e Merge branch '2.2.x' 
Closes gh-19517
 2020-01-03 09:46:43 +01: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
76a48885f8 Merge branch '2.2.x' 
Closes gh-19516
 2020-01-03 09:40:11 +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
Stephane Nicoll
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
dreis2211
9cbf5902dc Update some copyrights to 2020 
See gh-19510
 2020-01-03 09:37:22 +01:00
Stephane Nicoll
679e88af47 Merge branch '2.2.x' 
Closes gh-19509
 2020-01-02 13:18:39 +01:00
Stephane Nicoll
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
Geoffrey De Smet
493762a416 Add reference to OptaPlanner starter 
See gh-19508
 2020-01-02 13:18:07 +01:00
Stephane Nicoll
c3ab4b875a Merge branch '2.2.x' 
Closes gh-19504
 2020-01-01 13:13:06 +01:00
Stephane Nicoll
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
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
6fc52b0563 Polish 2020-01-01 09:16:53 +01:00
Stephane Nicoll
a9b0b78cb2 Upgrade to Flyway 6.1.3 
Closes gh-19266
 2019-12-31 10:47:41 +01:00
Stephane Nicoll
5d1c844f21 Merge branch '2.2.x' 
Closes gh-19499
 2019-12-31 10:07:50 +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
Stephane Nicoll
9dd3912a64 Merge pull request #19491 from izeye 
* pr/19491:
  Polish doc

Closes gh-19491
 2019-12-31 10:07:17 +01:00
Johnny Lim
27d7727d9f Polish doc 
See gh-19491
 2019-12-31 10:06:58 +01:00
Stephane Nicoll
339702fae3 Merge pull request #19490 from victor-ferrer 
* pr/19490:
  FilteringSpringBootCondition uses Class.forName instead of classLoader

Closes gh-19490
 2019-12-31 09:43:02 +01:00
Victor Ferrer
1d900f67e7 FilteringSpringBootCondition uses Class.forName instead of classLoader 
See gh-19490
 2019-12-31 09:42:06 +01:00
Stephane Nicoll
61ae4fbc04 Merge branch '2.2.x' 2019-12-31 09:41:48 +01:00
Stephane Nicoll
1de30f0d00 Polish 2019-12-31 09:40:04 +01:00
Stephane Nicoll
2148097c04 Merge branch '2.2.x' 
Closes gh-19497
 2019-12-31 09:36:27 +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
Stephane Nicoll
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
Zekariyas
f005fffbc3 Fix typo in BindHandler#onFinish javadoc 
See gh-19492
 2019-12-31 09:34:45 +01:00
Stephane Nicoll
3b6f21d997 Merge branch '2.2.x' 
Closes gh-19486
 2019-12-30 17:01:53 +01:00
Stephane Nicoll
07a21ec601 Harmonize property visibility in Saml2RelyingPartyProperties 
Closes gh-19194
 2019-12-30 16:53:23 +01:00
Stephane Nicoll
50aa2b60e5 Simplify cache smoke tests 
Closes gh-19325
 2019-12-30 16:38:28 +01:00
Stephane Nicoll
334f3e08ae Fix formatting 2019-12-30 15:08:50 +01:00
Stephane Nicoll
18d97318df Merge pull request #19484 from izeye 
* pr/19484:
  Polish

Closes gh-19484
 2019-12-30 15:00:27 +01:00
Johnny Lim
e4057dd528 Polish 
See gh-19484
 2019-12-30 14:57:29 +01:00
Stephane Nicoll
5f178db49b Polish test setup 
This commit polishes a test configuration to avoid registering a mock
for the same bean twice.
 2019-12-30 14:52:49 +01:00
Stephane Nicoll
cf740add85 Fix component scan test setup 
This commit fixes the setup of tests using component scan. Previously,
a configuration used an include filter to only include a particular
configuration class in a given package. Unfortunately, include filters
do not prevent regular filters by default and the definition did not
have the intended behaviour.

This commit disables default filters so that only the specified include
filter is applied.
 2019-12-30 14:51:51 +01:00
Stephane Nicoll
3c8b3fba9f Merge branch '2.2.x' 
Closes gh-19480
 2019-12-29 10:41:26 +01:00
Stephane Nicoll
36bf05dde7 Merge branch '2.1.x' into 2.2.x 
Closes gh-19479
 2019-12-29 10:41:03 +01:00
Stephane Nicoll
4f237ccda6 Upgrade to nohttp 0.0.4.RELEASE 
Closes gh-19478
 2019-12-29 10:36:07 +01:00