Commit Graph

28946 Commits

Author SHA1 Message Date
Andy Wilkinson
ece845a4e0 Upgrade to Micrometer 1.5.14
Closes gh-26427
2021-05-12 14:09:27 +01:00
Andy Wilkinson
1a32a864d4 Upgrade to Spring Framework 5.2.15.RELEASE
Closes gh-26425
2021-05-12 11:30:57 +01:00
Stephane Nicoll
526af5a790 Upgrade to Reactor Dysprosium-SR20
Closes gh-26424
2021-05-11 15:55:14 +02:00
Stephane Nicoll
5cdabc9729 Start building against Spring Kafka 2.5.13 snapshots
See gh-26429
2021-05-11 13:29:00 +02:00
Stephane Nicoll
47d5592035 Start building against Spring AMQP 2.2.17 snapshots
See gh-26428
2021-05-11 13:28:28 +02:00
Stephane Nicoll
3a8500126b Start building against Micrometer 1.5.14 snapshots
See gh-26427
2021-05-11 13:27:57 +02:00
Stephane Nicoll
9772867862 Start building against Spring Batch 4.2.7 snapshots
See gh-26426
2021-05-11 13:26:58 +02:00
Stephane Nicoll
66fe98eb3f Start building against Spring Framework 5.2.15 snapshots
See gh-26425
2021-05-11 10:05:47 +02:00
Stephane Nicoll
c059759c4d Start building against Reactor Dysprosium-SR20 snapshots
See gh-26424
2021-05-11 10:05:00 +02:00
Andy Wilkinson
6daf67a88c Upgrade to Gradle 6.9
Closes gh-26408
2021-05-07 11:21:24 +01:00
Stephane Nicoll
22e965fd61 Merge pull request #26399 from nguyensach
* pr/26399:
  Fix wrong reference to Cassandra in DockerImageNames#couchbase

Closes gh-26399
2021-05-07 09:14:26 +02:00
Sach Nguyen
afa77b8253 Fix wrong reference to Cassandra in DockerImageNames#couchbase
See gh-26399
2021-05-07 09:12:43 +02:00
Andy Wilkinson
ef9e3bafff Test our Gradle plugin against 6.9-rc-2
Closes gh-26395
2021-05-06 20:10:54 +01:00
Andy Wilkinson
b3275c5647 Align productionRuntimeClasspath with runtimeClasspath
Fixes gh-25798
2021-05-05 09:52:44 +01:00
Andy Wilkinson
deca737b01 Configure source and target compatibility at the task level
Closes gh-26350
2021-05-04 10:29:54 +01:00
Andy Wilkinson
4c42810df9 Ensure that server tests pick up latest snapshots
Closes gh-25921
2021-05-04 09:51:15 +01:00
Andy Wilkinson
6440843358 Do not wait indefinitely in initialize test if refresh fails
Closes gh-26286
2021-05-04 09:44:56 +01:00
Scott Frederick
524ab4cea7 Move content from CONTRIBUTING.adoc to the wiki
Closes gh-26332
2021-04-30 14:14:22 -05:00
Andy Wilkinson
94ca2d1e78 Test the Gradle plugin against Gradle 6.9-rc-1
Closes gh-26267
2021-04-30 16:52:52 +01:00
Stephane Nicoll
07358c6b79 Support reactive infrastructure with DataRedisTest
Previously DataRedisTest-annotated test could not use reactive
operations as RedisReactiveAutoConfiguration is not considered. This
commit includes this auto-configuration and adds a test to exercise this
scenario.

Closes gh-26319
2021-04-30 14:32:25 +02:00
Stephane Nicoll
a35abf6554 Merge pull request #26321 from matthiasstock
* pr/26321:
  Update copyright year of changed file
  Fix typo in NamedContributors Javadoc

Closes gh-26321
2021-04-30 13:39:27 +02:00
Stephane Nicoll
af70da0e92 Update copyright year of changed file
See gh-26321
2021-04-30 13:35:28 +02:00
Matthias Stock
6c8c735027 Fix typo in NamedContributors Javadoc
See gh-26321
2021-04-30 13:35:17 +02:00
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
2021-04-30 13:32:24 +02:00
Stephane Nicoll
a6e59b357f Polish "Improve failure analysis with a single bean cycle"
See gh-26292
2021-04-30 13:30:58 +02:00
Roman Zabaluev
044c902a8c Improve failure analysis with a single bean cycle
See gh-26292
2021-04-30 13:18:13 +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
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
3cc1ed28ca Order test tasks to run after Checkstyle and formatting checks
Closes gh-26284
2021-04-29 12:23:02 +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
0c09841013 Document property names to enable reactive health indicators
Closes gh-26279
2021-04-29 12:28:43 +02:00
Stephane Nicoll
5e284d9434 Upgrade Ubuntu version in CI images
Closes gh-26287
2021-04-29 10:13:59 +02:00
Andy Wilkinson
3a3eb1bc31 Fix workaround for JDK-8156584
See gh-26252
2021-04-28 19:49:26 +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
e7bf0a0bd6 Fix key to datasource health indicator in reference doc
Closes gh-26268
2021-04-28 16:14:06 +02: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
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
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
2021-04-28 14:07:37 +02:00
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
2021-04-28 13:54:35 +02:00
Andy Wilkinson
e4d93b3624 Merge pull request #26264 from dreis2211
* gh-26264:
  Rename nohttp whitelist to allowlist

Closes gh-26264
2021-04-28 12:27:53 +01:00
dreis2211
9b1b47ae5d Rename nohttp whitelist to allowlist
See gh-26264
2021-04-28 11:39:52 +01:00
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
2021-04-27 17:27:28 +01:00
Andy Wilkinson
a470c1af3a Align documentation with main default branch name
Closes gh-26255
2021-04-27 15:18:00 +01:00
Andy Wilkinson
2ab679aceb Update prepare-forward-merge following master->main rename
See gh-26248
2021-04-27 11:57:27 +01:00
Andy Wilkinson
715c4febf9 Update maformed address to one that should fail on CI
Closes gh-26247
2021-04-27 11:50:52 +01:00
Andy Wilkinson
ad67c3d50f Avoid using yum (which requires http:// access) in launch script tests
Fixes gh-26240
2021-04-27 10:39:19 +01:00
Phillip Webb
f82b33698d Add missing asciidoctor heading anchors
Closes gh-26239
2021-04-26 17:35:14 -07:00
Andy Wilkinson
4a990f3ed2 Use bean class loader when importing auto-configuration
Fixes gh-26234
2021-04-26 15:38:01 +01:00
Stephane Nicoll
1d88e8fa65 Merge pull request #26209 from zoosm3
* pr/26209:
  Align Maven version in system requirements with what is actually tested

Closes gh-26209
2021-04-22 14:48:06 +02:00