Commit Graph

282 Commits

Author SHA1 Message Date
Andy Wilkinson
f530819d68 Merge branch '2.4.x' into 2.5.x
Closes gh-27966
2021-09-13 10:47:47 +01:00
Andy Wilkinson
273600bcdd Retain distinction between compile and runtime deps of optional deps
Previously, the optional configuration was added to the compile and
runtime classpaths of each source set and the the javadoc classpath
as well. This had a few disadvantages, the most notable of which is
that it meant that the configuration was ifrst resolved and then
the outcome of the resolution was added to the compile and runtime
classpaths. As a result, none of the attributes on the compile and
runtime classpaths were considered to influence variant selection.

This commit reworks the optional dependencies plugin so that the
compile and runtime classpaths of each source set are now configured
to extend from the optional configuration. This allows each
classpath configuration's attributes to influence the dependencies
that are selected from the optional configuration during resolution.
For example, when resolving the compile classpath, compile
dependencies (Usage.JAVA_API) will be selected and when resolving the
runtime classpath, runtime dependencies (Usage.JAVA_RUNTIME) will be
selected.

The above-described change means that runtime dependencies of an
optional dependencies will no longer leak into the compile classpath.
As a result of this, our Gradle plugin's test infrastructure has
been updated so that it no longer references runtime dependencies of
the Kotlin Gradle plugin at compile time.

