Commit Graph

7974 Commits

Author SHA1 Message Date
Andy Wilkinson 589c58a21e Upgrade to Spring Retry 1.2.5.RELEASE
Closes gh-19734
2020-01-15 13:12:31 +00:00
Andy Wilkinson be11ddd4f9 Upgrade to Slf4j 1.7.30
Closes gh-19733
2020-01-15 13:12:31 +00:00
Andy Wilkinson 9989e14b0d Upgrade to Postgresql 42.2.9
Closes gh-19732
2020-01-15 13:12:31 +00:00
Andy Wilkinson 22c127878f Upgrade to Neo4j Ogm 3.1.16
Closes gh-19731
2020-01-15 13:12:31 +00:00
Andy Wilkinson b63f63ff9d Upgrade to Infinispan 9.4.17.Final
Closes gh-19730
2020-01-15 13:12:31 +00:00
Andy Wilkinson c52f2828a8 Upgrade to Hibernate 5.3.15.Final
Closes gh-19729
2020-01-15 13:12:31 +00:00
Andy Wilkinson 501f98c25c Upgrade to Jetty 9.4.25.v20191220
Closes gh-19728
2020-01-15 13:12:31 +00:00
Andy Wilkinson f2e93774e4 Upgrade to Groovy 2.5.9
Closes gh-19727
2020-01-15 13:12:30 +00:00
Andy Wilkinson 8ec2c77b83 Upgrade to Httpcore 4.4.13
Closes gh-19726
2020-01-15 13:12:30 +00:00
Andy Wilkinson 9f979cb03f Upgrade to Mysql 8.0.19
Closes gh-19725
2020-01-15 13:12:30 +00:00
Andy Wilkinson 3f45874245 Upgrade to Undertow 2.0.29.Final
Closes gh-19724
2020-01-15 13:12:30 +00:00
Andy Wilkinson 159be1a78d Upgrade to Rxjava2 2.2.17
Closes gh-19723
2020-01-15 13:12:30 +00:00
Andy Wilkinson f73c4a837c Upgrade to Netty 4.1.45.Final
Closes gh-19722
2020-01-15 13:12:30 +00:00
Andy Wilkinson 64df377600 Upgrade to Unboundid Ldapsdk 4.0.14
Closes gh-19721
2020-01-15 12:35:10 +00:00
Andy Wilkinson 1e6cc4c308 Upgrade to Hazelcast 3.11.6
Closes gh-19720
2020-01-15 12:35:08 +00:00
Andy Wilkinson 727b4d164e Upgrade to Jackson 2.9.10.20200103
Closes gh-19719
2020-01-15 12:35:07 +00:00
Andy Wilkinson 714a187d8f Rework dep mgmt again to avoid consumers picking up strict constraints
This paves the way for publishing Gradle module metadata once the
problem caused by snapshot versions and our two-step publication
process has been addressed.

See gh-19609
2020-01-15 12:33:18 +00:00
Andy Wilkinson 5bcd185ce1 Upgrade to Spring Data Lovelace-SR15
Closes gh-19642
2020-01-15 11:33:07 +00:00
Madhura Bhave aae1151f12 Merge branch '2.2.x'
Closes gh-19714
2020-01-14 18:52:35 -08:00
Madhura Bhave 3bf943d597 Merge branch '2.1.x' into 2.2.x
Closes gh-19713
2020-01-14 18:51:50 -08:00
Madhura Bhave f375277026 Merge pull request #19595 from nosan
* pr/19595:
  Polish "Limit ChronoField values to their range"
  Limit ChronoField values to their range

Closes gh-19595
2020-01-14 18:27:30 -08:00
Madhura Bhave 91e459a5d4 Polish "Limit ChronoField values to their range"
See gh-19595
2020-01-14 18:26:01 -08:00
Dmytro Nosan 9bc68b9877 Limit ChronoField values to their range
See gh-19595
2020-01-14 18:25:28 -08:00
Andy Wilkinson 244b5391bc Fix file handle leak in JarFileArchiveTests
Closes gh-19655
2020-01-14 17:20:29 +00:00
Stephane Nicoll dee71f064b Harmonize Cassandra bean names 2020-01-14 15:22:16 +01:00
Andy Wilkinson aefe52e4d0 Revert "Rework dep management to avoid consumers picking up strict constraints"
This reverts commit b34a311d02 as,
having disabled the publishing of Gradle's module metadata (4f75ab5),
the changes are no longer needed.

