Commit Graph

31055 Commits (4ccce2a74f4a8d935b5010de6426e130b478a2a6)
 

Author SHA1 Message Date
Stephane Nicoll 4ccce2a74f Merge branch '2.3.x' into 2.4.x
Closes gh-26322
4 years ago
Stephane Nicoll 1af7fa228b Merge pull request #26292 from Haarolean
* pr/26292:
  Polish "Improve failure analysis with a single bean cycle"
  Improve failure analysis with a single bean cycle

Closes gh-26292
4 years ago
Stephane Nicoll a6e59b357f Polish "Improve failure analysis with a single bean cycle"
See gh-26292
4 years ago
Roman Zabaluev 044c902a8c Improve failure analysis with a single bean cycle
See gh-26292
4 years ago
Stephane Nicoll 63d486158d Merge branch '2.3.x' into 2.4.x
Closes gh-26317
4 years ago
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
4 years ago
Scott Frederick 17fa215cf5 Merge branch '2.3.x' into 2.4.x
Closes gh-26312
4 years ago
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
4 years ago
Andy Wilkinson 4abd6b1387 Merge branch '2.3.x' into 2.4.x
Closes gh-26302
4 years ago
Andy Wilkinson 3cc1ed28ca Order test tasks to run after Checkstyle and formatting checks
Closes gh-26284
4 years ago
Andy Wilkinson 94519c33b1 Merge branch '2.3.x' into 2.4.x
Closes gh-26300
4 years ago
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
4 years ago
Stephane Nicoll f8a4aefce0 Merge branch '2.3.x' into 2.4.x
Closes gh-26298
4 years ago
Stephane Nicoll 0c09841013 Document property names to enable reactive health indicators
Closes gh-26279
4 years ago
Stephane Nicoll 27ae77000c Merge branch '2.3.x' into 2.4.x 4 years ago
Stephane Nicoll 61758b04ae Upgrade Java 16 version in CI image
Closes gh-26291
4 years ago
Stephane Nicoll a3414fe803 Upgrade Ubuntu version in CI images
Closes gh-26288
4 years ago
Stephane Nicoll 5e284d9434 Upgrade Ubuntu version in CI images
Closes gh-26287
4 years ago
Andy Wilkinson 4417e16963 Merge branch '2.3.x' into 2.4.x
See gh-26260
4 years ago
Andy Wilkinson 3a3eb1bc31 Fix workaround for JDK-8156584
See gh-26252
4 years ago
Andy Wilkinson 097a436314 Merge branch '2.3.x' into 2.4.x
See gh-26260
4 years ago
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
4 years ago
Stephane Nicoll 77a231d742 Merge branch '2.3.x' into 2.4.x
Closes gh-26282
4 years ago
Stephane Nicoll e7bf0a0bd6 Fix key to datasource health indicator in reference doc
Closes gh-26268
4 years ago
Stephane Nicoll 52994027f4 Fix checkstyle violation 4 years ago
Andy Wilkinson 9cd15a1360 Merge branch '2.3.x' into 2.4.x
Closes gh-26276
4 years ago
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
4 years ago
Stephane Nicoll 05b09907e0 Merge branch '2.3.x' into 2.4.x
Closes gh-26275
4 years ago
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
4 years ago
Stephane Nicoll d610f3c2ff Polish "Fix ordering of metadata entries"
See gh-26230
4 years ago
Dmitry Pavlov 3e34b0a60a Fix ordering of metadata entries
This commit provides a consistent ordering for groups that share the
same configuration property prefix.

See gh-26230
4 years ago
Stephane Nicoll d98fe36b88 Merge branch '2.3.x' into 2.4.x 4 years ago
Stephane Nicoll 20da9826cc Disable incrementalBuildTypeRenamed test
This commit disables a test that does not test what it is supposed to
and improve the Metadata assertions to fail early if more than one
matching item by name and type is found in the metadata.

See gh-26271
4 years ago
Andy Wilkinson cf1b29ebd4 Merge branch '2.3.x' into 2.4.x
Closes gh-26272
4 years ago
Andy Wilkinson e4d93b3624 Merge pull request #26264 from dreis2211
* gh-26264:
  Rename nohttp whitelist to allowlist

Closes gh-26264
4 years ago
dreis2211 9b1b47ae5d Rename nohttp whitelist to allowlist
See gh-26264
4 years ago
Andy Wilkinson 79d27344e0 Merge branch '2.3.x' into 2.4.x
Closes gh-26260
4 years ago
Andy Wilkinson 912c82e50d Work around https://bugs.openjdk.java.net/browse/JDK-8156584
sun.security.x509.AlgorithmId.get(String) isn't thread-safe and can
lead to null be returned for an algorithm that should be present.

This commit aims to work around this problem by avoiding the call
to AlgorithmId.get(String). It does so by configuring the
PKCS12 key protection algorithm to one that starts with
pbewithhmacsha (case insensitive). This short-circuits the logic
in PKCS12KeyStore.mapPBEAlgorithmToOID(String) and avoids the call to
AlgorithmId.get(String). Thanks again to @dreis2211 for the
suggestion.

The work around is only used when building with Java 8 as the problem
was fixed in Java 9.

Closes gh-26252
4 years ago
Andy Wilkinson a1138efc5f Merge branch '2.3.x' into 2.4.x
Closes gh-26256
4 years ago
Andy Wilkinson a470c1af3a Align documentation with main default branch name
Closes gh-26255
4 years ago
Andy Wilkinson 4743ccc261 Merge branch '2.3.x' into 2.4.x 4 years ago
Andy Wilkinson 2ab679aceb Update prepare-forward-merge following master->main rename
See gh-26248
4 years ago
Andy Wilkinson ffc06e1e30 Merge branch '2.3.x' into 2.4.x
Closes gh-26250
4 years ago
Andy Wilkinson 715c4febf9 Update maformed address to one that should fail on CI
Closes gh-26247
4 years ago
Andy Wilkinson b1c32f2a8a Merge branch '2.3.x' into 2.4.x
Closes gh-26245
4 years ago
Andy Wilkinson ad67c3d50f Avoid using yum (which requires http:// access) in launch script tests
Fixes gh-26240
4 years ago
Phillip Webb 94a70d6837 Merge branch '2.3.x' into 2.4.x
Closes gh-26241
4 years ago
Phillip Webb f82b33698d Add missing asciidoctor heading anchors
Closes gh-26239
4 years ago
Andy Wilkinson 11fa850b97 Merge branch '2.3.x' into 2.4.x
Closes gh-26236
4 years ago
Andy Wilkinson 4a990f3ed2 Use bean class loader when importing auto-configuration
Fixes gh-26234
4 years ago