Commit Graph

27462 Commits

Author SHA1 Message Date
Andy Wilkinson
be32843dab Configure generated snippets as inputs to the Asciidoctor tasks
Closes gh-22819
2020-08-07 11:28:58 +01:00
Andy Wilkinson
8f27ad9726 Remove version from name of Ant-built jar
Previously, the project version was included in the name of the
Ant-built jar and the integration test assumed that there would be a
single jar in the output directory. This assumption did not hold true
if the project's version had changed and the project had been built
again without a clean. This resulted in two jars, one for the previous
version and one for the current version, in the output directory. This
caused a test failure.

This commit updates the build.xml to remove the version from the name
of the Ant-built jar and updates the integration test to find it.

Closes gh-22782
2020-08-07 09:49:14 +01:00
Andy Wilkinson
95b504ccad Make processResources out-of-date on version change
Closes gh-22780
2020-08-07 09:44:16 +01:00
Madhura Bhave
3f82ca40e2 Merge branch '2.2.x' into 2.3.x
Closes gh-22774
2020-08-06 17:59:30 -07:00
Madhura Bhave
f39f33bb8d Fix documentation related to the health endpoint's inner details
Closes gh-22490
2020-08-06 17:57:56 -07:00
Andy Wilkinson
d064ccabc4 Ensure Maven plugin descriptor inputs are out-of-date on version change
Closes gh-22766
2020-08-06 18:18:04 +01:00
Phillip Webb
4924573074 Merge branch '2.2.x' into 2.3.x 2020-08-06 10:15:22 -07:00
Phillip Webb
fdd6a89a61 Polish 2020-08-06 10:14:01 -07:00
Andy Wilkinson
11d1002f15 Merge branch '2.2.x' into 2.3.x
Closes gh-22767
2020-08-06 15:13:55 +01:00
Andy Wilkinson
07699ea6ff Retry when dependency resolution fails in ModifiedClassPathClassLoader
Closes gh-22763
2020-08-06 15:12:20 +01:00
Andy Wilkinson
327138c227 Merge branch '2.2.x' into 2.3.x 2020-08-06 13:34:12 +01:00
Andy Wilkinson
63f7c75b61 Polish 2020-08-06 13:34:01 +01:00
Andy Wilkinson
c121f9f61f Merge branch '2.2.x' into 2.3.x
Closes gh-22758
2020-08-06 09:21:29 +01:00
Andy Wilkinson
b53f54f2cf Add tip about using AopTestUtils.getTargetProxy with proxied spy beans
Closes gh-22281
2020-08-06 09:21:11 +01:00
Stephane Nicoll
235f5e1103 Upgrade Java 8 version in CI image
Closes gh-22754
2020-08-06 09:39:38 +02:00
Stephane Nicoll
895383e182 Merge branch '2.2.x' into 2.3.x 2020-08-06 09:39:05 +02:00
Stephane Nicoll
6232ece61d Upgrade Java 8 version in CI image
Closes gh-22752
2020-08-06 09:38:19 +02:00
Stephane Nicoll
63718d4e72 Merge branch '2.1.x' into 2.2.x 2020-08-06 09:37:55 +02:00
Stephane Nicoll
64264b5240 Upgrade Java 8 version in CI image
Closes gh-22755
2020-08-06 09:37:04 +02:00
Andy Wilkinson
a160755da5 Merge branch '2.2.x' into 2.3.x
Closes gh-22748
2020-08-05 18:15:45 +01:00
Andy Wilkinson
bfe250e5d3 Clarify docs on schema and data SQL scripts with Flyway and Liquibase
Closes gh-20920
2020-08-05 18:14:39 +01:00
Andy Wilkinson
c40835eba0 Merge branch '2.2.x' into 2.3.x
Closes gh-22746
2020-08-05 17:47:24 +01:00
Andy Wilkinson
71ffb44a3c Remove WebClient's in-memory buffer size limit for endpoint tests
Previously, the endpoints' responses could occasionally exceed
WebClient's in-memory buffer limt, for example if the threads endpoint
was reporting a large number of threads or the threads had large
stacks.

This commit disables WebClient's in-memory buffer size limit so that
the tests passing is not dependent on the size of the endpoints'
responses.

Closes gh-22743
2020-08-05 17:37:44 +01:00
Stephane Nicoll
cccf9c24e2 Merge pull request #22740 from izeye
* pr/22740:
  Polish