See gh-19609
2020-01-14 12:15:53 +00:00
Stephane Nicoll 246f5ce8eb Polish Cassandra v4 support 2020-01-14 12:25:44 +01:00
Stephane Nicoll e5499ca17a Upgrade to Spring Framework 5.2.3
Closes gh-19534
2020-01-14 11:34:54 +01:00
Stephane Nicoll 29163041ae Upgrade to Spring Framework 5.2.3
Closes gh-19531
2020-01-14 11:32:32 +01:00
Stephane Nicoll 717439d3a0 Upgrade to Spring Framework 5.1.13
Closes gh-19530
2020-01-14 11:30:57 +01:00
Brian Clozel 711391cf2f Move spring.http.* config properties namespace
Closes gh-18827
2020-01-14 10:45:31 +01:00
Stephane Nicoll 7f6b01c3d2 Make sure Redis cache prefix includes cache name
This commit maps 'spring.cache.redis.key-prefix' to the new
'prefixCacheNameWith' method introduced in Spring Data Neumann. This
makes sure that the configured prefix includes the cache name.

Closes gh-16676
2020-01-14 09:09:33 +01:00
Phillip Webb 3fe4245ab6 Disable failing TomcatReactiveWebServerFactoryTests
Temporarily disable some tests in `TomcatReactiveWebServerFactoryTests`
that fail since the Netty upgrade.

See gh-19702
2020-01-13 18:44:04 -08:00
Phillip Webb 862462b791 Update copyright year of changed files 2020-01-13 17:04:19 -08:00
Phillip Webb 1e5ba09a3e Merge branch '2.2.x' 2020-01-13 17:03:51 -08:00
Phillip Webb 15652ae4c1 Update copyright year of changed files 2020-01-13 16:47:17 -08:00
Phillip Webb f57281340c Merge branch '2.2.x' 2020-01-13 16:46:49 -08:00
Phillip Webb 3cfbfebbb1 Merge branch '2.1.x' into 2.2.x 2020-01-13 16:45:40 -08:00
Madhura Bhave d1f51e064b Merge branch '2.2.x'
Closes gh-19701
2020-01-13 14:15:01 -08:00
Madhura Bhave e60194c7d5 Ignore trailing slash when recording Web metrics
Fixes gh-18207
2020-01-13 14:14:28 -08:00
Phillip Webb 9bd49562fe Update copyright year of changed files 2020-01-13 14:09:11 -08:00
Scott Frederick c789592e26 Remove support for deprecated Elasticsearch Jest client
Closes #19676
2020-01-13 21:03:12 +01:00
Andy Wilkinson b34a311d02 Rework dep management to avoid consumers picking up strict constraints
Previously, enforcedPlatform dependencies were using to pull in the
constraints defined in spring-boot-dependencies and
spring-boot-parent and applied them strictly so that the constrained
version had to be used. This worked as intended in Spring Boot's own
build but incorrectly enforced those same strict version requirements
on external consumers of Spring Boot's modules.

This commit reworks how Spring Boot defines its internal dependency
management so that platform dependencies are exposed to external
consumers while enforced platform dependencies are using internally.

