Commit Graph

187 Commits

Author SHA1 Message Date
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
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
Phillip Webb
fb3796dae8 Merge branch '2.3.x' into 2.4.x
Closes gh-26121
2021-04-14 15:02:58 -07:00
Phillip Webb
fcb2210a87 Include optional shade plugin in published pom
Update `MavenPublishingConventions` to add a new `mavenOptional` feature
that allows us to declare optional dependencies that are also published
in the generated POM.

This change allows us to include the maven-shade-plugin in the
spring-boot-maven-plugin POM which fixes an issue with Eclipse m2e.

Fixes gh-21992
2021-04-14 15:02:42 -07:00
Andy Wilkinson
92f9cfaf25 Merge branch '2.3.x' into 2.4.x
See gh-25987
2021-04-09 17:46:54 +01:00
Andy Wilkinson
709db5582b Ensure that classes and resources are in place before documenting
Closes gh-25948
2021-04-09 17:45:38 +01:00
Andy Wilkinson
7cffb89647 Merge branch '2.3.x' into 2.4.x
Closes gh-25987
2021-04-09 17:10:32 +01:00
Andy Wilkinson
d7b43a3c68 Filter out non-public classes when documenting auto-config classes
Fixes gh-25948
2021-04-09 17:09:19 +01:00
Andy Wilkinson
8cd08c3926 Merge branch '2.3.x' into 2.4.x
Closes gh-25899
2021-04-07 12:24:07 +01:00
Andy Wilkinson
7c8caf9ef5 Configure Kotlin compilation to use 1.3 apiVersion and languageVersion
Closes gh-25793
2021-04-07 11:43:39 +01:00
Andy Wilkinson
1e4f130133 Merge branch '2.3.x' into 2.4.x
Closes gh-25895
2021-04-06 19:37:27 +01:00
Andy Wilkinson
76f74482d4 Make Asciidoctor tasks run when Java examples are updated
Closes gh-25892
2021-04-06 19:35:38 +01:00
Phillip Webb
11a94ee6f0 Merge branch '2.3.x' into 2.4.x 2021-03-23 12:52:07 -07:00
Phillip Webb
82127fdaa3 Update copyright year of changed files 2021-03-23 12:50:49 -07:00
Andy Wilkinson
13dda798c5 Merge branch '2.3.x' into 2.4.x 2021-03-16 19:43:45 +00:00
Andy Wilkinson
2359b37e69 Polish 2021-03-16 19:43:35 +00:00
Andy Wilkinson
4865c23a41 Merge branch '2.3.x' into 2.4.x
Closes gh-25695
2021-03-16 19:24:15 +00:00
Andy Wilkinson
bf33e7ef7e Automatically supersede existing upgrade issue when running Bomr
Closes gh-25345
2021-03-16 19:09:38 +00:00
izeye
09f4d4b9bf Polish
See gh-25617
2021-03-13 18:08:54 +01:00
dreis2211
1a803448f0 Exclude GradleBuild tasks on JDK 16 for now
See gh-25523
2021-03-06 08:15:56 +01:00
Andy Wilkinson
1ce6e796fe Polish "Allow the project to be built with Java 16"
See gh-25171
2021-03-04 18:54:58 +00:00
dreis2211
1ccd8dae8a Allow the project to be built with Java 16
See gh-25171
2021-03-04 18:54:56 +00:00
Andy Wilkinson
29bbbc3b79 Merge branch '2.3.x' into 2.4.x
Closes gh-25406
2021-02-24 12:27:23 +00:00
Andy Wilkinson
11b77037f1 Make TestFailuresPlugin compatible with Gradle's configuration cache
Closes gh-25405
2021-02-24 12:26:03 +00:00
Stephane Nicoll
7c5a5c6663 Merge branch '2.3.x' into 2.4.x
Closes gh-25385
2021-02-22 10:45:55 +01:00
Mustafa Ulu
abc90db32f Fix wording error in build-info goal description
See gh-25382
2021-02-22 10:26:53 +01:00
Andy Wilkinson
e763627e86 Merge branch '2.3.x' into 2.4.x
Closes gh-25257
2021-02-12 13:59:42 +00:00
Andy Wilkinson
63402a2984 Truncate files before writing new content to them
Previously, UpgradeApplicator would open build.gradle
using open options that left the fields existing content intact. It
would then write the new content at the beginning of the file. If
the new content was n bytes shorter than the existing content, this
would leave n bytes of the existing content at the end of the file.

This commit updates UpgradeApplicator to truncate the existing file
when it opens it. This ensures that the existing content is
completely replaced by the new content, irrespective of their lengths.

Closes gh-25256
2021-02-12 12:37:23 +00:00
Andy Wilkinson
12c3c80744 Merge branch '2.3.x' into 2.4.x
Closes gh-25226
2021-02-12 11:52:07 +00:00
Andy Wilkinson
413256501f Require a milestone when upgrading dependencies
Closes gh-25225
2021-02-12 11:51:39 +00:00
Andy Wilkinson
f5176f3569 Merge branch '2.3.x' into 2.4.x
Closes gh-25180
2021-02-11 10:09:03 +00:00
Andy Wilkinson
2ba9a8c211 Polish "Remove duplicate declaration of jackson-databind"
See gh-25178
2021-02-11 10:08:34 +00:00
Vitalii Mahas
a2c491ef43 Remove duplicate declaration of jackson-databind
See gh-25178
2021-02-11 10:08:22 +00:00
Andy Wilkinson
3c8a974558 Merge branch '2.3.x' into 2.4.x
Closes gh-25176
2021-02-10 19:42:54 +00:00
Andy Wilkinson
b6d2da0f84 Stop integer default values from becoming decimals
Fixes gh-25172
2021-02-10 19:05:38 +00:00
Andy Wilkinson
788a42d694 Merge branch '2.3.x' into 2.4.x
See gh-25076
2021-02-02 15:12:27 +00:00
Andy Wilkinson
67479b6380 Add junit-platform-launcher dependency by convention
Closes gh-25074
2021-02-02 13:03:21 +00:00
Andy Wilkinson
139152ccce Merge branch '2.3.x' into 2.4.x
Closes gh-24783
2021-01-12 14:17:24 +00:00
Andy Wilkinson
5a02996eca Fix release train version's comparison with other version types
Fixes gh-24782
2021-01-12 14:16:13 +00:00
Stephane Nicoll
052565ef2b Merge branch '2.3.x' into 2.4.x
Closes gh-24626
2021-01-01 09:18:13 +01:00
dreis2211
261b7a5b18 Update copyrights to 2021
See gh-24625
2021-01-01 09:17:13 +01:00
Stephane Nicoll
08b692581a Prepare 2.4.x branch 2020-12-14 14:22:07 +01:00
Brian Clozel
dc9cdb71f5 Merge branch '2.3.x'
Closes gh-24381
2020-12-07 20:29:14 +01:00
Brian Clozel
d2895e7453 Upgrade to Spring Doc Resources 0.2.5
Fixes gh-24146
2020-12-07 20:28:04 +01:00
Phillip Webb
e0a061707e Fix checkstyle header violation
See gh-24337
2020-12-05 07:51:37 -08:00
Phillip Webb
30c27274e2 Merge branch '2.3.x'
Closes gh-24339
2020-12-04 18:31:55 -08:00
Phillip Webb
5f351a6983 Merge branch '2.2.x' into 2.3.x
Closes gh-24338
2020-12-04 18:21:57 -08:00
Stephane Nicoll
b3165f1b36 Merge branch '2.3.x'
Closes gh-24196
2020-11-18 10:35:39 +01:00