Commit Graph

23924 Commits

Author SHA1 Message Date
Stephane Nicoll 992fcbf68f Merge pull request #18918 from dreis2211
* pr/18918:
  Polish

Closes gh-18918
2019-11-12 14:07:07 +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 84f682de62 Merge pull request #18920 from wonwoo
* pr/18920:
  Polish "Remove reference to ConfigurationPropertiesScan in javadoc"
  Remove reference to ConfigurationPropertiesScan in javadoc

Closes gh-18920
2019-11-08 11:15:21 +01: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 0490bff344 Update CI to use the new 2.2.x maintenance branch 2019-11-07 15:43:26 +00:00
Andy Wilkinson fa97766ef2 Tag CI images with version number rather than branch name
See gh-18844
2019-11-07 14:17:56 +00:00
Andy Wilkinson a8b46d7aa5 Rename CI pipeline to include the version in its name
Closes gh-18844
2019-11-07 14:01:04 +00: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
Spring Buildmaster 93b7baf1f6 Next development version (v2.2.2.BUILD-SNAPSHOT) 2019-11-06 22:36:01 +00:00
Madhura Bhave 75f210a631 Merge branch '2.1.x'
Closes gh-18906
2019-11-06 11:15:46 -08:00
Madhura Bhave 8d3df1b4b8 Make CI credentials requirement lenient when building RestTemplate
Fixes gh-18901
2019-11-06 11:12:20 -08:00
Andy Wilkinson 142934432f Merge branch '2.1.x'
Closes gh-18903
2019-11-06 14:53:19 +00:00
Andy Wilkinson 891c7120ef Wait for distribution to reach Bintray before checking its completeness
Previously, as soon as the distribution of a release from Artifactory
to Bintray had been initiated we would start checking if it was
complete. This created a race condition between the distribution being
created and us checking if it was complete. If the check won the race
and happened before the creation, Bintray would respond with a 404.

This commit updates BintrayService to wait for up to 5 minutes for the
distribution to be created on Bintray. Once it has been created we
then wait for up to 40 minutes for it to be complete as we did before.

The use of Awaitility has been introduced in this commit to simplify
the logic required to wait for the distribution's creation and
completion.

Closes gh-18902
2019-11-06 14:52:50 +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 f57baa71e0 Merge branch '2.1.x' 2019-11-06 12:43:25 +01:00
Spring Buildmaster 8b1ff0a1a9 Next development version (v2.1.11.BUILD-SNAPSHOT) 2019-11-06 11:18:35 +00:00
Stephane Nicoll 684d7cfe38 Upgrade to Mongodb 3.11.2
Closes gh-18898
2019-11-06 09:44:38 +01:00
Stephane Nicoll a31874c76d Merge branch '2.1.x' 2019-11-06 09:40:33 +01:00
Stephane Nicoll c413e5b54e Upgrade to Hazelcast 3.11.5
Closes gh-18897
2019-11-06 09:40:11 +01:00
Stephane Nicoll 8a297aefb3 Merge branch '2.1.x'
Closes gh-18896
2019-11-06 08:24:44 +01:00
Stephane Nicoll 0100322c51 Merge pull request #18855 from TASure
* pr/18855:
  Polish "Polish comment in pom.xml"
  Polish comment in pom.xml

Closes gh-18855
2019-11-06 08:24:22 +01:00
Stephane Nicoll 58e3c6dbcd Polish "Polish comment in pom.xml"
See gh-18855
2019-11-06 08:05:22 +01:00
Nick 28736f9379 Polish comment in pom.xml
See gh-18855
2019-11-06 08:05:00 +01:00
Stephane Nicoll b35573a5aa Merge pull request #18883 from izeye
* pr/18883:
  Use try-with-resources blocks in JarFileArchiveTests

Closes gh-18883
2019-11-06 08:02:50 +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
Stephane Nicoll 6759e8ab11 Merge pull request #18884 from dreis2211
* pr/18884:
  Reduce method visibility in EndpointDiscovererTests

Closes gh-18884
2019-11-05 14:14:36 +01:00
dreis2211 1b2112ea8c Reduce method visibility in EndpointDiscovererTests
See gh-18884
2019-11-05 14:14:24 +01:00
Stephane Nicoll 9b3d625af8 Merge pull request #18808 from markpollack
* pr/18808:
  Polish "Support amqps:// URIs in spring.rabbitmq.addresses"
  Support amqps:// URIs in spring.rabbitmq.addresses

Closes gh-18808
2019-11-05 14:12:15 +01:00