See gh-19609
2020-01-13 19:59:56 +00:00
Stephane Nicoll be79252fbd Upgrade to Reactor Dysprosium-SR3
Closes gh-19653
2020-01-13 20:27:57 +01:00
Stephane Nicoll b3d32c7214 Upgrade to Reactor Dysprosium-SR3
Closes gh-19643
2020-01-13 20:25:59 +01:00
Stephane Nicoll 405b9b7f93 Merge branch '2.2.x'
Closes gh-19693
2020-01-13 18:50:46 +01:00
dreis2211 852659684b Fix typo in NoSuchBeanDefinitionFailureAnalyzer exception
See gh-19690
2020-01-13 18:48:35 +01:00
Andy Wilkinson 550e042ff0 Merge branch '2.2.x'
Closes gh-19691
2020-01-13 17:13:58 +00:00
Andy Wilkinson 30e9ba4659 Upgrade to Jakarta Validation 2.0.2
Closes gh-19687
2020-01-13 17:11:48 +00:00
Andy Wilkinson 4a76bc8b46 Cope with different exception messages in ValidationException failure analyzer
Fixes gh-19671
2020-01-13 17:11:11 +00:00
Andy Wilkinson 9ca588631e Merge branch '2.2.x'
Closes gh-19689
2020-01-13 17:10:16 +00:00
Andy Wilkinson 27306369c5 Cope with different exception messages in ValidationException failure analyzer
Fixes gh-19671
2020-01-13 17:10:03 +00:00
dreis2211 d454c9653c Disable tests on Java 13 that require an incompatible Gradle version
See gh-19680
2020-01-13 16:51:55 +00:00
Stephane Nicoll f13ff3b939 Merge branch '2.2.x'
Closes gh-19686
2020-01-13 17:45:06 +01:00
Stephane Nicoll 101fd14286 Merge branch '2.1.x' into 2.2.x
Closes gh-19685
2020-01-13 17:44:45 +01:00
Stephane Nicoll 8b8a4ee65e Polish "Make equality checks defensive to null reference"
See gh-19540
2020-01-13 17:38:38 +01:00
liuhuan 6d8b849361 Make equality checks defensive to null reference
See gh-19540
2020-01-13 17:38:26 +01:00
Stephane Nicoll 4796701337 Merge branch '2.2.x'
Closes gh-19683
2020-01-13 17:24:08 +01:00
Stephane Nicoll 66755105ea Merge branch '2.1.x' into 2.2.x
Closes gh-19682
2020-01-13 17:21:24 +01:00
Dmytro Nosan b7e69890f3 Fix retrieval of parent logger in PoolingDataSourceBean
See gh-19637
2020-01-13 17:16:57 +01:00
Stephane Nicoll 738ba15d0c Merge branch '2.2.x'
Closes gh-19679
2020-01-13 17:01:17 +01:00
Stephane Nicoll 0c7dae0d51 Remove duplicate note in Hazelcast section of reference guide
Closes gh-19678
2020-01-13 17:00:28 +01:00
Brian Clozel b780e5247c Remove support for Elasticsearch transport client
The Elasticsearch transport client has been deprecated since Spring Boot
2.2.0 and is about to be removed from Spring Data Elasticsearch and
Elasticsearch itself in their next major releases.

The available REST client support variants are now the preferred way of
using Elasticsearch features.

Closes gh-19668
2020-01-13 16:00:18 +01:00
Andy Wilkinson 648e468c86 Build against Spring HATEOAS 1.1.0.M1 snapshots
See gh-19649
2020-01-13 14:56:10 +00:00
Stephane Nicoll ca1710ee56 Upgrade to Apache Cassandra 4.3.1
See gh-19588
2020-01-13 15:12:41 +01:00
Stephane Nicoll d282eb619f Upgrade to Elasticsearch 7.5.1
See gh-19588
2020-01-13 15:12:41 +01:00
Scott Frederick f268ede3c0 Start building against Spring Data Neumann-M1 snapshots
See gh-19588
2020-01-13 15:12:41 +01:00
Andy Wilkinson e415f759a2 Raise the minimum supported version of Gradle to 5.6
Closes gh-18777
2020-01-13 12:10:13 +00:00
Dmytro Nosan 25838b4794 Support nested requests in MetricsClientHttpRequestInterceptor
Prior to this commit, requests made by `HttpRequestInterceptor`
instances configured on `RestTemplate` would not be recorded
properly.

This commit ensures that nested requests are recorded separately.

