Commit Graph

298 Commits

Author SHA1 Message Date
Andy Wilkinson
7c034c33e2 Merge branch '2.5.x'
Closes gh-27967
2021-09-13 10:48:19 +01:00
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
69d4e273d3 Merge branch '2.5.x'
Closes gh-27787
2021-08-20 13:56:09 +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
fd2fbcb3c6 Merge branch '2.5.x'
Closes gh-27758
2021-08-18 18:28: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
2dfdcf5e88 Merge branch '2.5.x'
Closes gh-27754
2021-08-18 13:52:23 +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
44884cc495 Merge branch '2.5.x'
Closes gh-27752
2021-08-18 13:00:32 +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
af13125796 Merge branch '2.5.x'
Closes gh-27498
2021-07-26 15:37:03 +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
Andy Wilkinson
a5ec7560f5 Merge branch '2.5.x'
Closes gh-27314
2021-07-13 17:42:54 +01:00
dreis2211
e4978f604c Fix JDK 16 pipeline
See gh-27310
2021-07-13 17:42:20 +01:00
Andy Wilkinson
9ccd6a6f2f Merge branch '2.5.x'
Closes gh-27307
2021-07-13 15:56:32 +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
Scott Frederick
18c7c0af22 Add Paketo image building system tests
A new system test plugin is being made available for running test
suites that should be run less frequently than with every commit, such
as tests that verify Spring Boot compatibility with external
projects. CI pipeline configuration for running system tests is also
provided.

The first system tests verify the behavior of the Spring Boot image
building plugins when building images using Paketo buildpacks.

Closes gh-25824
2021-07-08 17:02:43 -05:00
Andy Wilkinson
fcf7240f3c Merge branch '2.5.x'
See gh-27047
2021-06-24 10:03:44 +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
6102f10639 Merge branch '2.5.x' 2021-06-23 21:02:36 -07: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
aa3d72cb05 Merge branch '2.5.x'
See gh-27047
2021-06-23 19:52:04 +01: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
5d6a612b4b Merge branch '2.5.x'
Closes gh-27047
2021-06-23 17:39: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
06778abb61 Merge branch '2.5.x'
See gh-26934
2021-06-16 20:37:21 +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
2106114f64 Merge branch '2.5.x'
Closes gh-26934
2021-06-16 19:57:00 +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
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
2021-06-16 12:24:38 +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