Commit Graph

7388 Commits

Author SHA1 Message Date
Stephane Nicoll ab6d163f73 Upgrade to Netty Tcnative 2.0.27.Final
Closes gh-19117
2019-11-25 15:32:32 +01:00
Stephane Nicoll 4868124371 Upgrade to Querydsl 4.2.2
Closes gh-19116
2019-11-25 15:32:31 +01:00
Stephane Nicoll 3a86a6922c Upgrade to Appengine Sdk 1.9.77
Closes gh-19115
2019-11-25 15:32:29 +01:00
Stephane Nicoll 49433ccef1 Upgrade to Couchbase Client 2.7.10
Closes gh-19114
2019-11-25 15:32:28 +01:00
Stephane Nicoll a4ca1d02b3 Merge branch '2.1.x' into 2.2.x
Closes gh-19112
2019-11-25 13:59:45 +01:00
Stephane Nicoll 5d8fe860d7 Polish "Use ssl.enabled flag when RabbitMQ address has no protocol"
There is a direct link between the sslEnabled flag and the default port
that should be used by an address. The checks are currently set in two
places:

* Determine which port should be used
* Determine if SSL should be enabled

This commit polishes the initial proposal so that secureConnection is
only set if a protocol is available.

See gh-19109
2019-11-25 13:52:27 +01:00
cbono 2210236f82 Use ssl.enabled flag when RabbitMQ address has no protocol
See gh-19109
2019-11-25 11:16:56 +01:00
thelproad 65ab82b3cd Remove redundant code
See gh-19000
2019-11-23 12:01:19 +01:00
Brian Clozel 0c5bb60384 Fix responseCommitted test in webflux error handling
This commit updates the `responseCommitted` after changes were made in
`WebTestClient` with spring-projects/spring-framework#24051.

Fixes gh-19083
2019-11-22 20:58:38 +01:00
Stephane Nicoll 58bfbb92b9 Merge branch '2.1.x' into 2.2.x
Closes gh-19091
2019-11-21 14:38:09 +01:00
Adam Michalik c154a014a1 Remove invalid example of spring.mvc.async.request-timout property
See gh-19057
2019-11-21 14:13:22 +01:00
dreis2211 0bdcd2ee67 Handle ApiVersion in CachingOperationInvoker
Prior to this commit, ApiVersion was treated as a mandatory parameter in
CachingOperationInvokerAdvisor and thus prevented the
CachingOperationInvoker to kick in. By skipping ApiVersion in the same
way we're skipping SecurityContext we can avoid this.

In order to not return the same cached response, this commit also
changes the cache handling in CachingOperationInvoker to account for
different ApiVersions being passed.