See gh-19381
2020-01-13 12:18:20 +01:00
Andy Wilkinson b23b69fea3 Upgrade to Reactor Californium-SR15
Closes gh-19640
2020-01-13 11:02:41 +00:00
Andy Wilkinson c66d2e8039 Relax the Gradle plugin's Kotlin version constraint
Enforcing the spring-boot-dependencies platform makes for too strong
an opinion about the version of Kotlin that should be on the build
script's classpath. It clashes with the version of Kotlin that's
embedded in Gradle and used with Gradle's Kotlin DSL.

This commit switches to a normal platform (rather than an enforced
platform) which allows it to express an opinion about the version of
Kotlin without making it a strict requirement.

Closes gh-19609
2020-01-13 11:00:49 +00:00
Andy Wilkinson c8236a74d8 Upgrade to Spring Security 5.3.0.M1
Closes gh-19654
2020-01-13 11:00:49 +00:00
Andy Wilkinson 39d9e486dd Build against Reactor Dysprosium-SR3 snapshots
See gh-19653
2020-01-13 11:00:49 +00:00
Andy Wilkinson 16fe64ded4 Build against Micrometer 1.3.3 snapshots 2020-01-13 11:00:49 +00:00
Andy Wilkinson 3a2f25c6ff Build against Spring AMQP 2.2.3 snapshots
See gh-19651
2020-01-13 11:00:49 +00:00
Andy Wilkinson 7595336184 Build against Spring Integration 5.3.0.M1 snapshots
See gh-19650
2020-01-13 11:00:49 +00:00
Brian Clozel 18ccbf031a Remove validation starter from web starters
This commit removes the validation starter from the web and
webflux starters - we've reconsidered that choice since many were
not using this feature as part of their default web experience.

Thit commit also changes the default EL implementation for the
Jakarta implementation, aligning all servers on it and simplifying
dependency management (especially exclusions that were required
previously).

Closes gh-19550
2020-01-13 09:14:21 +01:00
Andy Wilkinson 6d16c7d860 Build against Spring Data Moore-SR4 snapshots
See gh-19648
2020-01-12 16:03:18 +00:00
Andy Wilkinson 3faf023da4 Build against Spring Integration 5.2.3 snapshots
See gh-19647
2020-01-12 16:03:18 +00:00
Andy Wilkinson 0509248bf7 Build against Spring AMQP 2.2.3 snapshots
See gh-19646
2020-01-12 16:03:05 +00:00
Andy Wilkinson 803a24d6f4 Build against Micrometer 1.3.3 snapshots
See gh-19645
2020-01-12 16:00:24 +00:00
Andy Wilkinson cedcbaccdb Build against Spring HATEOAS 1.0.3 snapshots
See gh-19644
2020-01-12 15:59:48 +00:00
Andy Wilkinson fbc958e4dd Build against Reactor Dysprosium-SR3 snapshots
See gh-19643
2020-01-12 15:59:00 +00:00
Andy Wilkinson 5e14e33c94 Start building against Micrometer 1.1.10 snapshots
See gh-19639
2020-01-12 10:44:01 +00:00
Andy Wilkinson 2d995e740a Start building against Spring Data Lovelace-SR15 snapshots
See gh-19642
2020-01-12 10:44:01 +00:00
Andy Wilkinson bcaae99fa9 Start building against Spring AMQP 2.1.13 snapshots
See gh-19641
2020-01-12 10:44:01 +00:00
Andy Wilkinson d75a58d789 Start building against Reactor Californium-SR15 snapshots
See gh-19640
2020-01-12 10:44:01 +00:00
Andy Wilkinson 7fda317f0d Merge branch '2.1.x' into 2.2.x
Closes gh-19657
2020-01-12 10:42:42 +00:00
Andy Wilkinson 617ebaf3c0 Isolate Gradle Plugin build from other Gradle configuration
Closes gh-19656
2020-01-12 10:41:38 +00:00
Stephane Nicoll b97b0c1d7b Merge branch '2.2.x'
Closes gh-19635
2020-01-11 10:36:27 +01:00
dreis2211 9fe114ebad Update copyright in legal doc section
See gh-19621
2020-01-11 10:25:17 +01:00
Brian Clozel e0171a5da8 Polish 2020-01-10 22:29:57 +01:00
Madhura Bhave 94ab996597 Merge branch '2.2.x' 2020-01-10 13:24:40 -08:00
Madhura Bhave 1fa83757ce Fix tests
See gh-19599
2020-01-10 13:22:53 -08:00
Brian Clozel 0f567c879d Auto-configure HTTP client builders as Lazy
Prior to this commit, HTTP client builders auto-configured by Spring
Boot would be eagerly instantiating resources, even if those were not
used by the application.

