Commit Graph

956 Commits (84b88a9a06c55ce7a06f2440771a68872c580200)

Author SHA1 Message Date
Andy Wilkinson 430040415b Merge branch '2.6.x' into 2.7.x 3 years ago
Andy Wilkinson 0b6c147a87 Polish 3 years ago
Andy Wilkinson 12465ea6b7 Merge branch '2.7.x'
Closes gh-31214
3 years ago
Andy Wilkinson d1420b6abb Merge branch '2.6.x' into 2.7.x
Closes gh-31213
3 years ago
Andy Wilkinson da8dafe138 Make afterResolve hook used by bootJar and bootWar more robust
Previously, ResolvedDependencies used hasError on
ResolvedConfiguration to check that it was safe to work with all
of the resolved configuration's artifacts and their files. This
check is not sufficient as errors can still occur later on.

This commit updates ResolvedDependencies to use a lenient
configuration, thereby avoiding any problems that may be caused by
errors that occur after the hasError check.

Closes gh-30586
3 years ago
Andy Wilkinson 4bb5ba2bd0 Merge branch '2.7.x' 3 years ago
Andy Wilkinson 5dfa5adb75 Merge branch '2.7.x'
Closes gh-31178
3 years ago
Andy Wilkinson 455ee0ce22 Merge branch '2.6.x' into 2.7.x
Closes gh-31177
3 years ago
Andy Wilkinson ee45fd2fc8 Remove redundant throws declarations from internal APIs
Closes gh-31176
3 years ago
Andy Wilkinson b3a4982f31 Merge branch '2.6.x' into 2.7.x
Closes gh-31174
3 years ago
Andy Wilkinson cbf42dea14 Update deprecation messages to change removal version from 2.8 to 3.0
Closes gh-30903
3 years ago
Andy Wilkinson 003f747e77 Merge branch '2.7.x'
Closes gh-31170
3 years ago
Phillip Webb ea41e89c6c Merge branch '2.5.x' into 2.6.x 3 years ago
Phillip Webb 7d2f1bafc0 Update copyright year of changed files 3 years ago
Phillip Webb 06f8041e4d Merge branch '2.7.x' 3 years ago
Phillip Webb d5d5997be7 Merge branch '2.6.x' into 2.7.x 3 years ago
Phillip Webb 99f5c781a5 Merge branch '2.5.x' into 2.6.x 3 years ago
Phillip Webb 350d27fe50 Polish code to use method references when possible 3 years ago
Andy Wilkinson 293a3c9ec1 Fix arguments passed to AOT processing in Gradle plugin
See gh-30527
3 years ago
Phillip Webb 8cf63a28b8 Update AOT work to latest Framework code 3 years ago
Andy Wilkinson 541ab69aff Merge branch '2.7.x' 3 years ago
Andy Wilkinson 4cd850cfc0 Merge branch '2.6.x' into 2.7.x
Closes gh-30851
3 years ago
Andy Wilkinson fa327a783d Merge branch '2.5.x' into 2.6.x
Closes gh-30850
3 years ago
Andy Wilkinson 4fd2e0c916 Polish "Fix typos"
See gh-30773
3 years ago
Andy Wilkinson f6d24dc1a8 Fix typos
See gh-30773
3 years ago
Andy Wilkinson fcf45d5c22 Add support for invoking AOT to the Gradle plugin
Closes gh-30527
3 years ago
Andy Wilkinson eacd8c04a5 Merge branch '2.7.x' 3 years ago
Andy Wilkinson 56690a7eb9 Merge branch '2.6.x' into 2.7.x
Closes gh-30791
3 years ago
Andy Wilkinson 409ec48e2a Merge branch '2.5.x' into 2.6.x
Closes gh-30790
3 years ago
Andy Wilkinson 193ef9a06d Package META-INF/services/ files beneath BOOT-INF/classes/
Closes gh-30413
3 years ago
Stephane Nicoll a4cccc98c6 Merge branch '2.7.x' 3 years ago
izeye ed412af138 Polish
See gh-30695
3 years ago
Andy Wilkinson 7e97073994 Merge branch '2.7.x' 3 years ago
Andy Wilkinson 74494f1d37 Merge branch '2.6.x' into 2.7.x
Closes gh-30671
3 years ago
Andy Wilkinson 1720290234 Merge branch '2.5.x' into 2.6.x
Closes gh-30670
3 years ago
Andy Wilkinson f7d181e65b Handle null additional properties more gracefully
Closes gh-30654
3 years ago
izeye 40d0e38e76 Test Spring Boot Gradle Plugin against Gradle 7.4.2
See gh-30506
3 years ago
Andy Wilkinson 42ae55895d Simplify resolution of the application's main class name
Closes gh-30467
3 years ago
Andy Wilkinson d9c2e7c85a Merge branch '2.7.x' 3 years ago
Andy Wilkinson 4722d9d17e Merge branch '2.6.x' into 2.7.x
Closes gh-30470
3 years ago
Andy Wilkinson 880d33f391 Merge branch '2.5.x' into 2.6.x
Closes gh-30469
3 years ago
Andy Wilkinson 05b7befc7a Fix javadoc of ResolveMainClassName setClasspath(Object)
Closes gh-30468
3 years ago
Andy Wilkinson 98678ed415 Merge branch '2.7.x' 3 years ago
Andy Wilkinson b4cbcd797e Merge branch '2.6.x' into 2.7.x
Closes gh-30218
3 years ago
Andy Wilkinson c4d2602a3e Merge branch '2.5.x' into 2.6.x
Closes gh-30217
3 years ago
Octavia Togami 264a6888a9 Refactor code to avoid using internal LazyPublishArtifact
See gh-30209
3 years ago
Andy Wilkinson 9bf77b1a06 Merge branch '2.7.x' 3 years ago
Andy Wilkinson 4935c11a07 Merge branch '2.6.x' into 2.7.x
Closes gh-30215
3 years ago
Andy Wilkinson 464fce621d Merge branch '2.5.x' into 2.6.x
Closes gh-30213
3 years ago
Andy Wilkinson f11ddb4bd7 Prevent eager creation of bootWar task
Previously, querying the artifact's extension in
SinglePublishedArtifact would result in eager creation of the task
that creates the artifact. Typically, this is the bootWar task.

