Commit Graph

31043 Commits

Author SHA1 Message Date
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
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
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
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
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
52994027f4 Fix checkstyle violation 2021-04-28 15:14:33 +02: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
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
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
d98fe36b88 Merge branch '2.3.x' into 2.4.x 2021-04-28 13:57:45 +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
cf1b29ebd4 Merge branch '2.3.x' into 2.4.x
Closes gh-26272
2021-04-28 12:28:10 +01: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
79d27344e0 Merge branch '2.3.x' into 2.4.x
Closes gh-26260
2021-04-27 17:32:49 +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
a1138efc5f Merge branch '2.3.x' into 2.4.x
Closes gh-26256
2021-04-27 15:18:23 +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
4743ccc261 Merge branch '2.3.x' into 2.4.x 2021-04-27 11:57:42 +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
ffc06e1e30 Merge branch '2.3.x' into 2.4.x
Closes gh-26250
2021-04-27 11:51:29 +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
b1c32f2a8a Merge branch '2.3.x' into 2.4.x
Closes gh-26245
2021-04-27 10:39:36 +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
94a70d6837 Merge branch '2.3.x' into 2.4.x
Closes gh-26241
2021-04-26 17:42:00 -07:00
Phillip Webb
f82b33698d Add missing asciidoctor heading anchors
Closes gh-26239
2021-04-26 17:35:14 -07:00
Andy Wilkinson
11fa850b97 Merge branch '2.3.x' into 2.4.x
Closes gh-26236
2021-04-26 15:53:18 +01:00
Andy Wilkinson
4a990f3ed2 Use bean class loader when importing auto-configuration
Fixes gh-26234
2021-04-26 15:38:01 +01:00
Brian Clozel
7be9c268b8 Fix ignored use-last-modified property in Spring MVC
Prior to this commit, the `spring.web.resources.cache.use-last-modified`
configuration property support was lost during a merge operation right
before 2.4.2.

This is due to an invalid test that missed this unintended change. This
commit fixes both problems.

Fixes gh-26212
2021-04-26 11:34:47 +02:00
Stephane Nicoll
e424c1c4b4 Merge branch '2.3.x' into 2.4.x
Closes gh-26210
2021-04-22 14:48:15 +02: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
Shimizu, Yuko
474e460d5e Align Maven version in system requirements with what is actually tested
See gh-26209
2021-04-22 14:47:29 +02:00
Stephane Nicoll
65a7422a45 Upgrade to Kafka 2.6.2
Closes gh-24247
2021-04-22 14:12:55 +02:00
Stephane Nicoll
0ad7597f56 Merge branch '2.3.x' into 2.4.x 2021-04-22 11:09:50 +02:00
Stephane Nicoll
df2f6a4b39 Upgrade Java 11 version in CI image
Closes gh-26194
2021-04-22 11:09:34 +02:00
Stephane Nicoll
4c6aece927 Upgrade Java 8 version in CI image
Closes gh-26195
2021-04-22 11:09:04 +02:00
Stephane Nicoll
410641d336 Upgrade Java 11 version in CI image
Closes gh-26198
2021-04-22 11:08:04 +02:00
Stephane Nicoll
e5a9defbc5 Upgrade Java 8 version in CI image
Closes gh-26197
2021-04-22 11:07:36 +02:00
Stephane Nicoll
db7460ddd5 Polish contribution based on Andy's review
See gh-26188
2021-04-21 17:23:21 +02:00
Stephane Nicoll
b1170efd3b Merge pull request #26188 from izeye
* pr/26188:
  Polish

Closes gh-26188
2021-04-21 17:18:53 +02:00