This commit makes the `RestTemplateBuilder` bean as Lazy.
`WebClient.Builder` was already a prototype bean, but some of its
dependencies could consume resources, like the `HttpClientConnector` and
the related infrastructure. This commit makes those pieces lazy.

Note that since those components are meant to help instantiate actual
HTTP clients for application components, making them lazy won't make any
difference at runtime since they'll be used during context refresh, or
they won't be used at all.

Closes gh-19549
2020-01-10 22:15:29 +01:00
Madhura Bhave d510a7bd80 Merge branch '2.2.x'
Closes gh-19622
2020-01-10 13:01:54 -08:00
Madhura Bhave 139995469a Short circuit validation in bind handler if previous exception present
Closes gh-19599
2020-01-10 13:00:14 -08:00
Andy Wilkinson b5ae8b0af5 Disable tests that use Docker when Docker is unavailable
Closes gh-19616
2020-01-10 20:35:18 +00:00
Andy Wilkinson f6e9869156 Use version property to set Boot's version in dependencies bom
See gh-19608
See gh-19609
2020-01-10 15:07:47 +00:00
Andy Wilkinson ce99db1902 Port the build to Gradle
Closes gh-19609
Closes gh-19608
2020-01-10 14:15:35 +00:00
Madhura Bhave abe95fa8a7 Merge branch '2.2.x'
Closes gh-19600
2020-01-09 17:57:39 -08:00
Madhura Bhave 7f0573df49 Fallback on underlying server default when determining outcome tag
This commit also changed the default outcome to SUCCESS