Instead of querying the extension, this commit reworks
SinglePublishedArtifact and its callers to call separate methods for
jar and war artifacts so that the extension check is no longer
required.

Tests have been added to ensure that running help does not trigger
any unexpected task creation. The tests' assertions tolerate some
variation in behavior that depend on the version of Gradle and
whether the configuration cache is enabled.

Closes gh-30211
3 years ago
Scott Frederick 377b13c048 Merge branch '2.7.x' 3 years ago
Scott Frederick de321b00b7 Support podman for building images
Closes gh-30196
3 years ago
Scott Frederick 5e07db7d21 Merge branch '2.7.x' 3 years ago
Scott Frederick 7ad538cd84 Add option to use configured Docker host in builder
This commit adds support for a `docker.bindHostToBuilder` option in
the Maven and Gradle image building goal and task.

Fixes gh-29384
3 years ago
Andy Wilkinson 5264fb3d1e Test our Gradle Plugin against Gradle 7.4.1
Closes gh-30139
3 years ago
Andy Wilkinson e9d2ec507e Merge branch '2.7.x' 3 years ago
Andy Wilkinson d552f49128 Merge branch '2.7.x' 3 years ago
Andy Wilkinson 83de1995c7 Merge branch '2.6.x' into 2.7.x
Closes gh-30130
3 years ago
Andy Wilkinson b0e4cabdd8 Merge branch '2.5.x' into 2.6.x
Closes gh-30123
3 years ago
Andy Wilkinson 20d21d4e58 Set up CI with JDK 18
Closes gh-30104
3 years ago
Madhura Bhave 5960d2dba1 Merge branch '2.7.x' into main 3 years ago
Madhura Bhave 9628507756 Merge branch '2.6.x' into 2.7.x
Closes gh-30094
3 years ago
Madhura Bhave d131003456 Merge branch '2.5.x' into 2.6.x
Closes gh-30093
3 years ago
Madhura Bhave 480ccc6175 Clarify devtools documentation when using with build plugins
Closes gh-17851
3 years ago
Andy Wilkinson e2d0b348e3 Merge branch '2.7.x' 3 years ago
Andy Wilkinson 4459fb46be Merge branch '2.6.x' into 2.7.x
Closes gh-30058
3 years ago
Andy Wilkinson 2ba8b490a0 Merge branch '2.5.x' into 2.6.x
Closes gh-30057
3 years ago
Andy Wilkinson e7566e968e Use configuration avoidance APIs in Gradle plugin's docs
Closes gh-30056
3 years ago
Andy Wilkinson a5ec85bede Merge branch '2.7.x' 3 years ago
Andy Wilkinson b89c29f29c Merge branch '2.6.x' into 2.7.x
Closes gh-30037
3 years ago
Andy Wilkinson ea729fc1c6 Merge branch '2.5.x' into 2.6.x
Closes gh-30036
3 years ago
Andy Wilkinson 4073cf8334 Only apply special handling of META-INF to jar files
The changes for gh-28562 attempted to align the Gradle plugin's
handling of META-INF with the Maven plugin's behavior. Unfortunately,
they want too far, applying the handling to both jar and war files
when the Maven plugin only applies it to jar files.

This commit reworks the changes so that they only apply to jar files.