Closes gh-22740
2020-08-05 18:00:19 +02:00
Johnny Lim
1017774ed5 Polish
See gh-22740
2020-08-05 17:59:03 +02:00
Andy Wilkinson
94644f3814 Merge branch '2.2.x' into 2.3.x
Closes gh-22737
2020-08-05 09:05:10 +01:00
Andy Wilkinson
2238b0d797 Try to make FileSystemWatcherTests.waitsForQuietPeriod() more robust
Previously, waitsForQuietPeriod would iterate 10 times, touching a new
file and then sleeping for 100ms at it did so. With a quiet period of
200ms, this was intended to result in a single change set containing
10 files. However, the test would fail occasionally as multiple change
sets were detected. The test is multi-threaded and is, therefore, at
the mercy of the scheduler. If the thread that is iterating and
touching the files takes over 200ms to be scheduled – exceeding the
watcher's quiet period – the watcher may detect a change set while the
changes are still being made. Eliminating this possibilty would require
the test to participate in the watcher's synchronization, which would
require some changes to its implementation. Instead, this commit
aims to avoid the problem by sleeping for 1/10 of the time (10ms) and
expecting a single change set of 100 files. The hope is that the much
shorter sleep time will result in the file touching thread being
scheduled well within the 200ms quiet period.

Closes gh-22732
2020-08-05 09:00:49 +01:00
Scott Frederick
21b2dd2740 Allow empty env entries when building an image
Prior to this commit, an entry in the environment map provided to the
build plugin image building goal or task that had a null value would
result in a failure with a message that was difficult to diagnose.

This commit treats env map entries with a null value as an empty
entry to prevent the failure and also make it easier to provide an
explicit empty entry in the Maven XML.

Fixes gh-22703
2020-08-04 15:29:29 -05:00
Andy Wilkinson
1233288df0 Disable JarLaunchScriptIntegrationTests without Docker
See gh-21388
2020-08-04 18:23:06 +01:00
Andy Wilkinson
34eab5da95 Disable caching of changing modules
Closes gh-22726
2020-08-04 15:36:01 +01:00
Andy Wilkinson
db4f451d5b Merge branch '2.2.x' into 2.3.x 2020-08-04 14:58:06 +01:00
Andy Wilkinson
4424055793 Merge branch '2.1.x' into 2.2.x 2020-08-04 14:57:55 +01:00
Andy Wilkinson
8f03fb4c75 Upgrade to Gradle Enterprise Maven Extension 1.6.1
Closes gh-22717
2020-08-04 14:57:36 +01:00
Andy Wilkinson
dbce4e4710 Merge branch '2.2.x' into 2.3.x 2020-08-04 13:38:14 +01:00
Andy Wilkinson
5152147571 Merge branch '2.1.x' into 2.2.x
Closes gh-22723
2020-08-04 13:37:53 +01:00
Andy Wilkinson
9da0372330 Upgrade to Gradle Enterprise Maven Extension 1.6.1
Closes gh-22717
2020-08-04 13:37:40 +01:00
Andy Wilkinson
323b097623 Merge branch '2.2.x' into 2.3.x
Closes gh-22721
2020-08-04 13:32:49 +01:00
Andy Wilkinson
c2ea114b61 Merge pull request #21388 from aivinog1
* gh-21388:
  Polish "Test the launch script when executed directly"
  Test the launch script when executed directly

Closes gh-21388
2020-08-04 11:30:13 +01:00
Andy Wilkinson
84ff233590 Polish "Test the launch script when executed directly"
See gh-21388
2020-08-04 11:29:53 +01:00
Alexey Vinogradov
02a6a84499 Test the launch script when executed directly
See gh-21388
2020-08-04 10:18:35 +01:00
Madhura Bhave
43c0b3d4dc Merge branch '2.2.x' into 2.3.x 2020-08-03 17:13:26 -07:00
Madhura Bhave
b14bd45399 Fix syntax for slack notification
See gh-22709
2020-08-03 17:08:30 -07:00
Andy Wilkinson
6ca4e22831 Merge branch '2.2.x' into 2.3.x 2020-08-03 19:22:20 +01:00
Andy Wilkinson
944fe4c660 Polish 2020-08-03 19:21:29 +01:00
Andy Wilkinson
992deb4647 Merge branch '2.2.x' into 2.3.x
Closes gh-22711
2020-08-03 19:18:28 +01:00
Andy Wilkinson
a334134fd0 Make Slack build failure notifications more noticeable
Closes gh-22709
2020-08-03 19:16:01 +01:00
Stephane Nicoll
13f1d00048 Merge branch '2.2.x' into 2.3.x
Closes gh-22706
2020-08-03 15:01:07 +02:00
Stephane Nicoll
4082cddce2 Merge branch '2.1.x' into 2.2.x
Closes gh-22705
2020-08-03 15:00:41 +02:00
Stephane Nicoll
bc020d95b6 Merge pull request #22704 from izeye
* pr/22704:
  Fix broken links to Micrometer registry docs

Closes gh-22704
2020-08-03 14:59:42 +02:00
Johnny Lim
bd2874de49 Fix broken links to Micrometer registry docs
See gh-22704
2020-08-03 14:58:22 +02:00