Andy Wilkinson
a8ae7a1e44
Fix Gradle AOT integration test on Windows
...
See gh-31970
2022-08-15 10:21:42 +01:00
Stephane Nicoll
332419e3a7
Remove extra 'build' directory
...
See gh-32069
2022-08-12 17:47:38 +02:00
Stephane Nicoll
e21041ce65
Harmonize location of generated classes processed Ahead-of-time
...
Closes gh-32069
2022-08-11 17:07:16 +02:00
Andy Wilkinson
cb18eb095b
Make transitive runtime dependencies available to AOT processing
...
Closes gh-31970
2022-08-03 13:54:50 +01:00
Phillip Webb
e08c16dfd6
Polish
2022-07-29 12:10:02 +01:00
Andy Wilkinson
6c28156b29
Avoid config-time creation of AOT source set's tasks
...
Closes gh-31844
2022-07-22 14:14:03 +01:00
Scott Frederick
6f65777035
Merge branch '2.7.x'
...
Closes gh-31827
2022-07-20 17:31:37 -05:00
Scott Frederick
9da38c8d2d
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31826
2022-07-20 17:29:58 -05:00
Scott Frederick
4e0b3aad9f
Clarify how docker image publishing registry is determined
...
Closes gh-31820
2022-07-20 17:29:40 -05:00
Scott Frederick
cf7a163c6d
Merge branch '2.7.x'
2022-07-20 16:07:32 -05:00
Scott Frederick
f9cf31e59e
Fix compile errors
...
See gh-28844
2022-07-20 16:07:19 -05:00
Scott Frederick
36d6106bb0
Merge branch '2.7.x'
...
Closes gh-31825
2022-07-20 15:11:30 -05:00
Scott Frederick
09c7ce6dab
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31824
2022-07-20 15:10:43 -05:00
Scott Frederick
9b0cdac58a
Simplify support for pushing images to unauthenticated registries
...
This commit removes the requirement that `docker.publishRegistry`
configuration must be provided when an image is published by the Gradle
or Maven plugin.
Fixes gh-28844
2022-07-20 15:06:05 -05:00
Andy Wilkinson
6da8c88b2b
Include library resources on classpath of AOT source generation
...
Closes gh-31803
2022-07-20 10:07:02 +01:00
Andy Wilkinson
7bd9873cd9
Raise the minimum supported version of Gradle to 7.5
...
Closes gh-31215
2022-07-14 15:56:32 +01:00
Moritz Halbritter
3703b317ce
Enable GraalVM reachability metadata repository
...
Closes gh-31687
2022-07-12 14:25:38 +02:00
dreis2211
5db04da275
Use pattern matching for instanceof where appropriate
...
See gh-31475
2022-06-20 17:55:36 +01:00
dreis2211
fb45fc4819
Use Files.writeString() and Files.readString() where possible
...
See gh-31459
2022-06-20 09:05:09 +02:00
dreis2211
a639685053
Remove obsolete Java compatibility code
...
See gh-31452
2022-06-19 10:22:23 +02:00
Johnny Lim
5d7d0d8047
Use 3.0.0 for Javadoc since tags
...
See gh-31448
2022-06-17 16:48:58 +02:00
Stephane Nicoll
99f71941cd
Merge branch '2.7.x'
...
Closes gh-31363
2022-06-13 15:55:21 +02:00
Stephane Nicoll
499f54a335
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31362
2022-06-13 15:51:45 +02:00
Lars Grefer
8c9557f552
Enable Links for the Javadoc of the Gradle Plugins
...
See gh-31279
2022-06-13 15:51:08 +02:00
Andy Wilkinson
1ba1eff63a
Merge branch '2.7.x'
2022-05-30 19:22:45 +01:00
Andy Wilkinson
430040415b
Merge branch '2.6.x' into 2.7.x
2022-05-30 19:22:37 +01:00
Andy Wilkinson
0b6c147a87
Polish
2022-05-30 19:22:30 +01:00
Andy Wilkinson
12465ea6b7
Merge branch '2.7.x'
...
Closes gh-31214
2022-05-30 18:24:12 +01:00
Andy Wilkinson
d1420b6abb
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31213
2022-05-30 18:24:00 +01:00
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
2022-05-30 18:19:47 +01:00
Andy Wilkinson
4bb5ba2bd0
Merge branch '2.7.x'
2022-05-26 18:26:52 +01:00
Andy Wilkinson
5dfa5adb75
Merge branch '2.7.x'
...
Closes gh-31178
2022-05-26 15:54:58 +01:00
Andy Wilkinson
455ee0ce22
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31177
2022-05-26 15:53:38 +01:00
Andy Wilkinson
ee45fd2fc8
Remove redundant throws declarations from internal APIs
...
Closes gh-31176
2022-05-26 15:47:35 +01:00
Andy Wilkinson
b3a4982f31
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31174
2022-05-26 14:01:23 +01:00
Andy Wilkinson
cbf42dea14
Update deprecation messages to change removal version from 2.8 to 3.0
...
Closes gh-30903
2022-05-26 13:59:03 +01:00
Andy Wilkinson
003f747e77
Merge branch '2.7.x'
...
Closes gh-31170
2022-05-26 13:52:41 +01:00
Phillip Webb
ea41e89c6c
Merge branch '2.5.x' into 2.6.x
2022-05-17 22:21:10 -07:00
Phillip Webb
7d2f1bafc0
Update copyright year of changed files
2022-05-17 22:20:05 -07:00
Phillip Webb
06f8041e4d
Merge branch '2.7.x'
2022-05-17 21:50:42 -07:00
Phillip Webb
d5d5997be7
Merge branch '2.6.x' into 2.7.x
2022-05-17 21:49:20 -07:00
Phillip Webb
99f5c781a5
Merge branch '2.5.x' into 2.6.x
2022-05-17 21:48:50 -07:00
Phillip Webb
350d27fe50
Polish code to use method references when possible
2022-05-17 21:16:42 -07:00
Andy Wilkinson
293a3c9ec1
Fix arguments passed to AOT processing in Gradle plugin
...
See gh-30527
2022-05-06 11:18:01 +01:00
Phillip Webb
8cf63a28b8
Update AOT work to latest Framework code
2022-05-05 15:19:33 -07:00
Andy Wilkinson
541ab69aff
Merge branch '2.7.x'
2022-05-03 15:18:20 +01:00
Andy Wilkinson
4cd850cfc0
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30851
2022-05-03 15:17:13 +01:00
Andy Wilkinson
fa327a783d
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30850
2022-05-03 15:14:00 +01:00
Andy Wilkinson
4fd2e0c916
Polish "Fix typos"
...
See gh-30773
2022-05-03 14:09:53 +01:00
Andy Wilkinson
f6d24dc1a8
Fix typos
...
See gh-30773
2022-05-03 14:09:37 +01:00
Andy Wilkinson
fcf45d5c22
Add support for invoking AOT to the Gradle plugin
...
Closes gh-30527
2022-04-29 14:32:23 +01:00
Andy Wilkinson
eacd8c04a5
Merge branch '2.7.x'
2022-04-25 15:03:52 +01:00
Andy Wilkinson
56690a7eb9
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30791
2022-04-25 15:03:32 +01:00
Andy Wilkinson
409ec48e2a
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30790
2022-04-25 15:00:51 +01:00
Andy Wilkinson
193ef9a06d
Package META-INF/services/ files beneath BOOT-INF/classes/
...
Closes gh-30413
2022-04-25 14:32:47 +01:00
Stephane Nicoll
a4cccc98c6
Merge branch '2.7.x'
2022-04-19 09:37:08 +02:00
izeye
ed412af138
Polish
...
See gh-30695
2022-04-19 09:34:28 +02:00
Andy Wilkinson
7e97073994
Merge branch '2.7.x'
2022-04-14 18:38:26 +01:00
Andy Wilkinson
74494f1d37
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30671
2022-04-14 18:38:09 +01:00
Andy Wilkinson
1720290234
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30670
2022-04-14 18:37:55 +01:00
Andy Wilkinson
f7d181e65b
Handle null additional properties more gracefully
...
Closes gh-30654
2022-04-14 18:36:15 +01:00
izeye
40d0e38e76
Test Spring Boot Gradle Plugin against Gradle 7.4.2
...
See gh-30506
2022-04-03 09:29:50 +02:00
Andy Wilkinson
42ae55895d
Simplify resolution of the application's main class name
...
Closes gh-30467
2022-03-29 15:51:22 +01:00
Andy Wilkinson
d9c2e7c85a
Merge branch '2.7.x'
2022-03-29 15:07:08 +01:00
Andy Wilkinson
4722d9d17e
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30470
2022-03-29 15:06:56 +01:00
Andy Wilkinson
880d33f391
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30469
2022-03-29 15:06:47 +01:00
Andy Wilkinson
05b7befc7a
Fix javadoc of ResolveMainClassName setClasspath(Object)
...
Closes gh-30468
2022-03-29 15:05:54 +01:00
Andy Wilkinson
98678ed415
Merge branch '2.7.x'
2022-03-15 17:36:23 +00:00
Andy Wilkinson
b4cbcd797e
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30218
2022-03-15 17:36:08 +00:00
Andy Wilkinson
c4d2602a3e
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30217
2022-03-15 17:34:53 +00:00
Octavia Togami
264a6888a9
Refactor code to avoid using internal LazyPublishArtifact
...
See gh-30209
2022-03-15 17:09:15 +00:00
Andy Wilkinson
9bf77b1a06
Merge branch '2.7.x'
2022-03-15 15:31:03 +00:00
Andy Wilkinson
4935c11a07
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30215
2022-03-15 15:30:40 +00:00
Andy Wilkinson
464fce621d
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30213
2022-03-15 15:30:06 +00:00
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
2022-03-15 15:28:59 +00:00
Scott Frederick
377b13c048
Merge branch '2.7.x'
2022-03-11 16:39:49 -06:00
Scott Frederick
de321b00b7
Support podman for building images
...
Closes gh-30196
2022-03-11 16:39:07 -06:00
Scott Frederick
5e07db7d21
Merge branch '2.7.x'
2022-03-11 15:59:16 -06:00
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
2022-03-11 15:27:22 -06:00
Andy Wilkinson
5264fb3d1e
Test our Gradle Plugin against Gradle 7.4.1
...
Closes gh-30139
2022-03-09 18:09:07 +00:00
Andy Wilkinson
e9d2ec507e
Merge branch '2.7.x'
2022-03-09 15:17:25 +00:00
Andy Wilkinson
d552f49128
Merge branch '2.7.x'
2022-03-09 12:53:15 +00:00
Andy Wilkinson
83de1995c7
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30130
2022-03-09 12:44:53 +00:00
Andy Wilkinson
b0e4cabdd8
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30123
2022-03-09 12:37:45 +00:00
Andy Wilkinson
20d21d4e58
Set up CI with JDK 18
...
Closes gh-30104
2022-03-09 12:28:34 +00:00
Madhura Bhave
5960d2dba1
Merge branch '2.7.x' into main
2022-03-07 21:54:10 -08:00
Madhura Bhave
9628507756
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30094
2022-03-07 21:53:59 -08:00
Madhura Bhave
d131003456
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30093
2022-03-07 21:53:44 -08:00
Madhura Bhave
480ccc6175
Clarify devtools documentation when using with build plugins
...
Closes gh-17851
2022-03-07 21:52:43 -08:00
Andy Wilkinson
e2d0b348e3
Merge branch '2.7.x'
2022-03-03 20:36:13 +00:00
Andy Wilkinson
4459fb46be
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30058
2022-03-03 20:34:46 +00:00
Andy Wilkinson
2ba8b490a0
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30057
2022-03-03 20:34:34 +00:00
Andy Wilkinson
e7566e968e
Use configuration avoidance APIs in Gradle plugin's docs
...
Closes gh-30056
2022-03-03 20:27:46 +00:00
Andy Wilkinson
a5ec85bede
Merge branch '2.7.x'
2022-03-02 15:24:23 +00:00
Andy Wilkinson
b89c29f29c
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30037
2022-03-02 15:24:10 +00:00
Andy Wilkinson
ea729fc1c6
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30036
2022-03-02 15:21:43 +00:00
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
2022-03-02 15:19:09 +00:00
Andy Wilkinson
6051a10d4a
Merge branch '2.7.x'
2022-02-23 09:01:26 +00:00
Andy Wilkinson
1ae46dee6d
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29967
2022-02-23 08:59:33 +00:00
Andy Wilkinson
4f8a18fa0a
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29966
2022-02-23 08:59:16 +00:00
Andy Wilkinson
9c9e04b8e4
Use mainClass rather than deprecated main in BootRun examples
...
Closes gh-29965
2022-02-23 08:59:04 +00:00
Phillip Webb
ff4b92a3ba
Update copyright year of changed files
2022-02-16 20:44:54 -08:00
Phillip Webb
f4b849ec95
Merge branch '2.7.x'
2022-02-16 20:27:18 -08:00
Phillip Webb
26512f8ac6
Merge branch '2.6.x' into 2.7.x
2022-02-16 20:24:59 -08:00
Phillip Webb
5b4ec32645
Merge branch '2.5.x' into 2.6.x
2022-02-16 18:56:12 -08:00
Phillip Webb
c86b1330cf
Update copyright year of changed files
2022-02-16 17:56:19 -08:00
Phillip Webb
9ab1b669d0
Polish
2022-02-16 17:56:07 -08:00
Andy Wilkinson
d62d5a09a1
Merge branch '2.7.x'
2022-02-16 14:59:55 +00:00
Andy Wilkinson
ba73436ea8
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29881
2022-02-16 14:59:39 +00:00
Andy Wilkinson
86c75b7a5c
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29880
2022-02-16 14:58:58 +00:00
Andy Wilkinson
03352b0a8c
Prohibit use of APIs that prevent task configuration avoidance
...
Closes gh-29809
2022-02-16 14:57:47 +00:00
Andy Wilkinson
d7fa2e2e8f
Merge branch '2.7.x'
2022-02-16 12:01:47 +00:00
Andy Wilkinson
8e4484acea
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29878
2022-02-16 12:01:31 +00:00
Andy Wilkinson
ce4beae12f
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29877
2022-02-16 12:01:15 +00:00
izeye
6bd6f590d3
Fix Javadoc since for ResolveMainClassName#setClasspath(Object)
...
See gh-29826
2022-02-16 12:00:31 +00:00
Andy Wilkinson
9808e80ab4
Merge branch '2.7.x'
2022-02-15 12:31:38 +00:00
Andy Wilkinson
a513dbb797
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29818
2022-02-15 12:24:38 +00:00
Andy Wilkinson
f134358c78
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29817
2022-02-15 12:24:05 +00:00
Andy Wilkinson
c84b35c460
Polish "Avoid using Gradle APIs that trigger eager task creation"
...
See gh-29762
2022-02-15 08:36:29 +00:00
Lars Grefer
7cd87acd73
Avoid using Gradle APIs that trigger eager task creation
...
See gh-29762
2022-02-15 08:24:14 +00:00
Andy Wilkinson
e52a5490bf
Merge branch '2.7.x'
2022-02-14 12:39:26 +00:00
Andy Wilkinson
25e75c60ee
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29806
2022-02-14 12:32:47 +00:00
Andy Wilkinson
85d14cdb2c
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29805
2022-02-14 12:32:32 +00:00
Andy Wilkinson
1fd4a4d86b
Remove code related to unsupported versions of Gradle
...
Closes gh-29681
2022-02-14 12:31:21 +00:00
Andy Wilkinson
68bdef2cd0
Merge branch '2.7.x'
2022-02-11 13:35:03 +00:00
Andy Wilkinson
da61545925
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29749
2022-02-11 13:34:51 +00:00
Andy Wilkinson
646bb05c8d
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29748
2022-02-11 13:34:40 +00:00
Andy Wilkinson
c3eee4ad68
Align Gradle's plugin's META-INF repackaging with Maven plugin's
...
Closes gh-28562
2022-02-11 13:32:52 +00:00
Andy Wilkinson
fc23310144
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29734
2022-02-10 17:13:56 +00:00
Andy Wilkinson
d6ebce4ccf
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29733
2022-02-10 17:02:39 +00:00
Andy Wilkinson
6901f6dab2
Test our Gradle plugin against Gradle 7.4
...
Closes gh-29673
2022-02-10 16:57:13 +00:00
Andy Wilkinson
067a8dd3ec
Raise the minimum supported version of Gradle to 7.4
...
Closes gh-29674
2022-02-09 15:02:17 +00:00
Andy Wilkinson
01cc07978b
Merge branch '2.7.x'
2022-02-09 11:35:13 +00:00
Andy Wilkinson
665e1f665e
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29688
2022-02-09 11:35:03 +00:00
Andy Wilkinson
b46eba16e6
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29687
2022-02-09 11:34:51 +00:00
Andy Wilkinson
48fe1513fe
Test documented build script snippets when they change
...
Closes gh-29684
2022-02-09 11:33:40 +00:00
Andy Wilkinson
41d49717af
Merge branch '2.7.x'
2022-02-09 11:32:54 +00:00
Andy Wilkinson
1e16c2f229
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29686
2022-02-09 11:32:43 +00:00
Andy Wilkinson
c0664efa86
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29685
2022-02-09 11:32:32 +00:00
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
2022-02-09 11:31:22 +00:00
Andy Wilkinson
96118c88db
Merge branch '2.7.x'
2022-02-08 19:23:53 +00:00
Andy Wilkinson
41863d4b80
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29680
2022-02-08 19:21:59 +00:00
Andy Wilkinson
358cdb33f7
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29679
2022-02-08 19:21:48 +00:00
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
2022-02-08 19:21:37 +00:00
Stephane Nicoll
cad11addb2
Merge branch '2.7.x'
2022-01-07 17:58:35 +01:00
Stephane Nicoll
980aa616c8
Fix build failure
...
See gh-29290
2022-01-07 17:58:15 +01:00
Stephane Nicoll
11e604af41
Merge branch '2.7.x'
2022-01-07 14:43:19 +01:00
Stephane Nicoll
9821cdfd8b
Remove deprecated code
...
Closes gh-29290
2022-01-07 14:42:14 +01:00
izeye
9a6c1c531d
Test our Gradle plugin against Gradle 7.3.3
...
See gh-29161
2021-12-25 09:52:14 +01:00
Stephane Nicoll
8c9d398422
Test our Gradle plugin against Gradle 7.3.2
...
Closes gh-29093
2021-12-17 09:11:44 +01:00
Phillip Webb
003fb229fd
Merge branch '2.7.x'
2021-12-16 13:07:22 -08:00
Phillip Webb
f3bcbca841
Update copyright year of changed files
2021-12-16 13:05:17 -08:00
Stephane Nicoll
50c15769ff
Merge branch '2.7.x'
2021-12-13 09:23:52 +01:00
Stephane Nicoll
5383de4fe1
Merge branch '2.6.x' into 2.7.x
2021-12-13 09:23:44 +01:00
Stephane Nicoll
32ecbb89d6
Merge branch '2.5.x' into 2.6.x
2021-12-13 09:23:33 +01:00
Stephane Nicoll
496cd3d2ba
Polish
...
See gh-28999
2021-12-13 09:23:08 +01:00
Scott Frederick
c78b157e95
Merge branch '2.7.x'
2021-12-09 16:42:33 -06:00
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
2021-12-09 16:41:49 -06:00
Andy Wilkinson
af60a8a7cf
Test our Gradle plugin against Gradle 7.3.1
...
Closes gh-28890
2021-12-02 10:29:22 +00:00
Andy Wilkinson
814c86c5e8
Raise the minimum supported version of Gradle to 7.3
...
Closes gh-28100
2021-11-30 15:36:54 +00:00
Phillip Webb
beb68671bb
Update copyright year of changed files
2021-11-24 10:23:32 -08:00
Andy Wilkinson
0074d621d0
Merge branch '2.5.x'
...
Closes gh-28754
2021-11-19 15:37:32 +00:00
Andy Wilkinson
015cf920da
Name custom task inputs
...
Closes gh-28753
2021-11-19 15:35:39 +00:00
Andy Wilkinson
c0d90dfa8f
Merge branch '2.5.x'
...
Closes gh-28749
2021-11-19 13:36:01 +00:00
Andy Wilkinson
c083e0b049
Avoid using temp before @TempDir has initialized it
...
Closes gh-28748
2021-11-19 13:35:30 +00:00
Andy Wilkinson
0aae9c26da
Test our Gradle plugin against Gradle 7.3
...
Closes gh-28679
2021-11-15 12:47:51 +00:00
Andy Wilkinson
2a342ef416
Merge branch '2.5.x'
...
Closes gh-28662
2021-11-12 23:40:35 +00:00
Andy Wilkinson
5e4a502b2d
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28661
2021-11-12 20:31:25 +00:00
Andy Wilkinson
2cec3971d7
Prohibit unwanted dependencies in all modules not just starters
...
Closes gh-28658
2021-11-12 20:04:35 +00:00
Stephane Nicoll
98d3e99ac9
Merge branch '2.5.x'
...
Closes gh-28550
2021-11-08 08:29:56 +01:00
Stephane Nicoll
91f7ff3ba3
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28549
2021-11-08 08:29:43 +01:00
slowjoe007
5a121197fc
Fix typo
...
See gh-28548
2021-11-08 08:28:28 +01:00
Scott Frederick
e84c1abb0f
Prevent Docker volume name clashes in tests during parallel builds
...
See gh-28292
2021-10-21 15:07:15 -05:00
Phillip Webb
e25f216eab
Merge branch '2.5.x'
...
Closes gh-28425
2021-10-21 11:28:33 -07:00
Phillip Webb
daf36dff55
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28424
2021-10-21 11:27:29 -07:00
Phillip Webb
2f6651c3cb
Don't use markdown syntax in javadoc or error messages
...
Closes gh-28408
2021-10-21 11:24:54 -07:00
Scott Frederick
871468931f
Polish "Add option to customize cache volume names when building an image"
...
See gh-28292
2021-10-19 15:38:12 -05:00
Julian Liebig
dc36346285
Add option to customize cache volume names when building an image
...
This commit adds configuration to the Maven and Gradle plugins to
allow specifying the names of build and launch cache volumes provided
to the CNB builder.
See gh-28292
2021-10-19 15:38:12 -05:00
Phillip Webb
f4bd8956af
Polish "Allow build info properties to be excluded"
...
Update the Maven plugin to use an alternative syntax to exclude
the info properties and apply some minor polishing.
See gh-27412
2021-10-13 21:12:45 -07:00
Vedran Pavic
ea9faf8690
Allow build info properties to be excluded
...
Update Maven and Gradle plugins to allow build info properties to be
excluded.
Prior to this commit, the `BuildPropertiesWriter` would fail with an
NPE if the group, artifact, name or version properties were `null`.
This was specifically problematic with the Gradle plugin, since its
DSL allows `null` properties which would either be passed to the writer
or, in the case of `artifact`, converted into a string value of
"unspecified".
See gh-27412
2021-10-13 21:07:09 -07:00
Andy Wilkinson
1a505964ee
Merge branch '2.5.x'
...
Closes gh-28207
2021-10-06 10:03:24 +01:00
Andy Wilkinson
1931104d13
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28206
2021-10-06 09:57:19 +01:00
Vincent Ricard
873bca36c4
Replace latin locutions in the documentation
...
See gh-28141
2021-10-01 07:33:01 +02:00
Scott Frederick
64c49003aa
Polish "Add option to create tags for a built image"
...
See gh-27613
2021-09-28 15:32:27 -05:00
Rafael Ceccone
66f44b0c7f
Add option to create tags for a built image
...
This commit adds configuration to the Maven and Gradle plugins to
allow specifying multiple tag to be created that refer to the built
image.
See gh-27613
2021-09-28 15:32:27 -05:00
dreis2211
cf0fcafd13
Polish
...
See gh-27940
2021-09-21 08:08:29 +02:00
Scott Frederick
96238ba8b7
Expose default value for imageName in bootBuildImage task
...
Fixes gh-28040
2021-09-16 15:51:12 -05: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
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
b4f0f29bff
Test our Gradle plugin against Gradle 7.2
...
Closes gh-27732
2021-08-17 15:58:40 +01:00
Scott Frederick
2178c281e9
Polish "Add network option for image building"
...
See gh-27486
2021-08-12 17:08:52 -05:00
Jeroen Meijer
8e6d03b221
Add network option for image building
...
This commit adds configuration to the Maven and Gradle plugins to
allow specifying the network mode to be provided to the image
building goal and task.
See gh-27486
2021-08-12 17:08:52 -05:00
Andy Wilkinson
119fb6948d
Test our Gradle plugin against Gradle 7.2-rc-3
...
Closes gh-27640
2021-08-12 15:26:50 +01:00
Andy Wilkinson
c43c22283d
Merge branch '2.5.x'
...
Closes gh-27621
2021-08-10 10:45:31 +01:00
Andy Wilkinson
f19fff4c64
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27620
2021-08-10 10:45:07 +01:00
Andy Wilkinson
d4d1ca007e
Mention productionRuntimeClasspath in the docs
...
Closes gh-27558
2021-08-10 10:44:57 +01:00
Andy Wilkinson
7610fe02c5
Test our Gradle plugin against 7.2-rc-2
...
Closes gh-27593
2021-08-09 09:50:07 +01:00
Stephane Nicoll
9826304e29
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27557
2021-08-04 09:25:25 +02:00
izeye
9f44cefc56
Use deprecated mainClassName in Gradle test
...
See gh-27537
2021-08-04 09:23:52 +02:00
Andy Wilkinson
cdad8e2b7f
Merge branch '2.5.x'
2021-07-29 17:28:38 +01:00
Andy Wilkinson
85054723f0
Reinstate GradleProjectBuilder for compatibility with JDK17-ea32
...
See gh-27521
2021-07-29 17:22:59 +01:00
Andy Wilkinson
23c4674352
Merge branch '2.5.x'
...
Closes gh-27522
2021-07-29 12:24:54 +01:00
Andy Wilkinson
ca5af2d456
Test our Gradle plugin against Gradle 7.2-rc-1
...
Closes gh-27521
2021-07-29 12:05:14 +01:00
Andy Wilkinson
04dc62904f
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27495
2021-07-26 15:23:17 +01:00
Andy Wilkinson
5d9da7206e
Limit use of deprecated mainClassName in Gradle plugin tests
...
Closes gh-27320
2021-07-26 15:21:44 +01:00
Scott Frederick
9f001efa29
Adjust fat jar central directory to account for launch script
...
An upgrade to Apache Commons Compress allows the build plugins to write
the launch script to the fat jar as a proper preamble, making the file
compatible with more jar and zip tooling.
Fixes gh-22336
2021-07-19 15:02:42 -05:00
Scott Frederick
a0b32251eb
Split gradle test support into a separate module
...
See gh-25824
2021-07-16 12:52:39 -05:00
Andy Wilkinson
25234219ce
Merge branch '2.5.x'
...
Closes gh-27365
2021-07-16 11:51:43 +01:00
dreis2211
be38ce3645
Disable Gradle plugin tests that fail on JDK 17
...
See gh-27328
2021-07-16 11:42:51 +01:00
Stephane Nicoll
dc5acb0019
Remove deprecated code flagged for removal
...
Closes gh-27303
2021-07-14 11:50:01 +02: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
ff79787def
Avoid using deprecated API to get Kotlin Plugin's version
...
Closes gh-27090
2021-07-08 10:45:09 +01:00
Andy Wilkinson
c21791e671
Test our Gradle plugin against Gradle 7.1.1
...
Closes gh-27142
2021-07-07 17:57:14 +01:00
Phillip Webb
dfbd82b838
Fix Kotlin 1.5.20 classpath issues
...
See gh-27086
2021-06-24 14:05:36 -07:00
Phillip Webb
d44207161f
Suppress Kotlin 1.5.20 deprecation warning
...
See gh-27086
2021-06-24 11:30:58 -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
Phillip Webb
af37f59136
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27056
2021-06-23 17:13:13 -07:00
Madhura Bhave
b790c82732
Apply exclusions to existing war entries
...
Update `RepackageMojo` and supporting classes so that `exclusions`
on the repackage goal apply to both the contributed libraries and any
existing jar entries already contained in the original war.
Prior to this commit, exclusions would apply to contributed jars (for
example, those in `WEB-INF/lib-provided`) but not jars that were
packaged directly into `WEB-INF/lib` by the war plugin
Fixes gh-15808
Co-authored-by: Phillip Webb <pwebb@vmware.com>
2021-06-23 15:08:31 -07:00
Andy Wilkinson
07e7398d10
Include 6.9.x in version requirements message
...
Fixes gh-26952
2021-06-21 18:20:08 +01:00
Andy Wilkinson
8405df10b8
Merge branch '2.4.x' into 2.5.x
...
Closes gh-26997
2021-06-21 14:34:11 +01:00
Andy Wilkinson
e18eb08222
Fix additional metadata locations with config cache
...
Previously, a project with a dependency on Spring Boot's configuration
processor would fail to build when the configuration cache is enabled
due to it accessing the Project during task execution.
Instead of accessing the project during task execution, this commit
updates the code to retrieve the resource locations from the matching
source set in advance. The locations are then stored in the action
that configures the compile task when needed.
Closes gh-26880
2021-06-21 14:31:04 +01:00
Andy Wilkinson
a2772e288a
Merge branch '2.4.x' into 2.5.x
...
Closes gh-26947
2021-06-17 17:27:56 +01:00
Andy Wilkinson
cd808d2f18
Only get Kotlin plugin's version once we know we need it
...
Fixes gh-26946
2021-06-17 17:27:03 +01:00
Andy Wilkinson
6a51c272b9
Test our Gradle plugin against Gradle 7.1
...
Closes gh-26904
2021-06-14 21:01:06 +01:00
Andy Wilkinson
9e2339b5d0
Merge branch '2.4.x' into 2.5.x
2021-06-14 13:36:29 +01:00
Andy Wilkinson
16bfa669e1
Polish authors separators
2021-06-14 13:35:30 +01:00
Andy Wilkinson
5f26fd9ccb
Merge branch '2.4.x' into 2.5.x
...
Closes gh-26891
2021-06-14 13:28:54 +01:00
Andy Wilkinson
f6b7730dac
Use Asciidoctor's revision line to provide document's version
...
Using the revision line means that the revision number is automatically
set. The revision number is then included by the HTML and PDF backends
in the standard location. In the HTML backend that's alongside the
list of authors. In the PDF backend that's on the title page.
Closes gh-26851
2021-06-14 13:24:01 +01: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
Andy Wilkinson
03f8a46c80
Test our Gradle plugin against 7.1-rc-2
...
Closes gh-26825
2021-06-09 09:41:25 +01:00
Phillip Webb
4d62e47c5d
Merge branch '2.3.x' into 2.4.x
2021-06-08 18:05:12 -07:00
Phillip Webb
703eaa71f4
Remove main class configuration fallback
...
Remove fallback code since we now require Gradle 6.8 and can depend
on the `getMainClass` method being present.
Closes gh-26794
2021-06-08 18:00:50 -07:00
Andy Wilkinson
87d35250a5
Test our Gradle plugin against 7.1-rc-1
...
7.1-rc-1 deprecates JavaExec's main property in favor of mainClass
which was introduced in Gradle 6.4. This commit updates some tests
to use mainClass rather than main that would otherwise have failed
due to deprecation warnings in their output.
Closes gh-26793
2021-06-07 13:35:52 +01:00
Stephane Nicoll
aff1366731
Polish "Fix typo in 'Reacting to the Maven plugin' title"
...
See gh-26751
2021-06-04 09:51:48 +02:00
Abel Salgado Romero
9eea502c3e
Fix typo in 'Reacting to the Maven plugin' title
...
See gh-26751
2021-06-04 09:46:47 +02:00
Scott Frederick
f560e86f03
Write buildpack directories to builder layer
...
When a custom buildpack is provided for image building, the contents
of the buildpack directory, tgz file, or image are copied as tar
entries to a new layer in the ephemeral builder image. Prior to this
commit, only file entries from the buildpack source were copied as
builder layer tar entries; intermediate directory entries from the
source were not copied. This results in directories being created in
the builder container using default permissions. This worked on most
Linux-like OSs where the default permissions allow others-read
access. On some OSs like Arch Linux where the default directory
permissions do not allow others-read, this prevented the lifecycle
processes from reading the buildpack files.
This commit explicitly creates all intermediate directory tar entries
in the builder image layer to ensure that the buildpack directories
and files can be read by the lifecycle processes.
Fixes gh-26658
2021-06-02 14:09:53 -05:00
Phillip Webb
5258c26f90
Merge branch '2.4.x'
2021-05-27 13:15:19 -07:00
Phillip Webb
49c30854af
Rename PRODUCTION_RUNTIME_CLASSPATH_NAME
...
Rename the now public constant for consistency with the JavaPlugin.
See gh-26686
2021-05-27 13:14:16 -07:00
Phillip Webb
ac0c1b1456
Merge branch '2.4.x'
...
Closes gh-26687
2021-05-27 12:08:49 -07:00
Phillip Webb
1e0ae9d5e3
Make PRODUCTION_RUNTIME_CLASSPATH_NAME public
...
Change `SpringBootPlugin.PRODUCTION_RUNTIME_CLASSPATH_NAME` from package
private to public so that it can be accessed in user build scripts.
Fixes gh-26686
2021-05-27 12:07:35 -07:00
Phillip Webb
ab958d2394
Include io.spring.asciidoctor.backends group
...
Update `repositories` declaration to include the
'io.spring.asciidoctor.backends' group.
See gh-26293
2021-05-19 22:58:31 -07:00
Phillip Webb
1702c9fc3d
Rework title anchors for gradle docs
...
Closes gh-26618
2021-05-19 21:19:24 -07:00
Phillip Webb
2dbf39c738
Polish asciidoc formatting
2021-05-19 21:19:24 -07:00
Phillip Webb
8a3f835ffe
Set Asciidoctor attribute-missing to warn
...
Closes gh-26590
2021-05-19 11:53:46 -07:00
Stephane Nicoll
d3c817b7ba
Polish "Remove unnecessary throws declaration in tests"
...
See gh-26441
2021-05-17 09:36:53 +02:00
weixsun
8a2be288a3
Remove unnecessary throws declaration in tests
...
See gh-26441
2021-05-17 09:31:51 +02:00
Andy Wilkinson
1db8ca60aa
Test our Gradle plugin against Gradle 7.0.2
...
Closes gh-26464
2021-05-14 13:58:46 +01:00
Scott Frederick
b62905b91d
Merge branch '2.4.x'
...
Closes gh-25840
2021-05-12 15:48:59 -05:00
Scott Frederick
8ac297d6f3
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25839
2021-05-12 14:57:40 -05:00
Scott Frederick
32d378a348
Use test harness for image building integration tests
...
This commit modifies the integration tests for the Maven and Gradle
image building goal and task to use a custom builder as a test harness
to verify that the plugins invoke the builder as expected.
Fixes gh-25838
2021-05-12 14:51:45 -05:00
Andy Wilkinson
07de9e3920
Merge branch '2.4.x'
2021-05-12 17:40:58 +01:00
Andy Wilkinson
e29d2e208e
Merge branch '2.3.x' into 2.4.x
2021-05-12 17:40:48 +01:00
Andy Wilkinson
b3af6d6403
Polish
...
See gh-25798
2021-05-12 17:40:33 +01:00
dreis2211
ba2a4781d2
Test our Gradle Plugin against Gradle 7.0.1
...
See gh-26420
2021-05-11 08:25:19 +02: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
Andy Wilkinson
dc5f115c04
Document support for Gradle 6.9
...
Closes gh-26409
2021-05-07 11:29:51 +01:00
Andy Wilkinson
b3071dab91
Merge branch '2.4.x'
...
Closes gh-26412
2021-05-07 11:26:18 +01:00
Andy Wilkinson
fe4d20c976
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26411
2021-05-07 11:25:10 +01:00
Andy Wilkinson
6daf67a88c
Upgrade to Gradle 6.9
...
Closes gh-26408
2021-05-07 11:21:24 +01:00
Andy Wilkinson
2976fd9165
Merge branch '2.4.x'
...
Closes gh-26397
2021-05-06 20:12:41 +01:00
Andy Wilkinson
fe696ee22a
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26396
2021-05-06 20:11:59 +01:00
Andy Wilkinson
ef9e3bafff
Test our Gradle plugin against 6.9-rc-2
...
Closes gh-26395
2021-05-06 20:10:54 +01:00
Andy Wilkinson
aeea15be0f
Merge branch '2.4.x'
...
Closes gh-26365
2021-05-05 09:53:20 +01:00
Andy Wilkinson
f7fae8f0f2
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26364
2021-05-05 09:52:53 +01:00
Andy Wilkinson
b3275c5647
Align productionRuntimeClasspath with runtimeClasspath
...
Fixes gh-25798
2021-05-05 09:52:44 +01:00
Andy Wilkinson
b976483852
Merge branch '2.4.x'
...
Closes gh-26330
2021-04-30 16:56:46 +01:00
Andy Wilkinson
c0fe23181c
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26329
2021-04-30 16:55:10 +01:00
Andy Wilkinson
94ca2d1e78
Test the Gradle plugin against Gradle 6.9-rc-1
...
Closes gh-26267
2021-04-30 16:52:52 +01:00
Andy Wilkinson
fa81b41afc
Merge branch '2.4.x'
...
Closes gh-26301
2021-04-29 11:37:13 +01:00
Andy Wilkinson
94519c33b1
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26300
2021-04-29 11:36:15 +01:00
Andy Wilkinson
ef5fbb0669
Configure bootBuildImage's targetJavaVersion using a provider
...
Previously, the targetJavaVersion property of bootBuildImage was set
using the project's target compatibility directly. This meant that
property's value would reflect the configured target compatibility at
the time of the task's creation and any subsequent changes to the
target compatibility would be missed.
This commit updates the registration of the bootBuildImage task to set
the value of the targetJavaVersion property using a provider. This
indirection means that the project's target compatibility isn't read
until the value of the targetJavaVersion is read, allowing any changes
to the target compatibility to be picked up even if they're made after
the bootBuildImage task has been created.
Fixes gh-26297
2021-04-29 11:36:03 +01:00
Andy Wilkinson
6953da2013
Merge branch '2.4.x'
...
Closes gh-26257
2021-04-27 15:19:04 +01:00
Andy Wilkinson
a1138efc5f
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26256
2021-04-27 15:18:23 +01:00
Andy Wilkinson
a470c1af3a
Align documentation with main default branch name
...
Closes gh-26255
2021-04-27 15:18:00 +01:00
Andy Wilkinson
b9348c6d28
Merge branch '2.4.x'
...
Closes gh-26169
2021-04-20 11:26:46 +01:00
Andy Wilkinson
bc1a462143
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26168
2021-04-20 11:19:10 +01:00
Andy Wilkinson
82198a99e0
Polish nohttp configuration
...
Closes gh-26166
2021-04-20 11:15:13 +01:00
Stephane Nicoll
548baf7914
Update copyright year of changed file
...
See gh-26145
2021-04-19 09:34:56 +02:00
izeye
996472b42d
Polish
...
See gh-26145
2021-04-19 09:34:55 +02:00
Andy Wilkinson
b0cce645dd
Use a non-deprecated class to identify kotlin-gradle-plugin-api jar
...
See gh-26080
2021-04-13 20:29:36 +01:00
Andy Wilkinson
6f2b4aa685
Upgrade to Kotlin 1.5.0-RC
...
Closes gh-26080
Closes gh-25498
2021-04-13 19:51:03 +01:00
Andy Wilkinson
c4750fd0ff
Support Gradle 7 and raise minimum supported version to 6.8
...
Closes gh-26026
2021-04-12 15:20:32 +01:00
dreis2211
db79fe8b2c
Test our Gradle Plugin against Gradle 7.0
...
See gh-25997
2021-04-10 10:48:44 +02:00
Scott Frederick
e27d4848dd
Merge branch '2.4.x'
...
Closes gh-25993
2021-04-09 14:12:36 -05:00
Scott Frederick
6a7f1f1c56
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25992
2021-04-09 14:11:47 -05:00
Scott Frederick
e19443093d
Document runtime JVM configuration when building an image
...
Fixes gh-21478
2021-04-09 14:06:24 -05:00
Andy Wilkinson
8b5f914ba5
Revert "Merge branch '2.4.x'"
...
This reverts commit 97b26b4886
, reversing
changes made to 6f9b1ed6a3
.
See gh-25840
2021-04-07 10:20:23 +01:00
Andy Wilkinson
e9ce20dbf4
Revert "Merge branch '2.3.x' into 2.4.x"
...
This reverts commit 586ce00e06
, reversing
changes made to 563b8a8cec
.
See gh-25839
2021-04-07 10:19:20 +01:00
Andy Wilkinson
b35d1ec6e8
Revert "Use test harness for image building integration tests"
...
This reverts commit da9d8d6055
.
See gh-25838
2021-04-07 09:30:51 +01:00
Phillip Webb
807ea1af0d
Update copyright year of changed files
2021-04-06 14:59:52 -07:00
Andy Wilkinson
095ff18854
Test our Gradle plugin against Gradle 7.0-rc-2
...
Closes gh-25888
2021-04-06 10:30:35 +01:00
Scott Frederick
97b26b4886
Merge branch '2.4.x'
...
Closes gh-25840
2021-03-30 21:00:38 -05:00
Scott Frederick
586ce00e06
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25839
2021-03-30 17:39:10 -05:00
Scott Frederick
da9d8d6055
Use test harness for image building integration tests
...
This commit modifies the integration tests for the Maven and Gradle
image building goal and task to use a custom builder as a test harness
to verify that the plugins invoke the builder as expected.
Fixes gh-25838
2021-03-30 16:48:28 -05:00
Phillip Webb
8c31d29acf
Merge branch '2.4.x'
2021-03-30 09:29:59 -07:00
Phillip Webb
a28a3ae090
Merge branch '2.3.x' into 2.4.x
2021-03-30 09:25:46 -07:00
Phillip Webb
9c8a97809d
Consistent use of @deprecated since
...
Restore the patch version number for consistency with `@since`
tags.
See gh-25808
2021-03-30 09:20:30 -07:00
Phillip Webb
c9451b59f2
Merge branch '2.4.x'
2021-03-29 15:51:23 -07:00
Phillip Webb
a0f5169966
Polish
2021-03-29 15:51:13 -07:00
Phillip Webb
44b1751bb4
Merge branch '2.4.x'
...
Closes gh-25826
2021-03-29 15:48:20 -07:00
Phillip Webb
363f5829d1
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25825
2021-03-29 15:46:50 -07:00
Phillip Webb
26dd1b9a26
Update deprecations with for removal targets
...
Update all deprecation tags to include a removal target.
Closes gh-25808
2021-03-29 15:44:58 -07:00
dreis2211
a9a37f0dd5
Increase test coverage on Java 16
...
See gh-25809
2021-03-26 19:38:54 +00:00
Andy Wilkinson
ca46fe7cd0
Test our Gradle plugin against Gradle 7.0-rc-1
...
Closes gh-25763
2021-03-23 10:41:43 +00:00
Andy Wilkinson
fb670ee654
Drop support for Gradle 5.6.x
...
Closes gh-24225
2021-03-19 17:30:27 +00:00
Andy Wilkinson
83342c7aa7
Test the Gradle plugin against 7.0-milestone-3
...
Closes gh-25747
2021-03-19 17:01:38 +00:00
Andy Wilkinson
ebdb046ca9
Leave jar and war tasks enabled but configured with a classifier
...
Closes gh-23797
2021-03-16 10:31:56 +00:00
Phillip Webb
6e5c510e0a
Migrate to asciidoctor-spring-backends
...
Migrate to the snapshot version of asciidoctor-spring-backends.
See gh-25553
2021-03-08 22:07:17 -08:00
Stephane Nicoll
76d0a7f8ba
Merge branch '2.4.x'
...
Closes gh-25506
2021-03-05 10:03:42 +01:00
dreis2211
89a44f3da4
Fix some assertions
...
See gh-25499
2021-03-05 09:56:55 +01:00
Andy Wilkinson
961a34a5ee
Merge branch '2.4.x'
...
Closes gh-25497
2021-03-04 19:15:03 +00: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
Scott Frederick
434db48969
Merge branch '2.4.x'
...
Closes gh-25469
2021-03-01 16:01:12 -06:00
Scott Frederick
afb60d6161
Add tests for Gradle examples used in plugin docs
...
Fixes gh-25468
2021-03-01 15:22:15 -06:00
Stephane Nicoll
a80f1af811
Merge branch '2.4.x'
...
Closes gh-25463
2021-03-01 10:18:42 +01:00
Stephane Nicoll
ed1c68f567
Update copyright year of changed file
...
See gh-25454
2021-03-01 10:06:23 +01:00
jnizet
cbab2396e2
Fix property name in gradle plugin documentation
...
See gh-25454
2021-03-01 10:01:52 +01:00
Andy Wilkinson
b36caec413
Merge branch '2.4.x'
...
Closes gh-25438
2021-02-25 17:33:00 +00:00
Andy Wilkinson
d48551ff12
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25437
2021-02-25 17:32:40 +00:00
Stefan Wolf
86ca32e694
Enable stricter validation for Gradle plugin
...
See gh-25409
2021-02-25 17:28:51 +00:00
Scott Frederick
a80c4ad38d
Support image building with Gradle and war packaging
...
This commit updates the Gradle image building task to support building
images from executable and non-executable war files.
Fixes gh-23825
2021-02-24 14:42:46 -06:00
Andy Wilkinson
9836b060d4
Test the Gradle plugin against 7.0-milestone-2
...
Closes gh-25404
2021-02-24 11:28:45 +00:00
Scott Frederick
76e42ff96f
Correct grouping of custom buildpacks
...
This commit corrects the order.toml file that is generated and added
to the builder when building an image using custom buildpacks with the
Maven or Gradle plugin in order to support buildpacks that depend on
detection as a group.
Fixes gh-25378
2021-02-23 13:56:57 -06:00
Scott Frederick
89555a8745
Add bindings option for image building
...
This commit adds configuration to the Maven and Gradle plugins to
allow a list of volume mount bindings to be provided to the image
building goal and task. This enables service bindings to be mounted
in the builder image that are recognized by buildpacks to support
custom certificates, build tool configuration, APM integration, and
other buildpack features.
Fixes gh-23518
2021-02-22 16:51:24 -06:00
Andy Wilkinson
a14bf7a3b8
Deprecate support for Gradle's maven plugin
...
Closes gh-25267
2021-02-19 19:29:17 +00:00
Scott Frederick
f54f784f80
Add buildpack option for image building
...
This commit adds configuration to the Maven and Gradle plugins to
allow a list of buildpacks to be provided to the image building
goal and task.
Fixes gh-21722
2021-02-18 17:28:25 -06:00
Andy Wilkinson
5618646fc7
Merge branch '2.4.x'
...
Closes gh-25308
2021-02-16 11:30:25 +00:00
Andy Wilkinson
b86351d0cf
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25307
2021-02-16 11:30:03 +00:00
Andy Wilkinson
a2adb877ee
Polish "Encourage use of maven-publish plugin in Gradle docs"
...
See gh-25299
2021-02-16 11:22:47 +00:00
Robert Smith
c0a5245a3e
Encourage use of maven-publish plugin in Gradle docs
...
See gh-25299
2021-02-16 11:19:27 +00:00
Andy Wilkinson
514aede91e
Merge branch '2.4.x'
...
Closes gh-25168
2021-02-10 12:20:02 +00:00
Andy Wilkinson
45e6c12cb6
Consider transitives when identifying project dependencies
...
Previously, when building a layered jar, the Gradle plugin only
considered a configuration's direct dependencies when identifying
project dependencies. This resulted in transitive project dependencies
being missed when deciding which dependencies belong in the
application layer.
This commit updates ResolvedDependencies to consider all projects
from the root project when collecting the IDs of local projects. This
ensures that any project dependency, no matter where it appears in the
dependency graph, is successfully identified.
Fixes gh-25163
2021-02-10 12:10:07 +00:00
Andy Wilkinson
d30251092b
Test the Gradle Plugin against 7.0-milestone-1
...
Closes gh-25103
2021-02-04 10:16:48 +00:00
Andy Wilkinson
db781a0d84
Merge branch '2.4.x'
...
See gh-25077
2021-02-02 15:14:18 +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
Phillip Webb
d9f3e89395
Merge branch '2.4.x'
2021-02-01 22:11:17 -08:00
Phillip Webb
630d216430
Update copyright year of changed files
2021-02-01 22:10:24 -08:00
Phillip Webb
939b5dfc26
Add junit-platform-launcher dependency
...
Update `build.gradle` files to ensure that `junit-platform-launcher` is
a `testRuntimeOnly` dependency. This ensures that tests can be run from
Eclipse.
Closes gh-25074
2021-02-01 15:31:28 -08:00
Madhura Bhave
c73e3cc2dc
Update documentation for layered wars
...
Closes gh-22821
Closes gh-22195
2021-02-01 14:43:43 -08:00
Madhura Bhave
1245e5eec9
Add support for creating layered war files with Gradle
...
See gh-22195
2021-02-01 14:43:42 -08:00
Phillip Webb
c76a0f7a81
Merge branch '2.4.x'
...
Closes gh-25043
2021-01-28 18:57:10 -08:00
Phillip Webb
ca9b612e27
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25042
2021-01-28 18:56:59 -08:00
jongmin92
23ecb86089
Document missing code to run Gradle bootRun task
...
See gh-25012
2021-01-28 18:56:21 -08:00
Phillip Webb
c9a2c4e326
Merge branch '2.4.x'
2021-01-26 19:06:48 -08:00
Phillip Webb
d06407ec0a
Update copyright year of changed files
2021-01-26 19:06:14 -08:00
Phillip Webb
b1f27b7604
Merge branch '2.4.x'
...
Closes gh-24995
2021-01-25 21:36:36 -08:00
Phillip Webb
522f68cb40
Merge branch '2.3.x' into 2.4.x
...
Closes gh-24994
2021-01-25 21:36:12 -08:00
Phillip Webb
464b302655
Set withTestKitDir per Gradle version
...
Attempt to fix cache locking issues by setting a unique `withTestKitDir`
directory for each tested Gradle version.
Closes gh-24993
2021-01-25 21:35:25 -08:00
Andy Wilkinson
f3fd55dac6
Merge branch '2.4.x'
...
Closes gh-24976
2021-01-22 14:59:35 +00:00
Andy Wilkinson
9c8645dec2
Merge branch '2.3.x' into 2.4.x
...
Closes gh-24975
2021-01-22 14:59:23 +00:00
Andy Wilkinson
46d908f632
Upgrade to Gradle 6.8.1
...
Closes gh-24737
2021-01-22 14:20:57 +00:00
Stephane Nicoll
2c2c160579
Remove deprecated code
...
See gh-24806
2021-01-15 14:14:33 +01:00
Phillip Webb
6c2ff56fba
Fix tests to also work in IDE
2021-01-12 17:31:53 -08:00
Phillip Webb
a6a7c06e55
Merge branch '2.3.x' into 2.4.x
2021-01-12 12:04:11 -08:00
Phillip Webb
9da0bd8523
Update copyright year of changed files
2021-01-12 12:02:57 -08:00
Andy Wilkinson
c3dfb9bd29
Merge branch '2.3.x' into 2.4.x
...
Closes gh-24768
2021-01-12 13:12:10 +00:00
Andy Wilkinson
997505005b
Handle files larger than Integer.MAX_VALUE bytes in bootJar and bootWar
...
Fixes gh-24618
2021-01-12 13:11:46 +00:00
Andy Wilkinson
5ae9fbedcd
Merge branch '2.3.x' into 2.4.x
...
Closes gh-24738
2021-01-11 11:33:30 +00:00
Andy Wilkinson
7625a979db
Configure bootRun to use project's Java toolchain by default
...
Previously, unlike the application plugin's run task, our bootRun task
ignored the project's Java toolchain. This meant that the application
was run on a JVM with the same Java version as the one being used by
Gradle itself. This could result in a failure if the application
required a more modern JVM.
This commit updates the plugin to configure the bootRun task's
JavaLauncher convention to be one derived from the project's Java
toolchain. Toolchain support was introduced in Gradle 6.7 so this is
only done when using Gradle 6.7 and later.
Fixes gh-24517
2021-01-11 11:21:53 +00:00
Andy Wilkinson
3c3aa9e486
Merge branch '2.3.x' into 2.4.x
...
Closes gh-24735
2021-01-11 11:03:35 +00:00
Andy Wilkinson
064de4e073
Check configured JavaLauncher when determining version of the JVM
...
Previously, bootRun assumed that the Java version of the JVM that would
run the application would be the same as the Java version of the JVM
that is running the build. This assumption does not hold true when
Gradle's toolchain support is used to configure tasks that fork a new
JVM to use a version other than that being used by Gradle itself.
This commit updates the BootRun task to query the JavaLauncher property
when determining the version of Java on which the application will be
run. Toolchain support and the JavaLauncher property are new in Gradle
6.7. To support earlier versions of Gradle, NoSuchMethodError is caught
we continue as if no JavaLauncher has been configured and use the local
JVM's Java version.
Fixes gh-24512
2021-01-11 10:36:16 +00:00
Andy Wilkinson
9e389c8376
Merge branch '2.3.x' into 2.4.x
...
Closes gh-24710
2021-01-08 17:07:45 +00:00
Andy Wilkinson
5ad4d627fd
Fix classpath index so entries match those expected by the launcher
...
This reverts commit ad164269e9
and adds
some additional tests.
Fixes gh-24192
2021-01-08 15:32:19 +00:00
Scott Frederick
dfcabe1665
Merge branch '2.3.x' into 2.4.x
...
Fixes gh-24521 in 2.4.2
2020-12-16 14:53:55 -06:00
Scott Frederick
0e5df2296e
Fail with Gradle bootBuildImage and war packaging
...
Prior to this commit, running the bootBuildImage Gradle task on a
project configured for war packaging would result in a jar file being
built and used in the image instead of the war file. With this commit
an error will be thrown from the plugin in this case.
Fixes gh-24521
2020-12-16 13:23:43 -06:00
Andy Wilkinson
5fdb2ae2fd
Protect PluginApplicationActions against absent plugin classes
...
Closes gh-24526
2020-12-16 09:51:25 +00:00
Phillip Webb
72d36e0c07
Update copyright year of changed files
2020-12-10 10:46:04 -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
Phillip Webb
837fc83527
Fix checkstyle header violations
...
See gh-24337
2020-12-04 18:05:53 -08:00
Scott Frederick
da2276e7d4
Use stable builder and run images in integration tests
...
Fixes gh-24183
2020-11-17 13:54:10 -06:00
Scott Frederick
59e0f7317e
Avoid image pulls in integration tests
...
This commit sets the pull policy to `IF_NOT_PRESENT` where possible
in integration tests for the Maven and Gradle plugins to reduce
the number of times the default Paketo builder and run images are
pulled from Docker Hub.
Fixes gh-24113
2020-11-10 16:19:05 -06:00
Stephane Nicoll
b6fc0913cf
Merge branch '2.3.x'
...
Closes gh-24104
2020-11-10 17:44:05 +01:00
Stephane Nicoll
515b18e142
Merge branch '2.3.x'
...
Closes gh-24108
2020-11-10 17:10:26 +01:00
Andy Wilkinson
409e3ccecf
Ignore resolution of copied configuration
...
When a Configuration is copied, any before and after resolve actions
that are registered with its ResolvableDependencies are also copied
over. This means that, when a copied configuration is resolved the
resolution actions may be called on a ResolvableDependencies instances
that isn't the one to which they were added.
Previously, the above-described Gradle behaviour would result in
BootJar accessed the ResolvedConfiguration of a Configuration that may
not have yet been resolved. At best this would trigger Configuration
resolution and at worst it would fail. A failure could occur if the
configuration had been copied so that it could be made resolvable.
The afterResolve action would then try to access the
ResolvedConfiguration of the original Configuration. This would trigger
a resolution attempt that fails due to the original configuration being
marked as unresolvable.
This commit updates the afterResolve action in BootJar to check that
the ResolvableDependencies with which it is called matches the
ResolvableDependencies with which it was original registered. Only
when the two match, and therefore the configuration has actually been
resolved, does processing proceed.
Fixes gh-24072
2020-11-09 10:21:41 +00:00
Andy Wilkinson
c85cc33ca9
Fix main class resolution failure when loaded from config cache
...
See gh-22922
2020-10-25 08:05:59 +00:00
Andy Wilkinson
7cbcd42eba
Adapt test to cope with increased Instant precision on Java 11
...
See gh-22922
2020-10-23 14:38:36 +01:00
Andy Wilkinson
4a4fec6310
Avoid calling getProject() during BootBuildImage's execution
...
See gh-22922
2020-10-23 13:23:52 +01:00
Andy Wilkinson
c409d50c14
Document support for Gradle's configuration cache
...
See gh-22922
2020-10-23 12:34:27 +01:00
Andy Wilkinson
806464edd1
Update BootBuildImage to support Gradle's configuration cache
...
See gh-22922
2020-10-23 12:34:24 +01:00
Andy Wilkinson
b1c4af4081
Update bootJar and bootWar to use new main class resolution mechanism
...
See gh-22922
2020-10-23 12:34:21 +01:00
Andy Wilkinson
c078a48064
Update BootRun to support Gradle's configuration cache
...
See gh-22922
2020-10-23 12:34:15 +01:00
Andy Wilkinson
d1f543fc1d
Update BuildInfo to support Gradle's configuration cache
...
See gh-22922
2020-10-23 12:34:12 +01:00
Andy Wilkinson
83cfd3b2e6
Update BootWar to support Gradle's configuration cache
...
See gh-22922
2020-10-23 12:34:07 +01:00
Andy Wilkinson
081ef2d905
Update BootJar to support Gradle's configuration cache
...
See gh-22922
2020-10-23 12:34:04 +01:00
Andy Wilkinson
c828521912
Allow tests to provide properties that modify the build.gradle script
...
See gh-22922
2020-10-23 12:34:01 +01:00
Andy Wilkinson
d136324b99
Add support for testing the Gradle plugin with --configuration-cache
...
See gh-22922
2020-10-23 12:33:51 +01:00
Andy Wilkinson
0aa0cba3f7
Fix content filters when excludeProjectDependencies() is used
...
Fixes gh-23763
2020-10-20 13:09:59 +01:00
olivier.antoine
ded2a8006a
Expose BootBuildImage's cleanCache property as a command-line option
...
See gh-23753
2020-10-20 10:28:00 +02:00
Andy Wilkinson
0f069ee9c6
Merge branch '2.3.x'
...
Closes gh-23756
2020-10-19 19:28:32 +01:00
Andy Wilkinson
633027b1cd
Upgrade to Gradle 6.7
...
Closes gh-23754
2020-10-19 17:52:01 +01:00
Andy Wilkinson
6898a97102
Merge branch '2.3.x'
...
Closes gh-23732
2020-10-17 07:55:43 +01:00