Commit Graph

24439 Commits (f94c6d745895ab61b8919c9018fce6eef6ccd6b9)
 

Author SHA1 Message Date
Madhura Bhave f94c6d7458 Merge branch '2.2.x' 5 years ago
Madhura Bhave 8e285a4387 Fix checkstyle 5 years ago
Madhura Bhave 743cf3b2a7 Merge branch '2.2.x'
Closes gh-19527
5 years ago
Madhura Bhave ac46f5971f Merge branch '2.1.x' into 2.2.x
Closes gh-19526
5 years ago
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
5 years ago
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
5 years ago
Brian Clozel c2f8741e2e Merge branch '2.2.x'
Closes gh-19517
5 years ago
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
5 years ago
Stephane Nicoll 76a48885f8 Merge branch '2.2.x'
Closes gh-19516
5 years ago
Stephane Nicoll fd4829c2ea Merge branch '2.1.x' into 2.2.x
Closes gh-19515
5 years ago
Stephane Nicoll 8ddcb9314e Merge pull request #19510 from dreis2211
* pr/19510:
  Update some copyrights to 2020

Closes gh-19510
5 years ago
dreis2211 9cbf5902dc Update some copyrights to 2020
See gh-19510
5 years ago
Stephane Nicoll 679e88af47 Merge branch '2.2.x'
Closes gh-19509
5 years ago
Stephane Nicoll 727870d9c9 Merge pull request #19508 from ge0ffrey
* pr/19508:
  Add reference to OptaPlanner starter

Closes gh-19508
5 years ago
Geoffrey De Smet 493762a416 Add reference to OptaPlanner starter
See gh-19508
5 years ago
Stephane Nicoll c3ab4b875a Merge branch '2.2.x'
Closes gh-19504
5 years ago
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
5 years ago
Stephane Nicoll 7d36599343 Polish "Fix outdated reference in ArtemisConfigurationCustomizer javadoc"
See gh-19503
5 years ago
Ochieng Olanga c6f7d12270 Fix outdated reference in ArtemisConfigurationCustomizer javadoc
See gh-19503
5 years ago
Stephane Nicoll 6fc52b0563 Polish 5 years ago
Stephane Nicoll a9b0b78cb2 Upgrade to Flyway 6.1.3
Closes gh-19266
5 years ago
Stephane Nicoll 5d1c844f21 Merge branch '2.2.x'
Closes gh-19499
5 years ago
Stephane Nicoll a684ab8726 Merge branch '2.1.x' into 2.2.x
Closes gh-19498
5 years ago
Stephane Nicoll 9dd3912a64 Merge pull request #19491 from izeye
* pr/19491:
  Polish doc

Closes gh-19491
5 years ago
Johnny Lim 27d7727d9f Polish doc
See gh-19491
5 years ago
Stephane Nicoll 339702fae3 Merge pull request #19490 from victor-ferrer
* pr/19490:
  FilteringSpringBootCondition uses Class.forName instead of classLoader

Closes gh-19490
5 years ago
Victor Ferrer 1d900f67e7 FilteringSpringBootCondition uses Class.forName instead of classLoader
See gh-19490
5 years ago
Stephane Nicoll 61ae4fbc04 Merge branch '2.2.x' 5 years ago
Stephane Nicoll 1de30f0d00 Polish 5 years ago
Stephane Nicoll 2148097c04 Merge branch '2.2.x'
Closes gh-19497
5 years ago
Stephane Nicoll b7e6febaa0 Merge branch '2.1.x' into 2.2.x
Closes gh-19496
5 years ago
Stephane Nicoll eee1b1a98f Merge pull request #19492 from gZack
* pr/19492:
  Fix typo in BindHandler#onFinish javadoc

Closes gh-19492
5 years ago
Zekariyas f005fffbc3 Fix typo in BindHandler#onFinish javadoc
See gh-19492
5 years ago
Stephane Nicoll 3b6f21d997 Merge branch '2.2.x'
Closes gh-19486
5 years ago
Stephane Nicoll 07a21ec601 Harmonize property visibility in Saml2RelyingPartyProperties
Closes gh-19194
5 years ago
Stephane Nicoll 50aa2b60e5 Simplify cache smoke tests
Closes gh-19325
5 years ago
Stephane Nicoll 334f3e08ae Fix formatting 5 years ago
Stephane Nicoll 18d97318df Merge pull request #19484 from izeye
* pr/19484:
  Polish

Closes gh-19484
5 years ago
Johnny Lim e4057dd528 Polish
See gh-19484
5 years ago
Stephane Nicoll 5f178db49b Polish test setup
This commit polishes a test configuration to avoid registering a mock
for the same bean twice.
5 years ago
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.
5 years ago
Stephane Nicoll 3c8b3fba9f Merge branch '2.2.x'
Closes gh-19480
5 years ago
Stephane Nicoll 36bf05dde7 Merge branch '2.1.x' into 2.2.x
Closes gh-19479
5 years ago
Stephane Nicoll 4f237ccda6 Upgrade to nohttp 0.0.4.RELEASE
Closes gh-19478
5 years ago
Stephane Nicoll bb5e09882a Extract RabbitTemplate auto-configuration in a configurer
This commit movers the auto-configuration of RabbitTemplate to a
dedicated class that can be reused to create additional template with
similar settings.

CLoses gh-19440
5 years ago
Stephane Nicoll 015714c1d6 Merge branch '2.2.x'
See gh-19474
5 years ago
Stephane Nicoll 85667ba165 Merge branch '2.1.x' into 2.2.x
See gh-19473
5 years ago
Stephane Nicoll c0f1aaebb6 Fix Tomcat's maxConnections default value
Closes gh-19472
5 years ago
Stephane Nicoll 01a474b67a Merge branch '2.2.x'
Closes gh-19474
5 years ago
Stephane Nicoll 6ea522a90a Merge branch '2.1.x' into 2.2.x
Closes gh-19473
5 years ago