Fixes gh-19367
2020-01-09 17:55:35 -08:00
Madhura Bhave ed4261a61c Merge branch '2.2.x'
Closes gh-19598
2020-01-09 17:10:24 -08:00
Madhura Bhave a017b8905a Adapt field name in ValidationBindHandler to a valid ConfigurationPropertyName
Fixes gh-19580
2020-01-09 17:08:39 -08:00
Andy Wilkinson c584334f5e Merge branch '2.2.x'
Closes gh-19592
2020-01-09 09:00:16 +00:00
Andy Wilkinson ccf4e1ad44 Merge branch '2.1.x' into 2.2.x
Closes gh-19591
2020-01-09 08:59:48 +00:00
dreis2211 2b06f17c69 Fix links to external types in javadoc
See gh-19581
2020-01-09 08:59:25 +00:00
Stephane Nicoll 7d6f4a6666 Merge branch '2.2.x'
Closes gh-19590
2020-01-09 09:52:22 +01:00
Stephane Nicoll 99c64b7cdf Merge branch '2.1.x' into 2.2.x
Closes gh-19589
2020-01-09 09:51:45 +01:00
Matthias Stock adfbbcc0f6 Simplify validation pattern of EndpointId
See gh-19584
2020-01-09 09:42:31 +01:00
Madhura Bhave 6d0b4351f4 Merge branch '2.2.x'
Closes gh-19582
2020-01-08 13:54:13 -08:00
Madhura Bhave 437941cc51 Improve diagnostics when using `@ConstructorBinding` on a Kotlin class
Closes gh-19312
2020-01-08 13:53:47 -08:00
dreis2211 34419eda38 Add micrometer-registry-stackdriver dependency for javadoc generation
See gh-19578
2020-01-08 17:47:21 +00:00
Stephane Nicoll 79da3b6e2c Remove support for Jetty 9.4.21 and earlier
Closes gh-18692
2020-01-08 15:40:01 +01:00
Andy Wilkinson 4efd8ba587 Merge branch '2.2.x'
Closes gh-19574
2020-01-08 14:02:50 +00:00
Andy Wilkinson 02965e9744 Fix javadoc warnings
Fixes gh-19572
2020-01-08 14:02:24 +00:00
Stephane Nicoll e5c1f3133a Harmonize cassandra tests 2020-01-08 14:57:52 +01:00
Stephane Nicoll 6ced89490c Polish 2020-01-08 14:34:33 +01:00
Stephane Nicoll bc066d279b Polish cassandra tests
See gh-18019
2020-01-08 14:22:48 +01:00
Stephane Nicoll 462442e7d2 Polish "Add Stackdriver metrics export support"
See gh-19528
2020-01-08 13:35:44 +01:00
Johannes Graf d42256d856 Add Stackdriver metrics export support
See gh-19528
2020-01-08 13:32:27 +01:00
Andy Wilkinson 10ba17c390 Merge branch '2.2.x'
Closes gh-19571
2020-01-08 11:44:40 +00:00
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 cbacb6116b Merge branch '2.2.x'
Closes gh-19568
2020-01-08 11:15:59 +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 c9ad3564d9 Merge branch '2.2.x'
Closes gh-19562
2020-01-07 14:29:45 -08: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 6944e52052 Merge branch '2.2.x' 2020-01-07 13:49:43 -08:00
Madhura Bhave ac10ebba33 Fix checkstyle 2020-01-07 13:49:02 -08:00
Madhura Bhave c82d728c93 Merge branch '2.2.x'
Closes gh-19561
2020-01-07 13:34:43 -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 30c124f549 Merge branch '2.2.x'
Closes gh-19554
2020-01-07 12:06:07 +00: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
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
2020-01-06 16:33:38 +01:00
Stephane Nicoll a0a4cbce3a Merge branch '2.2.x'
Closes gh-19542
2020-01-06 13:02:10 +01:00
dreis2211 6ffe47cd06 Remove deprecated usage of WebTestClientBuilderCustomizer
See gh-19536
2020-01-06 12:59:12 +01:00
Stephane Nicoll fc60301fc7 Polish "Add Java 14 to JavaVersion enumeration"
See gh-19511
2020-01-04 11:45:43 +01:00
Dmytro Nosan a5a3a020b6 Add Java 14 to JavaVersion enumeration
See gh-19511
2020-01-04 11:44:03 +01:00
Stephane Nicoll 47481464ff Merge branch '2.2.x'
Closes gh-19535
2020-01-04 11:42:43 +01:00
Rossen Stoyanchev f6947648c9 Improve Spring MVC auto-configuration section
See gh-19521
2020-01-04 11:37:01 +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
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
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 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
Johnny Lim 27d7727d9f Polish doc
See gh-19491
2019-12-31 10:06:58 +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
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 334f3e08ae Fix formatting 2019-12-30 15:08:50 +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 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
2019-12-28 10:56:04 +01:00
Stephane Nicoll 015714c1d6 Merge branch '2.2.x'
See gh-19474
2019-12-28 10:52:30 +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 01a474b67a Merge branch '2.2.x'
Closes gh-19474
2019-12-28 10:03:41 +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 e7f45d8a34 Polish "Add toolchains support for Spring Boot Maven Plugin"
See gh-18732
2019-12-26 12:03:18 +01:00
Dmytro Nosan eede16ff0a Add toolchains support for Spring Boot Maven Plugin
See gh-18732
2019-12-26 12:03:18 +01:00
Stephane Nicoll 08ac72f5f0 Fix build failure 2019-12-26 12:02:38 +01:00
Stephane Nicoll a2b2b46b83 Merge branch '2.2.x'
Closes gh-19463
2019-12-26 11:18:55 +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 2c1e81adf0 Polish 2019-12-26 10:42:40 +01:00
Stephane Nicoll 1e38dd5531 Merge branch '2.2.x'
Closes gh-19461
2019-12-25 08:32:38 +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 065fe9996d Merge branch '2.2.x'
Closes gh-19454
2019-12-24 11:00:23 +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