Closes gh-30026
3 years ago
Andy Wilkinson 6051a10d4a Merge branch '2.7.x' 3 years ago
Andy Wilkinson 1ae46dee6d Merge branch '2.6.x' into 2.7.x
Closes gh-29967
3 years ago
Andy Wilkinson 4f8a18fa0a Merge branch '2.5.x' into 2.6.x
Closes gh-29966
3 years ago
Andy Wilkinson 9c9e04b8e4 Use mainClass rather than deprecated main in BootRun examples
Closes gh-29965
3 years ago
Phillip Webb ff4b92a3ba Update copyright year of changed files 3 years ago
Phillip Webb f4b849ec95 Merge branch '2.7.x' 3 years ago
Phillip Webb 26512f8ac6 Merge branch '2.6.x' into 2.7.x 3 years ago
Phillip Webb 5b4ec32645 Merge branch '2.5.x' into 2.6.x 3 years ago
Phillip Webb c86b1330cf Update copyright year of changed files 3 years ago
Phillip Webb 9ab1b669d0 Polish 3 years ago
Andy Wilkinson d62d5a09a1 Merge branch '2.7.x' 3 years ago
Andy Wilkinson ba73436ea8 Merge branch '2.6.x' into 2.7.x
Closes gh-29881
3 years ago
Andy Wilkinson 86c75b7a5c Merge branch '2.5.x' into 2.6.x
Closes gh-29880
3 years ago
Andy Wilkinson 03352b0a8c Prohibit use of APIs that prevent task configuration avoidance
Closes gh-29809
3 years ago
Andy Wilkinson d7fa2e2e8f Merge branch '2.7.x' 3 years ago
Andy Wilkinson 8e4484acea Merge branch '2.6.x' into 2.7.x
Closes gh-29878
3 years ago
Andy Wilkinson ce4beae12f Merge branch '2.5.x' into 2.6.x
Closes gh-29877
3 years ago
izeye 6bd6f590d3 Fix Javadoc since for ResolveMainClassName#setClasspath(Object)
See gh-29826
3 years ago
Andy Wilkinson 9808e80ab4 Merge branch '2.7.x' 3 years ago
Andy Wilkinson a513dbb797 Merge branch '2.6.x' into 2.7.x
Closes gh-29818
3 years ago
Andy Wilkinson f134358c78 Merge branch '2.5.x' into 2.6.x
Closes gh-29817
3 years ago
Andy Wilkinson c84b35c460 Polish "Avoid using Gradle APIs that trigger eager task creation"
See gh-29762
3 years ago
Lars Grefer 7cd87acd73 Avoid using Gradle APIs that trigger eager task creation
See gh-29762
3 years ago
Andy Wilkinson e52a5490bf Merge branch '2.7.x' 3 years ago
Andy Wilkinson 25e75c60ee Merge branch '2.6.x' into 2.7.x
Closes gh-29806
3 years ago
Andy Wilkinson 85d14cdb2c Merge branch '2.5.x' into 2.6.x
Closes gh-29805
3 years ago
Andy Wilkinson 1fd4a4d86b Remove code related to unsupported versions of Gradle
Closes gh-29681
3 years ago
Andy Wilkinson 68bdef2cd0 Merge branch '2.7.x' 3 years ago
Andy Wilkinson da61545925 Merge branch '2.6.x' into 2.7.x
Closes gh-29749
3 years ago
Andy Wilkinson 646bb05c8d Merge branch '2.5.x' into 2.6.x
Closes gh-29748
3 years ago
Andy Wilkinson c3eee4ad68 Align Gradle's plugin's META-INF repackaging with Maven plugin's
Closes gh-28562
3 years ago
Andy Wilkinson fc23310144 Merge branch '2.6.x' into 2.7.x
Closes gh-29734
3 years ago
Andy Wilkinson d6ebce4ccf Merge branch '2.5.x' into 2.6.x
Closes gh-29733
3 years ago
Andy Wilkinson 6901f6dab2 Test our Gradle plugin against Gradle 7.4
Closes gh-29673
3 years ago
Andy Wilkinson 067a8dd3ec Raise the minimum supported version of Gradle to 7.4
Closes gh-29674
3 years ago
Andy Wilkinson 01cc07978b Merge branch '2.7.x' 3 years ago
Andy Wilkinson 665e1f665e Merge branch '2.6.x' into 2.7.x
Closes gh-29688
3 years ago
Andy Wilkinson b46eba16e6 Merge branch '2.5.x' into 2.6.x
Closes gh-29687
3 years ago
Andy Wilkinson 48fe1513fe Test documented build script snippets when they change
Closes gh-29684
3 years ago
Andy Wilkinson 41d49717af Merge branch '2.7.x' 3 years ago
Andy Wilkinson 1e16c2f229 Merge branch '2.6.x' into 2.7.x
Closes gh-29686
3 years ago
Andy Wilkinson c0664efa86 Merge branch '2.5.x' into 2.6.x
Closes gh-29685
3 years ago
Mike Partridge 2e9dcdd96d Replace use of classifier with archiveClassifier
classifier has been deprecated so the docs should be using its
replacement, archiveClassifier, instead.

