Commit Graph

260 Commits (63fe89f641348e1a8e0b33698cedd18d45d6821d)

Author SHA1 Message Date
Andy Wilkinson 06778abb61 Merge branch '2.5.x'
See gh-26934
3 years ago
Andy Wilkinson 577c58b798 Merge branch '2.4.x' into 2.5.x
See gh-26933
3 years ago
Andy Wilkinson ac8c6a6fb7 Tune config of source and target compatilility with toolchain
See gh-26932
3 years ago
Andy Wilkinson 2106114f64 Merge branch '2.5.x'
Closes gh-26934
3 years ago
Andy Wilkinson 560d272db3 Merge branch '2.4.x' into 2.5.x
Closes gh-26933
3 years ago
Andy Wilkinson 6e43dd879b Allow Eclipse to properly detect source and target compatibility
Previously, our conventions configured the source and target
compatibility on the project's JavaCompile tasks. This causes the
settings to be missed when importing the projects into Eclipse [1].

This commit updates the conventions to set the source and target
compatibility on the project-wide JavaPluginExtension. This allows
the Eclipse import to correctly detect and honour the settings.

Closes gh-26932

[1] https://github.com/eclipse/buildship/issues/978
3 years ago
Andy Wilkinson 0f52bbc560 Stop using ConfigureUtil in BomExtension
While we're building with Gradle 6.9 at the moment and ConfigureUtil
has only been deprecated in Gradle 7.1, it doesn't do any harm to
stop using it now.

Closes gh-26928
3 years ago
Phillip Webb 28abcf88a0 Upgrade to spring-asciidoctor-backends 0.0.2
Closes gh-26846
3 years ago
Andy Wilkinson de410b7621 Merge branch '2.4.x'
Closes gh-26828
3 years ago
Andy Wilkinson a1c5fcca58 Move common Asciidoctor configuration into our conventions
Closes gh-26620
3 years ago
Phillip Webb f798f26596 Merge branch '2.4.x' 3 years ago
Phillip Webb 6424e3de12 Merge branch '2.4.x'
Closes gh-26671
4 years ago
Phillip Webb 14f578ed80 Merge branch '2.3.x' into 2.4.x
Closes gh-26670
4 years ago
Phillip Webb 39e3746cf6 Force Eclipse to use JavaSE-1.8 runtime
Add `EclipseConventions` to force the JavaSE-1.8 runtime to be applied
to the imported projects.

Closes gh-26669
4 years ago
Phillip Webb 60a8fae65c Upgrade to spring-asciidoctor-backends 0.0.1
Closes gh-26293
4 years ago
Phillip Webb f0896c2de6 Rework title anchors for maven docs
Closes gh-26617
4 years ago
Phillip Webb 34b288e5fe Add prefix to appendix property anchor links
Refactor property appendix generator code so that the complete section
is generated and anchors follow the expected naming.

Closes gh-26375
4 years ago
Andy Wilkinson a6dd97e40d Polish
See gh-26576
4 years ago
Andy Wilkinson 763e58e392 Merge branch '2.4.x'
Closes gh-26576
4 years ago
Andy Wilkinson ad5ba2e414 Compile Kotlin code will all warnings treated as errors
Closes gh-26083
4 years ago
Andy Wilkinson aaceb9565c Upgrade to Kotlin 1.5.0
Closes gh-26553
4 years ago
Andy Wilkinson f7d28567c0 Merge branch '2.4.x'
Closes gh-26520
4 years ago
dreis2211 6179b99710 Remove add-opens workaround in ToolchainPlugin
See gh-26465
4 years ago
Phillip Webb 87d8aedd3c Use spring-pdf backend for PDF generation
Update `asciidoctorPdf` tasks to use the `spring-pdf` backend so that
chomped elements and @fold:on/@fold:off comments are hidden.

Closes gh-26373
4 years ago
Stephane Nicoll 8d2fa26a99 Start building against Spring LDAP 2.3.4 snapshots
See gh-26394
4 years ago
Stephane Nicoll a5cb9540ca Start building against Spring LDAP 2.3.4 snapshots
See gh-26393
4 years ago
Andy Wilkinson f17af829ee Merge branch '2.4.x'
Closes gh-26354
4 years ago
Andy Wilkinson 75bb50bd02 Merge branch '2.3.x' into 2.4.x
Closes gh-26353
4 years ago
Andy Wilkinson deca737b01 Configure source and target compatibility at the task level
Closes gh-26350
4 years ago
Andy Wilkinson 5a3c354e6c Merge branch '2.4.x'
Closes gh-26303
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
Phillip Webb 3d9eb9e413 Switch to spring-asciidoctor-backends SNAPSHOT
See gh-26293
4 years ago
Andy Wilkinson 1be8c8fda9 Merge branch '2.4.x'
See gh-26261
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 c548693fa1 Merge branch '2.4.x'
See gh-26261
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
Andy Wilkinson 03149eda9e Merge branch '2.4.x'
Closes gh-26278
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
Andy Wilkinson e7c1c8937d Merge branch '2.4.x'
Closes gh-26261
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
dreis2211 5219697eb7 Fix GitHub tag determination following main branch rename
See gh-26253
4 years ago
Phillip Webb beaf03a008 Update copyright year of changed files 4 years ago
Phillip Webb b4c9bb0d5c Merge branch '2.4.x'
Closes gh-26122
4 years ago
Phillip Webb fb3796dae8 Merge branch '2.3.x' into 2.4.x
Closes gh-26121
4 years ago
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
4 years ago