Commit Graph

33172 Commits

Author SHA1 Message Date
Roman Zabaluev
044c902a8c Improve failure analysis with a single bean cycle
See gh-26292
2021-04-30 13:18:13 +02:00
Stephane Nicoll
4febe6485c Merge branch '2.4.x'
Closes gh-26318
2021-04-30 08:53:31 +02:00
Stephane Nicoll
63d486158d Merge branch '2.3.x' into 2.4.x
Closes gh-26317
2021-04-30 08:53:20 +02:00
Stephane Nicoll
3f528bb0eb Mark SpringBootConfiguration as Indexed
Previously, users of the components.index could not use the index in
scenario where Spring Boot needs to locate the SpringBootConfiguration
to use to bootstrap the test context, as AnnotatedClassFinder scans
the classpath for that stereotype specifically and that requires a
dedicated entry for it.

This commit makes sure that a SpringBootConfiguration-annotated type has
a dedicated entry in the components index.

Closes gh-26308
2021-04-30 08:47:45 +02:00
Stephane Nicoll
56a703751e Merge pull request #26316 from dreis2211
* pr/26316:
  Fix link to Webservices reference docs

Closes gh-26316
2021-04-30 08:27:35 +02:00
dreis2211
ca3105920b Fix link to Webservices reference docs
See gh-26316
2021-04-30 08:27:22 +02:00
Phillip Webb
33c6c600a9 Split up adoc files
Closes gh-23254
2021-04-29 17:32:27 -07:00
Scott Frederick
bb8188b681 Merge branch '2.4.x'
Closes gh-26313
2021-04-29 16:16:32 -05:00
Scott Frederick
17fa215cf5 Merge branch '2.3.x' into 2.4.x
Closes gh-26312
2021-04-29 15:33:33 -05:00
Scott Frederick
c37b9b8a8e Use layout configuration in Maven build-image goal
This commit changes the Maven build-image goal to honor the `layout` and
`layoutFactory` parameters to ensure that the archive content sent to the
builder is the same as is used by the `repackage` goal to build the
archive file.

Fixes gh-26216
2021-04-29 15:03:08 -05:00
Andy Wilkinson
5d8a64e186 Validate section IDs in the reference documentation
See gh-26307
2021-04-29 15:40:54 +01:00
Andy Wilkinson
5a3c354e6c Merge branch '2.4.x'
Closes gh-26303
2021-04-29 12:24:18 +01:00
Andy Wilkinson
4abd6b1387 Merge branch '2.3.x' into 2.4.x
Closes gh-26302
2021-04-29 12:24:06 +01:00
Andy Wilkinson
3cc1ed28ca Order test tasks to run after Checkstyle and formatting checks
Closes gh-26284
2021-04-29 12:23:02 +01:00
Andy Wilkinson
fa81b41afc Merge branch '2.4.x'
Closes gh-26301
2021-04-29 11:37:13 +01:00
Andy Wilkinson
94519c33b1 Merge branch '2.3.x' into 2.4.x
Closes gh-26300
2021-04-29 11:36:15 +01:00
Andy Wilkinson
ef5fbb0669 Configure bootBuildImage's targetJavaVersion using a provider
Previously, the targetJavaVersion property of bootBuildImage was set
using the project's target compatibility directly. This meant that
property's value would reflect the configured target compatibility at
the time of the task's creation and any subsequent changes to the
target compatibility would be missed.

This commit updates the registration of the bootBuildImage task to set
the value of the targetJavaVersion property using a provider. This
indirection means that the project's target compatibility isn't read
until the value of the targetJavaVersion is read, allowing any changes
to the target compatibility to be picked up even if they're made after
the bootBuildImage task has been created.