See gh-18961
2019-11-21 13:46:49 +01:00
dreis2211 347434ba81 Test the Gradle Plugin against Gradle 6.0.1
See gh-19065
2019-11-21 13:44:55 +01:00
Stephane Nicoll d8c64abdbb Merge branch '2.1.x' into 2.2.x
Closes gh-19086
2019-11-21 13:42:32 +01:00
Stephane Nicoll b23a3712c6 Polish "Fix logging in CloudFoundryVcapEnvironmentPostProcessor"
See gh-19027
2019-11-21 13:41:47 +01:00
Mark Bigler f1489e41ec Fix logging in CloudFoundryVcapEnvironmentPostProcessor
See gh-19027
2019-11-21 13:35:50 +01:00
Brian Clozel 9fe721d75c Temporarily ignore failing error web handler test
See gh-19083
2019-11-21 11:07:23 +01:00
Madhura Bhave 8ec3ca74e1 Fix loading of devtools yaml files
Fixes gh-19081
2019-11-20 17:30:26 -08:00
Stephane Nicoll 9c4136898d Start building against Spring Data Moore-SR3 snapshots
See gh-19069
2019-11-20 11:49:06 +01:00
Stephane Nicoll 511c75cbe8 Start building against Spring Framework 5.2.2 snapshots
See gh-19053
2019-11-20 11:48:32 +01:00
Stephane Nicoll 13f4e8a591 Start building against Reactor Dysprosium-SR2 snapshots
See gh-19054
2019-11-20 11:48:26 +01:00
Stephane Nicoll 3c3614d8ef Start building against Spring Batch 4.1.3 snapshots
See gh-19072
2019-11-20 11:20:48 +01:00
Stephane Nicoll 6fa5f0c1d0 Start building against Spring Data Lovelace-SR14 snapshots
See gh-19068
2019-11-20 11:05:09 +01:00
Stephane Nicoll 80eaa16b0d Start building against Spring Framework 5.1.12 snapshots
See gh-19051
2019-11-20 11:04:27 +01:00
Stephane Nicoll 586a5d2c14 Start building against Reactor Californium-SR14 snapshots
See gh-19068
2019-11-20 11:03:18 +01:00
Madhura Bhave 6e22ddc1a6 Merge branch '2.1.x' into 2.2.x 2019-11-19 12:09:49 -08:00
Madhura Bhave 849a76c6c2 Polish 2019-11-19 12:07:05 -08:00
Madhura Bhave ff22bd4827 Merge branch '2.1.x' into 2.2.x
Closes gh-19059
2019-11-19 11:52:26 -08:00
Madhura Bhave a3a53d299f Check authorities when exposing health details
Fixes gh-18998
2019-11-19 11:18:07 -08:00
Stephane Nicoll a003a5c8ab Upgrade to Kotlin 1.3.60
Closes gh-19046
2019-11-19 17:56:40 +01:00
Stephane Nicoll 3d418263bc Merge branch '2.1.x' into 2.2.x
Closes gh-19032
2019-11-16 09:40:32 +03:00
dreis2211 355505d236 Fix syntax error in configuration metadata sample in docs
See gh-19028
2019-11-16 09:39:46 +03:00
Stephane Nicoll b842f16848 Polish "Use caps in docker file example for consistency"
See gh-19029
2019-11-16 09:36:48 +03:00
Dave Syer b95e8a4df6 Use caps in docker file example for consistency
See gh-19029
2019-11-16 09:36:12 +03:00
Madhura Bhave b6ff0b7c5f Support constructor binding on 3rd party classes
Closes gh-18935
2019-11-13 14:28:58 -08:00
Stephane Nicoll d08b436735 Polish "Improve Deploying to Containers section"
See gh-18932
2019-11-13 13:36:00 +01:00
Guillaume Lours 6cf05aeb50 Improve Deploying to Containers section
See gh-18932
2019-11-13 13:19:10 +01:00
Johnny Lim 96a029e44f Polish a test name
See gh-18999
2019-11-13 08:52:32 +01:00
Johnny Lim ddb22f5a52 Polish test methods
See gh-18962
2019-11-12 14:09:44 +01:00
dreis2211 6b500d82b4 Polish
See gh-18918
2019-11-12 14:06:47 +01:00
Stephane Nicoll 51487c7c45 Merge branch '2.1.x' into 2.2.x 2019-11-12 14:04:47 +01:00
Stephane Nicoll cad2365237 Polish 2019-11-12 14:03:39 +01:00
Andy Wilkinson 379ba0dc00 Support Gradle 6.0
Previously, our Gradle plugin was not tested against Gradle 6.0,
a number of deprecation warnings were output when using the plugin
with Gradle 6, and some functionality related to the application
plugin did not work as expected.

This commit tests the plugin against Gradle 6. It also avoids calling
deprecated APIs. The plugin is compatibile against Gradle 4.10 where
the deprecated APIs' replacements are not available so reflection is
used to call the replcaements. Lastly, the way in which the base name
of the boot distribution that is created when the application plugin
is applied has been modified to ensure that it is effective when using
Gradle 6.

Closes gh-18663
2019-11-11 16:36:40 +00:00
Madhura Bhave f9dc81558a Remove samples references from docs
Fixes gh-18904
2019-11-08 14:56:52 -08:00
Andy Wilkinson e715a5f689 Merge branch '2.1.x' into 2.2.x
Closes gh-18943
2019-11-08 15:01:19 +00:00
Andy Wilkinson 3f0367e2dd Apply changes recommended by Jetty team to JettyEmbeddedErrorHandler
Closes gh-18842
2019-11-08 14:57:46 +00:00
Andy Wilkinson fc3f6a930d Merge branch '2.1.x' into 2.2.x
Closes gh-18940
2019-11-08 13:32:49 +00:00
Andy Wilkinson 5765cfe010 Allow 5 seconds for child to handle SIGINT before destroying it
Previously, when RunProcess handled a SIGINT it would immediately
attempt to destroy the process that it had run. This created a race
condition between the SIGINT being handled by the child process
and RunProcess destroying the child. The exact behavior of destroy
is implementation dependent and it may result in forcible termination
of the process where shutdown hooks are not called. This is what
happens on Windows. The exit code in such a case is 1 which prevents
anything from waiting for the process to complete from detecting
that it ended as a result of a SIGINT, leaving it with no choice but
to report an error. This is what happens with mvn spring-boot:run
with a forked process on Windows and results in the build failing.