See gh-29611
3 years ago
Andy Wilkinson 96118c88db Merge branch '2.7.x' 3 years ago
Andy Wilkinson 41863d4b80 Merge branch '2.6.x' into 2.7.x
Closes gh-29680
3 years ago
Andy Wilkinson 358cdb33f7 Merge branch '2.5.x' into 2.6.x
Closes gh-29679
3 years ago
Andy Wilkinson 43ca2d2cb0 Access classpath lazily to allow later changes to be picked up
Previously, the classpath of bootJar, bootWar, and bootRun was
configured directly as a FileCollection derived from the main source
set's runtime classpath. This direct configuration meant that
subsequent changes to the main source set's runtime classpath may not
have been picked up.

This commit changes the configuration of the classpath to use a
Callable. This indirection allows subsequent changes to the main
source set's runtime classpath to be picked up as long as they
occur before Gradle calls the callable.

Closes gh-29672
3 years ago
Stephane Nicoll cad11addb2 Merge branch '2.7.x' 3 years ago
Stephane Nicoll 980aa616c8 Fix build failure
See gh-29290
3 years ago
Stephane Nicoll 11e604af41 Merge branch '2.7.x' 3 years ago
Stephane Nicoll 9821cdfd8b Remove deprecated code
Closes gh-29290
3 years ago
izeye 9a6c1c531d Test our Gradle plugin against Gradle 7.3.3
See gh-29161
3 years ago
Stephane Nicoll 8c9d398422 Test our Gradle plugin against Gradle 7.3.2
Closes gh-29093
3 years ago
Phillip Webb 003fb229fd Merge branch '2.7.x' 3 years ago
Phillip Webb f3bcbca841 Update copyright year of changed files 3 years ago
Stephane Nicoll 50c15769ff Merge branch '2.7.x' 3 years ago
Stephane Nicoll 5383de4fe1 Merge branch '2.6.x' into 2.7.x 3 years ago
Stephane Nicoll 32ecbb89d6 Merge branch '2.5.x' into 2.6.x 3 years ago
Stephane Nicoll 496cd3d2ba Polish
See gh-28999
3 years ago
Scott Frederick c78b157e95 Merge branch '2.7.x' 3 years ago
Scott Frederick 8f57f0babb Add classpath index support for exploded war archives
Update the Maven and Gradle packaging for war files so that a
`classpath.idx` file is written into the archive that provides the
original order of the classpath, as was previously done for jar files.
The `WarLauncher` class will use this file when running as an exploded
archive to ensure that the classpath order is the same as when running
from the far war.

Fixes gh-19875
3 years ago
Andy Wilkinson af60a8a7cf Test our Gradle plugin against Gradle 7.3.1
Closes gh-28890
3 years ago
Andy Wilkinson 814c86c5e8 Raise the minimum supported version of Gradle to 7.3
Closes gh-28100
3 years ago
Phillip Webb beb68671bb Update copyright year of changed files 3 years ago
Andy Wilkinson 0074d621d0 Merge branch '2.5.x'
Closes gh-28754
3 years ago
Andy Wilkinson 015cf920da Name custom task inputs
Closes gh-28753
3 years ago
Andy Wilkinson c0d90dfa8f Merge branch '2.5.x'
Closes gh-28749
3 years ago
Andy Wilkinson c083e0b049 Avoid using temp before @TempDir has initialized it
Closes gh-28748
3 years ago
Andy Wilkinson 0aae9c26da Test our Gradle plugin against Gradle 7.3
Closes gh-28679
3 years ago
Andy Wilkinson 2a342ef416 Merge branch '2.5.x'
Closes gh-28662
3 years ago
Andy Wilkinson 5e4a502b2d Merge branch '2.4.x' into 2.5.x
Closes gh-28661
3 years ago
Andy Wilkinson 2cec3971d7 Prohibit unwanted dependencies in all modules not just starters
Closes gh-28658
3 years ago
Stephane Nicoll 98d3e99ac9 Merge branch '2.5.x'
Closes gh-28550
3 years ago
Stephane Nicoll 91f7ff3ba3 Merge branch '2.4.x' into 2.5.x
Closes gh-28549
3 years ago
slowjoe007 5a121197fc Fix typo
See gh-28548
3 years ago
Scott Frederick e84c1abb0f Prevent Docker volume name clashes in tests during parallel builds
See gh-28292
3 years ago
Phillip Webb e25f216eab Merge branch '2.5.x'
Closes gh-28425
3 years ago
Phillip Webb daf36dff55 Merge branch '2.4.x' into 2.5.x
Closes gh-28424
3 years ago