Fixes gh-26297
2021-04-29 11:36:03 +01:00
Stephane Nicoll
242f2ba6bd Merge branch '2.4.x'
Closes gh-26299
2021-04-29 12:30:09 +02:00
Stephane Nicoll
f8a4aefce0 Merge branch '2.3.x' into 2.4.x
Closes gh-26298
2021-04-29 12:29:55 +02:00
Stephane Nicoll
0c09841013 Document property names to enable reactive health indicators
Closes gh-26279
2021-04-29 12:28:43 +02:00
Stephane Nicoll
212934b313 Merge branch '2.4.x' 2021-04-29 10:18:06 +02:00
Stephane Nicoll
a136836d1e Upgrade Java 16 version in CI image
Closes gh-26289
2021-04-29 10:17:59 +02:00
Stephane Nicoll
6786f8ece9 Upgrade Ubuntu version in CI images
Closes gh-26290
2021-04-29 10:17:20 +02:00
Stephane Nicoll
27ae77000c Merge branch '2.3.x' into 2.4.x 2021-04-29 10:16:05 +02:00
Stephane Nicoll
61758b04ae Upgrade Java 16 version in CI image
Closes gh-26291
2021-04-29 10:15:40 +02:00
Stephane Nicoll
a3414fe803 Upgrade Ubuntu version in CI images
Closes gh-26288
2021-04-29 10:15:03 +02:00
Stephane Nicoll
5e284d9434 Upgrade Ubuntu version in CI images
Closes gh-26287
2021-04-29 10:13:59 +02:00
Phillip Webb
5dce5ee595 Align adoc filename with anchors
See gh-26296
2021-04-28 22:34:16 -07:00
Phillip Webb
bd3f4d74be Rationalize reference documentation anchors
Closes gh-26296
2021-04-28 21:56:51 -07:00
Phillip Webb
3d9eb9e413 Switch to spring-asciidoctor-backends SNAPSHOT
See gh-26293
2021-04-28 21:53:33 -07:00
Andy Wilkinson
1be8c8fda9 Merge branch '2.4.x'
See gh-26261
2021-04-28 19:50:44 +01:00
Andy Wilkinson
4417e16963 Merge branch '2.3.x' into 2.4.x
See gh-26260
2021-04-28 19:50:17 +01:00
Andy Wilkinson
3a3eb1bc31 Fix workaround for JDK-8156584
See gh-26252
2021-04-28 19:49:26 +01:00
Andy Wilkinson
c548693fa1 Merge branch '2.4.x'
See gh-26261
2021-04-28 18:25:35 +01:00
Andy Wilkinson
097a436314 Merge branch '2.3.x' into 2.4.x
See gh-26260
2021-04-28 18:25:11 +01:00
Andy Wilkinson
ecd1e536cc Refine workaround for JDK-8156584
The previous workaround worked but prevented caching of every test
task as the value of system property pointing to the custom security
properties file varied from build to build.

This commit refines the workaround to copy the file into the build
directory of the test task's project and reference it using a URL
that's relative to the task's working directory. This ensures that
the value of the system property doesn't change from build to build.

Closes gh-26252
2021-04-28 18:22:37 +01:00
Stephane Nicoll
80248dcc13 Merge branch '2.4.x'
Closes gh-26283
2021-04-28 16:14:58 +02:00
Stephane Nicoll
77a231d742 Merge branch '2.3.x' into 2.4.x
Closes gh-26282
2021-04-28 16:14:46 +02:00
Stephane Nicoll
e7bf0a0bd6 Fix key to datasource health indicator in reference doc
Closes gh-26268
2021-04-28 16:14:06 +02:00
Stephane Nicoll
414c466f23 Merge branch '2.4.x' 2021-04-28 15:14:49 +02:00
Stephane Nicoll
52994027f4 Fix checkstyle violation 2021-04-28 15:14:33 +02:00
Stephane Nicoll
7465eb0f03 Merge branch '2.4.x' 2021-04-28 15:12:45 +02:00
Stephane Nicoll
85e1cc4d65 Fix checkstyle violation 2021-04-28 15:12:22 +02:00
Andy Wilkinson
03149eda9e Merge branch '2.4.x'
Closes gh-26278
2021-04-28 13:34:52 +01:00
Andy Wilkinson
9cd15a1360 Merge branch '2.3.x' into 2.4.x
Closes gh-26276
2021-04-28 13:20:11 +01:00
Andy Wilkinson
79ecf596ec Set path sensitivity when configuring additional task inputs
Previously a number of file- or directory-based task inputs were
configured with specifying their path sensitivity. This meant
that the default absolute path sensitivity was used. For caches
that are cacheable this would result in a cache miss when the
inputs were identical other than being located at a different
absolute path as they are when running a CI build vs a local build.

This commit updates the configuration of additional task inputs
to use relative path sensitivity. A property name for each input has
also been configured. This makes them easier to identify in build
scans.

Closes gh-26270
2021-04-28 13:16:36 +01:00
Stephane Nicoll
09ae65e3b7 Merge branch '2.4.x'
Closes gh-26277
2021-04-28 14:13:11 +02:00
Stephane Nicoll
05b09907e0 Merge branch '2.3.x' into 2.4.x
Closes gh-26275
2021-04-28 14:12:35 +02:00
Stephane Nicoll
70079f917c Merge pull request #26230 from zeldigas
* pr/26230:
  Polish "Fix ordering of metadata entries"
  Fix ordering of metadata entries

Closes gh-26230
2021-04-28 14:12:19 +02:00
Stephane Nicoll
d610f3c2ff Polish "Fix ordering of metadata entries"
See gh-26230
2021-04-28 14:07:37 +02:00