Closes gh-27965
2021-09-13 10:47:14 +01:00
Andy Wilkinson
3566e5881b Merge branch '2.4.x' into 2.5.x
Closes gh-27786
2021-08-20 13:54:02 +01:00
Andy Wilkinson
9f402f0428 Use snapshot rather than libs-snapshot when generating effective bom
Closes gh-27785
2021-08-20 13:53:34 +01:00
Andy Wilkinson
6d8ba3e8b1 Merge branch '2.4.x' into 2.5.x
Closes gh-27757
2021-08-18 17:56:32 +01:00
Andy Wilkinson
ffbd28b60a Polish "Polish access modifiers for test classes"
See gh-27736
2021-08-18 17:52:42 +01:00
izeye
8a425dedfd Polish access modifiers for test classes
See gh-27736
2021-08-18 17:38:40 +01:00
Andy Wilkinson
0d904b8868 Merge branch '2.4.x' into 2.5.x
Closes gh-27753
2021-08-18 13:51:49 +01:00
Andy Wilkinson
0b7994a679 Polish "Use 2012 for copyright beginning year"
See gh-27734
2021-08-18 13:48:29 +01:00
izeye
07da144826 Use 2012 for copyright beginning year
See gh-27734
2021-08-18 13:46:35 +01:00
Andy Wilkinson
10ceb504ae Merge branch '2.4.x' into 2.5.x
Closes gh-27751
2021-08-18 13:00:19 +01:00
Andy Wilkinson
32c184e31c Revert changes made to work around JDK-8156584
Closes gh-26848
2021-08-18 13:00:11 +01:00
Andy Wilkinson
9127588082 Merge branch '2.4.x' into 2.5.x
Closes gh-27497
2021-07-26 15:36:52 +01:00
Andy Wilkinson
ea6cb74ccf Ignore Spring Boot when finding dependency upgrades
Closes gh-27447
2021-07-26 15:36:08 +01:00
dreis2211
e4978f604c Fix JDK 16 pipeline
See gh-27310
2021-07-13 17:42:20 +01:00
Andy Wilkinson
705feeed6a Polish "Allow additional JVM args when running tests via toolchain"
See gh-27089
2021-07-13 15:28:04 +01:00
dreis2211
01b0156fed Allow additional JVM args when running tests via toolchain
See gh-27089
2021-07-13 15:24:45 +01:00
Andy Wilkinson
f7140d0401 Merge branch '2.4.x' into 2.5.x
See gh-27045
2021-06-24 10:03:17 +01:00
Andy Wilkinson
316d2cce89 Don't offer upgrade for version that is already aligned
See gh-27044
2021-06-24 10:02:14 +01:00
Phillip Webb
2c518f1dff Merge branch '2.4.x' into 2.5.x 2021-06-23 21:02:05 -07:00
Phillip Webb
a76e5c043e Update copyright year of changed files 2021-06-23 21:01:45 -07:00
Andy Wilkinson
5139c79c4f Merge branch '2.4.x' into 2.5.x
See gh-27045
2021-06-23 19:51:40 +01:00
Andy Wilkinson
4d694ddaa8 Fix bom plugin management versions
See gh-27044
2021-06-23 19:50:06 +01:00
Andy Wilkinson
ec2a7b9a5b Merge branch '2.4.x' into 2.5.x
Closes gh-27045
2021-06-23 17:10:50 +01:00
Andy Wilkinson
363de4cfa5 Add dependency lock and constraint version alignment to Bomr
Closes gh-27044
2021-06-23 17:09:24 +01:00
Andy Wilkinson
577c58b798 Merge branch '2.4.x' into 2.5.x
See gh-26933
2021-06-16 20:35:56 +01:00
Andy Wilkinson
ac8c6a6fb7 Tune config of source and target compatilility with toolchain
See gh-26932
2021-06-16 20:33:17 +01:00
Andy Wilkinson
560d272db3 Merge branch '2.4.x' into 2.5.x
Closes gh-26933
2021-06-16 19:56:41 +01:00
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
2021-06-16 19:56:20 +01:00
Phillip Webb
28abcf88a0 Upgrade to spring-asciidoctor-backends 0.0.2
Closes gh-26846
2021-06-10 00:18:34 -07:00
Andy Wilkinson
de410b7621 Merge branch '2.4.x'
Closes gh-26828
2021-06-09 18:01:32 +01:00
Andy Wilkinson
a1c5fcca58 Move common Asciidoctor configuration into our conventions
Closes gh-26620
2021-06-09 18:00:45 +01:00
Phillip Webb
f798f26596 Merge branch '2.4.x' 2021-06-08 18:05:50 -07:00
Phillip Webb
6424e3de12 Merge branch '2.4.x'
Closes gh-26671
2021-05-25 17:40:23 -07:00
Phillip Webb
14f578ed80 Merge branch '2.3.x' into 2.4.x
Closes gh-26670
2021-05-25 17:40:05 -07:00
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
2021-05-25 17:38:55 -07:00
Phillip Webb
60a8fae65c Upgrade to spring-asciidoctor-backends 0.0.1
Closes gh-26293
2021-05-19 22:40:24 -07:00
Phillip Webb
f0896c2de6 Rework title anchors for maven docs
Closes gh-26617
2021-05-19 21:19:24 -07:00
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
2021-05-18 21:19:24 -07:00
Andy Wilkinson
a6dd97e40d Polish
See gh-26576
2021-05-17 15:43:34 +01:00
Andy Wilkinson
763e58e392 Merge branch '2.4.x'
Closes gh-26576
2021-05-17 15:10:38 +01:00
Andy Wilkinson
ad5ba2e414 Compile Kotlin code will all warnings treated as errors
Closes gh-26083
2021-05-17 15:07:50 +01:00
Andy Wilkinson
aaceb9565c Upgrade to Kotlin 1.5.0
Closes gh-26553
2021-05-17 13:39:56 +01:00
Andy Wilkinson
f7d28567c0 Merge branch '2.4.x'
Closes gh-26520
2021-05-17 10:35:44 +01:00
dreis2211
6179b99710 Remove add-opens workaround in ToolchainPlugin
See gh-26465
2021-05-17 09:57:18 +01:00
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
2021-05-10 18:04:05 -07:00
Stephane Nicoll
8d2fa26a99 Start building against Spring LDAP 2.3.4 snapshots
See gh-26394
2021-05-10 12:45:49 +02:00
Stephane Nicoll
a5cb9540ca Start building against Spring LDAP 2.3.4 snapshots
See gh-26393
2021-05-10 09:38:41 +02:00
Andy Wilkinson
f17af829ee Merge branch '2.4.x'
Closes gh-26354
2021-05-04 10:33:18 +01:00
Andy Wilkinson
75bb50bd02 Merge branch '2.3.x' into 2.4.x
Closes gh-26353
2021-05-04 10:33:06 +01:00