Commit Graph

7334 Commits

Author SHA1 Message Date
Madhura Bhave
4e96c0ff1b Merge branch '2.2.x'
Closes gh-19060
2019-11-19 11:55:24 -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
733071bb00 Merge branch '2.2.x'
Closes gh-19050
2019-11-19 17:57:47 +01:00
Stephane Nicoll
a003a5c8ab Upgrade to Kotlin 1.3.60
Closes gh-19046
2019-11-19 17:56:40 +01:00
Stephane Nicoll
0b89b2ddf8 Merge branch '2.2.x'
Closes gh-19033
2019-11-16 09:41:10 +03: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
e01a1ba658 Merge branch '2.2.x'
Closes gh-19031
2019-11-16 09:37:26 +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
c8dfec4b38 Merge branch '2.2.x'
Closes gh-19011
2019-11-13 14:48:31 -08:00
Madhura Bhave
b6ff0b7c5f Support constructor binding on 3rd party classes
Closes gh-18935
2019-11-13 14:28:58 -08:00
Stephane Nicoll
d0c85506d1 Merge branch '2.2.x'
Closes gh-19004
2019-11-13 13:37:50 +01: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
Stephane Nicoll
199540b2c4 Merge branch '2.2.x'
Closes gh-19001
2019-11-13 08:53:19 +01:00
Johnny Lim
96a029e44f Polish a test name
See gh-18999
2019-11-13 08:52:32 +01:00
Stephane Nicoll
a1ee2134bc Merge branch '2.2.x'
Closes gh-18964
2019-11-12 14:10:41 +01:00
Johnny Lim
ddb22f5a52 Polish test methods
See gh-18962
2019-11-12 14:09:44 +01:00
Stephane Nicoll
ec5e407ce3 Merge branch '2.2.x'
Closes gh-18963
2019-11-12 14:07:21 +01:00
dreis2211
6b500d82b4 Polish
See gh-18918
2019-11-12 14:06:47 +01:00
Stephane Nicoll
c56b75be3c Merge branch '2.2.x' 2019-11-12 14:05:05 +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
b9f4a9c075 Merge branch '2.2.x'
Closes gh-18957
2019-11-11 16:37:56 +00: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
a933e08359 Merge branch '2.2.x'
Closes gh-18947
2019-11-08 15:04:50 -08:00
Madhura Bhave
f9dc81558a Remove samples references from docs
Fixes gh-18904
2019-11-08 14:56:52 -08:00
Andy Wilkinson
bd1707970a Merge branch '2.2.x'
Closes gh-18944
2019-11-08 15:01:47 +00: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
dbef470833 Upgrade to Maven Source Plugin 3.2.0
Closes gh-18930
2019-11-08 14:13:32 +00:00
Andy Wilkinson
7133912381 Upgrade to Maven Jar Plugin 3.2.0
Closes gh-18929
2019-11-08 14:13:32 +00:00
Andy Wilkinson
913e4796ee Upgrade to Maven Assembly Plugin 3.2.0
Closes gh-18928
2019-11-08 14:13:32 +00:00
Andy Wilkinson
d841a91fb5 Upgrade to Webjars Locator Core 0.42
Closes gh-18927
2019-11-08 14:13:32 +00:00
Andy Wilkinson
611dfec433 Upgrade to Pooled Jms 1.1.0
Closes gh-18926
2019-11-08 14:13:32 +00:00
Andy Wilkinson
41426a3816 Upgrade to Mariadb 2.5.1
Closes gh-18925
2019-11-08 14:13:32 +00:00
Andy Wilkinson
4e6f56d1f4 Upgrade to Influxdb Java 2.16
Closes gh-18924
2019-11-08 14:13:32 +00:00
Andy Wilkinson
506109987d Upgrade to Hibernate Validator 6.1.0.Final
Closes gh-18923
2019-11-08 14:13:32 +00:00
Andy Wilkinson
870aa86eb9 Upgrade to Hamcrest 2.2
Closes gh-18922
2019-11-08 14:13:32 +00:00
Andy Wilkinson
5692960377 Upgrade to Assertj 3.14.0
Closes gh-18921
2019-11-08 13:37:54 +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