Commit Graph

24762 Commits (aa1954717cce4786e056153868a334054cd51a01)
 

Author SHA1 Message Date
Madhura Bhave 6d6bbfb731 Merge pull request #19556 from scottfrederick
* pr/19556:
  Add profiles directly to the application environment for tests

Closes gh-19556
5 years ago
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
5 years ago
Andy Wilkinson 30c124f549 Merge branch '2.2.x'
Closes gh-19554
5 years ago
Andy Wilkinson c57359ea3b Merge branch '2.1.x' into 2.2.x
Closes gh-19553
5 years ago
Andy Wilkinson d46406fcb9 Remove loading of non-existent properties file from antlib
Fixes gh-19552
5 years ago
Brian Clozel 4910b51877 Merge branch '2.2.x' 5 years ago
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
5 years ago
Stephane Nicoll ee7555750e Add ComponentScan#nameGenerator alias on @SpringBootApplication
This commit allows to customize the default BeanNameGenerator for
scanned components using @SpringBootApplication.

Closes gh-19346
5 years ago
Stephane Nicoll a0a4cbce3a Merge branch '2.2.x'
Closes gh-19542
5 years ago
Stephane Nicoll 6a7e3c55b8 Merge pull request #19536 from dreis2211
* pr/19536:
  Remove deprecated usage of WebTestClientBuilderCustomizer

Closes gh-19536
5 years ago
dreis2211 6ffe47cd06 Remove deprecated usage of WebTestClientBuilderCustomizer
See gh-19536
5 years ago
Stephane Nicoll e250cce274 Merge pull request #19511 from nosan
* pr/19511:
  Polish "Add Java 14 to JavaVersion enumeration"
  Add Java 14 to JavaVersion enumeration

Closes gh-19511
5 years ago
Stephane Nicoll fc60301fc7 Polish "Add Java 14 to JavaVersion enumeration"
See gh-19511
5 years ago
Dmytro Nosan a5a3a020b6 Add Java 14 to JavaVersion enumeration
See gh-19511
5 years ago
Stephane Nicoll 47481464ff Merge branch '2.2.x'
Closes gh-19535
5 years ago
Stephane Nicoll 620f5801a2 Merge pull request #19521 from rstoyanchev
* pr/19521:
  Improve Spring MVC auto-configuration section

Closes gh-19521
5 years ago
Rossen Stoyanchev f6947648c9 Improve Spring MVC auto-configuration section
See gh-19521
5 years ago
Stephane Nicoll 84dfb3eae9 Merge branch '2.2.x'
Closes gh-19533
5 years ago
Stephane Nicoll 58a805e607 Merge branch '2.1.x' into 2.2.x
Closes gh-19532
5 years ago
Stephane Nicoll cb40454977 Merge pull request #19523 from dreis2211
* pr/19523:
  Upgrade CI to Artifactory Resource 0.0.10

Closes gh-19523
5 years ago
dreis2211 48032acd04 Upgrade CI to Artifactory Resource 0.0.10
See gh-19523
5 years ago
Madhura Bhave bb55bad170 Merge branch '2.2.x'
Closes gh-19529
5 years ago
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
5 years ago
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