This commit updates RunProcess to allow the child process to handle
the SIGINT itself, waiting for up to five seconds for that to happen
before the process is then destroyed. Given this time, the child
process exits with 130 which RunMojo already handles correctly as
indicating that the process died due to SIGINT and the build completes
with success as a result.

Fixes gh-18936
2019-11-08 12:41:13 +00:00
Stephane Nicoll 08067fb816 Polish "Remove reference to ConfigurationPropertiesScan in javadoc"
See gh-18920
2019-11-08 11:10:14 +01:00
wonwoo 92b00255a1 Remove reference to ConfigurationPropertiesScan in javadoc
See gh-18920
2019-11-08 11:09:57 +01:00
Andy Wilkinson 0a8a0daff8 Merge branch '2.1.x'
Closes gh-18913
2019-11-07 09:56:49 +00:00
Andy Wilkinson a11661d284 Trim whitespace in BasicJsonParser
Previously, whitespace in between the keys and values in the JSON was
not trimmed correctly in BasicJsonParser which lead to it incorrectly
parsing JSON with whitespace between the opening of a list ([) and the
opening of a map ({).

This commit updates the parser to trim unwanted whitespace and adds a
test to AbstractJsonParserTests to verify the whitespace handling
behaviour across all JsonParser implementations.

Closes gh-18911
2019-11-07 09:56:00 +00:00
Andy Wilkinson dd4377e69c Merge branch '2.1.x'
Closes gh-18912
2019-11-07 09:33:11 +00:00
Andy Wilkinson d1ead884c4 Fix @ServletComponentScan with a component index
Previously @ServletComponentScan did not work when there was a
component index on the classpath as it made an assumption about
the concrete type of the BeanDefinitions produced by scanning that
does not hold true when an index is present.

This commit updates the scanning and the handlers to correct the
assumpution by working with a bean definition type that is produced
by scanning both when there is and when there is not an index present.

To prevent the problem from reoccuring, a test that uses and index
has been added and the import of ScannedGenericBeanDefinition is now
prohibited by Checkstyle.

Closes gh-18910
2019-11-07 09:20:19 +00:00
Stephane Nicoll 86a1c96224 Make sure health endpoint is available with no contributor
This commit makes sure that the health endpoint returns a default health
status when no contributors are available. Previously, it was returning
`null` which leads to a 404 when exposed via HTTP.

Closes gh-18676
2019-11-06 12:46:47 +01:00
Stephane Nicoll 684d7cfe38 Upgrade to Mongodb 3.11.2
Closes gh-18898
2019-11-06 09:44:38 +01:00
Stephane Nicoll c413e5b54e Upgrade to Hazelcast 3.11.5
Closes gh-18897
2019-11-06 09:40:11 +01:00
Johnny Lim ea51947741 Use try-with-resources blocks in JarFileArchiveTests
See gh-18883
2019-11-06 08:01:50 +01:00
Madhura Bhave 471ca01ccf Do not validate value object bean definion when singleton present
Prior to this commit constructor bound configuration properties could
not be mocked because it would fail validation from
ConfigurationPropertiesBeanDefinitionValidator. The MockitoPostProcessor
registers the mocked bean as a singleton and validation can be skipped if a
singleton for the type is found in the bean factory.

Fixes gh-18652
2019-11-05 21:54:16 -08:00
Madhura Bhave f9785d2bda Fix constructor binding issues
This commit fixes a few bugs related to constructor binding.
The ContructorFilter on the Bindable has been replaced with a
Binder level BinderConstructorProvider so that it can be used to
determine the constructor to use for nested properties as well.

Fixes gh-18810
Fixes gh-18670
Closes gh-18685
Closes gh-18894

Co-authored-by: Phillip Webb <pwebb@pivotal.io>
2019-11-05 14:44:31 -08:00
Phillip Webb 90e1046d53 Upgrade to Spring Kafka 2.3.3.RELEASE
Closes gh-18892
2019-11-05 10:17:55 -08:00
Andy Wilkinson f1af8c5510 Merge branch '2.1.x'
Closes gh-18889
2019-11-05 15:50:51 +00:00
Andy Wilkinson 59bc3c5602 Prevent recursive config props from causing a stack overflow
Previously, when the configuration properties annotation processor
encountered a property that was the same as an outer type that had
already been processed, it would fail with a stack overflow error.

This commit introduces the use of a stack to track the types that
have been processed. Types that have been seen before are skipped,
thereby preventing a failure from occurring. We do not fail upon
encountering a recursive type to allow metadata generation to
complete. At runtime, the recursive property will not cause a problem
if it is not bound.

Fixes gh-18365
2019-11-05 15:35:11 +00:00
Andy Wilkinson d8545bdead Merge branch '2.1.x'
Closes gh-18887
2019-11-05 14:23:11 +00:00
Andy Wilkinson 8b62f448ba Improve documentation on using Jersey alongside Spring MVC
Previously, the documentation did not provide any guidance on using
Jersey alongside Spring MVC or any other web framework.

This improves the documentation in two ways:

1. It notes that, in the presence of both Jersey and Spring MVC, the
   Actuator will prefer Spring MVC for exposing HTTP endpoints.
2. It adds a how-to describing how to configure Jersey to forward
   requests for which it has no handler on to the rest of the filter
   chain. When Spring MVC is the other framework, this allows them to
   be handled by its dispatcher servlet.

Closes gh-17523
2019-11-05 14:21:34 +00:00
Andy Wilkinson 571e4640de Merge branch '2.1.x'
Closes gh-18877
2019-11-05 13:26:45 +00:00
Andy Wilkinson bd06a91ac0 Recommend more overrides when using starter parent
This commit is a continuation of the work done in 987a5f81. In
addition to developers and licenses that are covered in the earlier
commit, a number of other settings are still inherited from the
starter parent. This commit updates the documentation to show them
being overridden as well.

Closes gh-18532
2019-11-05 13:25:53 +00:00
Stephane Nicoll d331f28222 Merge branch '2.1.x'
Closes gh-18885
2019-11-05 14:17:35 +01:00
dreis2211 1b2112ea8c Reduce method visibility in EndpointDiscovererTests
See gh-18884
2019-11-05 14:14:24 +01:00
Stephane Nicoll 4d1373c94d Polish "Support amqps:// URIs in spring.rabbitmq.addresses"
See gh-18808
2019-11-05 14:07:24 +01:00
Mark Pollack 0fedb24c6f Support amqps:// URIs in spring.rabbitmq.addresses
See gh-18808

Co-Authored-By: Bryan Kelly <xyloman@gmail.com>
2019-11-05 14:07:24 +01:00
Andy Wilkinson 49566edf6c Reduce visibility of test methods 2019-11-05 12:29:38 +00:00
Andy Wilkinson ce01f7f150 Merge branch '2.1.x'
Closes gh-18882
2019-11-05 11:05:51 +00:00
Andy Wilkinson ed50bf2494 Honour EndpointFilter configured on an endpoint's superclass
Previously, @EndpointFilter would only have an effect when used as
an annotation or meta-annotation on the endpoint class itself. It
would have no effect when used on a super-class of the endpoint
bean's class.

This commit updates EndpointDiscoverer so that an @EndpointFilter
annotation or meta-annotation on a super-class will be found and
applied to the discovery process. This is achieved by using find…
rather than get… when retrieving the attributes for the EndpointFilter
annotation.

Fixes gh-17866
2019-11-05 10:51:36 +00:00
Andy Wilkinson a65374b16b Merge branch '2.1.x'
Closes gh-18880
2019-11-05 10:29:43 +00:00
Andy Wilkinson cb76502a44 Document that JUL is not bridged into SLF4J when deployed to a container
Closes gh-16062
2019-11-05 10:28:39 +00:00
Andy Wilkinson 2c309c5d93 Merge branch '2.1.x'
Closes gh-18879
2019-11-05 10:09:26 +00:00
Andy Wilkinson 1c6f2af475 Clarify how to configure a Filter's order
Closes gh-18266
2019-11-05 10:06:17 +00:00
Andy Wilkinson 63dd159935 Merge branch '2.1.x'
Closes gh-18878
2019-11-05 09:58:04 +00:00
Andy Wilkinson 69a95ce5c1 Allow dependsOn relationships created by post-processor to be overridden
Previously, AbstractDependsOnBeanFactoryPostProcessor was unordered
which meant that it was impossible to guarantee that another bean
factory post-processor would run after it. This prevented overriding
of the dependsOn relationships that is creates.

This commit updates AbstractDependsOnBeanFactoryPostProcessor to give
it a default order of zero. This will allow additional bean factory
post-processors to be configured with a lower precedence order (values
greater than 0) so that they run after any
AbstractDependsOnBeanFactoryPostProcessor and can override the
dependencies that it has configured.

Fixes gh-18362
2019-11-05 09:53:36 +00:00
Andy Wilkinson abeafb325e Merge branch '2.1.x'
Closes gh-18877
2019-11-05 09:42:08 +00:00
Andy Wilkinson 987a5f8103 Recommend overriding licences and developers when using starter parent
Publishing to Maven Central requires spring-boot-starter-parent to
declare its license and developers. When a user then uses
spring-boot-starter-parent as their project's parent, these values
are inherited and this is almost certainly unwanted.

This commit updates the documentation to recommend and demonstrate
overriding the license and developers that are inherited from the
starter parent.

Closes gh-18532
2019-11-05 09:39:59 +00:00
Andy Wilkinson 36b1f65056 Merge branch '2.1.x'
Closes gh-18876
2019-11-05 09:24:18 +00:00
Andy Wilkinson 89e050d722 Document security risks of DevTools' remote support more clearly
Previously, the security risks and our recommendations on how to
mitigate them were not documented as clearly as they could have been.
This commit makes some changes to try to address this:

1. The security risk is now noted at the beginning of the section
2. The recommendation to use SSL is now documented more prominently
   and an alternative recommendation to only use remote support on
   a trusted network has been added.
3. The example secret has been removed to prevent copy and paste
4. A recommendation to use a secret that is unique and strong has been
   added

Closes gh-18825
2019-11-05 09:22:39 +00:00
dreis2211 689e02923f Remove non-existent FailureAnalyzer from spring.factories
See gh-18864
2019-11-05 09:28:21 +01:00
Stephane Nicoll da24a66ce6 Merge branch '2.1.x'
Closes gh-18875
2019-11-05 09:19:51 +01:00
Stephane Nicoll 5863a75c3c Polish "Document Settings as jooq supported auto-configuration type"
See gh-18870
2019-11-05 09:18:32 +01:00
Jens Teglhus Møller c34516cd9e Document Settings as jooq supported auto-configuration type
See gh-18870
2019-11-05 09:17:25 +01:00
Andy Wilkinson c2e11da5ba Upgrade to Spring Integration 5.2.1.RELEASE
Closes gh-18764
2019-11-05 08:07:34 +00:00
Andy Wilkinson de0e8b87d1 Upgrade to Spring Integration 5.1.9.RELEASE
Closes gh-18763
2019-11-05 08:06:03 +00:00
Andy Wilkinson 4b25339d57 Upgrade to Spring Security 5.1.7.RELEASE
Closes gh-18874
2019-11-05 08:05:48 +00:00
Andy Wilkinson c430035450 Upgrade to Spring Security 5.2.1
Closes gh-18869
2019-11-04 20:11:32 +00:00
Andy Wilkinson afbf256955 Upgrade to Micrometer 1.3.1
Closes gh-18867
2019-11-04 18:34:03 +00:00
Andy Wilkinson 377a8ee7cc Upgrade to Spring Kafka 2.3.2.RELEASE
Closes gh-18766
2019-11-04 16:45:41 +00:00
Andy Wilkinson b772d81f3a Upgrade to Spring AMQP 2.2.1.RELEASE
Closes gh-18762
2019-11-04 16:45:02 +00:00
Andy Wilkinson 8eb2146158 Upgrade to Spring Ws 3.0.8.RELEASE
Closes gh-18866
2019-11-04 16:44:38 +00:00
Andy Wilkinson c5eaf645d5 Upgrade to Spring Kafka 2.2.11.RELEASE
Closes gh-18765
2019-11-04 16:43:06 +00:00
Andy Wilkinson 4ffd44a235 Upgrade to Spring Ws 3.0.8.RELEASE
Closes gh-18865
2019-11-04 16:42:42 +00:00
Andy Wilkinson ea5fa2ccac Upgrade to Slf4j 1.7.29
Closes gh-18863
2019-11-04 15:51:56 +00:00
Andy Wilkinson 6731ad8197 Upgrade to Jooq 3.12.3
Closes gh-18862
2019-11-04 15:51:55 +00:00