Stephane Nicoll
f52d00d9fa
Merge branch '2.7.x'
...
Closes gh-31779
2022-07-18 11:30:45 +02:00
Stephane Nicoll
92a7af4038
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31777
2022-07-18 11:30:36 +02:00
Johnny Lim
f591c75ad7
Disable incompatible tests on macOS AArch64
...
This commit also updates related test support classes.
See gh-31539
2022-07-18 11:25:52 +02:00
Andy Wilkinson
9c250cae92
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31754
2022-07-14 17:28:54 +01:00
Andy Wilkinson
8c4708982b
Test our Gradle plugin against 7.5
...
Closes gh-31753
2022-07-14 17:25:34 +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
Scott Frederick
e49597c1ae
Merge branch '2.7.x'
...
Closes gh-31559
2022-06-30 14:58:48 -05:00
Scott Frederick
e24c49a09a
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31558
2022-06-30 14:58:28 -05:00
Scott Frederick
17bdc526f6
Avoid adding layers for buildpacks that exist in the builder
...
This commit adds validation of any buildpacks that are specified for
image building to match them against buildpacks that are bundled in
the builder. If an image buildpack's ID, version, and one layer
hash match the same information stored in a label on the builder
image, that buildpack won't be added and the buildpack bundled in
the builder will be used instead. This reduces the chance of adding to
the total count of layers in a builder image unnecessarily.
Fixes gh-31233
2022-06-30 14:35:34 -05:00
dreis2211
458f989cf3
Use switch expressions where appropriate
...
See gh-31527
2022-06-24 16:19:28 +01:00
Andy Wilkinson
836b08f49d
Merge branch '2.7.x'
2022-06-24 15:03:41 +01:00
Andy Wilkinson
dfb8979456
Merge branch '2.6.x' into 2.7.x
2022-06-24 15:03:25 +01:00
Andy Wilkinson
c87340e5c1
Remove unnecessary throws
2022-06-24 15:02:58 +01:00
Andy Wilkinson
631b1e0d76
Merge branch '2.7.x'
...
Closes gh-31526
2022-06-24 13:10:10 +01:00
Andy Wilkinson
1e08f545d0
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31525
2022-06-24 13:05:06 +01:00
Andy Wilkinson
f49b16c645
Upgrade to Spring Java Format 0.0.34
...
Closes gh-31524
2022-06-24 12:57:52 +01:00
Stephane Nicoll
03b742c655
Merge branch '2.7.x'
2022-06-22 08:17:13 +02:00
Stephane Nicoll
e967d0383b
Merge branch '2.6.x' into 2.7.x
2022-06-22 08:16:18 +02:00
Stephane Nicoll
79d3e3080f
Polish
2022-06-22 08:15:04 +02:00
Phillip Webb
e77f137a32
Merge branch '2.7.x'
...
Closes gh-31485
2022-06-21 19:10:37 -07:00
Phillip Webb
13b2de3bb8
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31484
2022-06-21 19:10:23 -07:00
Phillip Webb
7fc9debf2a
Consider super classes when detecting nested property classes
...
Update `PropertyDescriptor.isParentTheSame` to consider the candidate
as well as all super classes.
Fixes gh-21626
2022-06-21 19:09:32 -07:00
dreis2211
cc91009b70
Use java.util.HexFormat where appropriate
...
See gh-31477
2022-06-21 17:02:39 +01: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
b687e1c7ee
Use Runtime.version() instead of reflection
...
See gh-31444
2022-06-19 10:28:59 +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
Phillip Webb
657fa3e64e
Merge branch '2.7.x'
...
Closes gh-31409
2022-06-16 15:36:29 -07:00
Phillip Webb
7c91ebb1b0
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31408
2022-06-16 15:36:00 -07:00
Phillip Webb
ae6311ddda
Prevent Logback from accidentally being used in Log4J2LoggingSystemTests
...
Update `Log4J2LoggingSystemTests` to exclude Logback and include
'log4j-slf4j-impl'. The `ModifiedClassPathClassLoader` has also been
updated so that it no longer automatically excludes `log4j` artifacts,
instead we now use `@ClassPathExclusions` on the relevant tests.
Fixes gh-19365
2022-06-16 15:35:32 -07:00
Andy Wilkinson
4f3180540c
Use Framework's MockSpringFactoriesLoader
...
Closes gh-31406
2022-06-16 15:40:03 +01:00
Andy Wilkinson
d370d19e7a
Merge branch '2.7.x'
...
Closes gh-31403
2022-06-16 12:14:52 +01:00
Andy Wilkinson
5e1cd28d3f
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31402
2022-06-16 12:14:28 +01:00
Lars Grefer
e8a1a0399a
Upgrade to Bouncycastle 1.71
...
Closes gh-31400
2022-06-16 12:14:06 +01:00
Phillip Webb
d84557f1f9
Merge branch '2.7.x'
...
Closes gh-31396
2022-06-15 10:53:17 -07:00
Phillip Webb
bcbcc53a09
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31395
2022-06-15 10:51:40 -07:00
Phillip Webb
b42f056ddb
Don't close jar files early
...
Update `JarFile` and related classes so that `close()` is not longer
called early.
Prior to this commit, we would always immediately close the underlying
jar file to prevent file locking issues with our build. This causes
issues on certain JVMs when they attempt to verify a signed jar.
The file lock issues have now been solved by returning a custom input
stream from `JarUrlConnection` which captures and delegates the close
method.
Fixes gh-29356
2022-06-15 10:51:01 -07:00
Stephane Nicoll
d5695c1931
Add resource hints for configuration properties
...
This commits introduces a RuntimeHintsRegistrar for configuration
properties. By default, it provides the necessary hint to load
application properties and yaml files in default locations.
Closes gh-31311
2022-06-15 10:15:27 +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
Stephane Nicoll
e2c42e4bbf
Merge branch '2.7.x'
...
Closes gh-31262
2022-06-07 09:16:19 +02:00
Stephane Nicoll
8e550933a8
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31261
2022-06-07 09:16:10 +02:00
Stephane Nicoll
bbb5966bca
Upgrade integration tests to Apache Maven 3.8.5
...
Closes gh-31260
2022-06-07 09:15:41 +02:00
Stephane Nicoll
1c94f835c7
Copy AOT-generated classes
...
Closes gh-31245
2022-06-07 08:59:57 +02:00
Stephane Nicoll
0dbcb5f6d3
Start building against Spring Framework 6.0.0-M5 snapshots
...
See gh-31241
2022-06-02 16:19:58 +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
d354c03e63
Merge branch '2.7.x'
...
Closes gh-31191
2022-05-27 15:58:57 +01:00
Andy Wilkinson
682ac53f32
Ensure that config processor runs with only AutoConfiguration
...
Fixes gh-31186
2022-05-27 15:58:00 +01:00
Andy Wilkinson
36a60d8e2e
Merge branch '2.7.x'
...
Closes gh-31181
2022-05-26 19:49:53 +01:00
Andy Wilkinson
137318a845
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31180
2022-05-26 19:49:35 +01:00
Damiano Albani
3f91ed037f
Fix Custom Layers Configuration section title in Maven plugin docs
...
See gh-31172
2022-05-26 19:46:11 +01:00
Andy Wilkinson
4bb5ba2bd0
Merge branch '2.7.x'
2022-05-26 18:26:52 +01:00
Andy Wilkinson
935d1264e0
Merge branch '2.6.x' into 2.7.x
2022-05-26 18:13:08 +01:00
Andy Wilkinson
3d203d0215
Polish
2022-05-26 17:30:39 +01:00
Andy Wilkinson
14af1bb2dc
Polish
2022-05-26 16:54:31 +01:00
Andy Wilkinson
26b89bfc80
Remove redundant throws declarations from public APIs
...
Closes gh-31179
2022-05-26 16:00:47 +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
Andy Wilkinson
e617035dba
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31167
2022-05-26 13:45:52 +01:00
Andy Wilkinson
3e7bd582a3
Upgrade to Spring Java Format 0.0.33
...
Closes gh-31166
2022-05-26 13:22:23 +01:00
Phillip Webb
68bd9d6b6d
Merge branch '2.7.x'
2022-05-19 18:09:29 -07:00
Phillip Webb
06679a4c46
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31128
2022-05-19 18:07:17 -07:00
Phillip Webb
9fa33e5645
Merge branch '2.5.x' into 2.6.x
...
Closes gh-31127
2022-05-19 18:04:54 -07:00
Phillip Webb
05a6447a8d
Polish "Resolve errors in layers.xsd"
...
Validate loaded `layer.xml` files against the XSD and additionally
update `<layers>` sub elements to have a 'minOccurs' of 0.
See gh-31126
2022-05-19 18:01:55 -07:00
Liuzh
0d78323b60
Resolve errors in layers.xsd
...
Update `layer-*.xsd` files with following fixes:
- Rename <includeProjectDependencies> to <includeModuleDependencies>
- Rename <excludeProjectDependencies> to <excludeModuleDependencies>
See gh-31126
2022-05-19 18:00:25 -07:00
Andy Wilkinson
c4beca3e01
Fix Maven-based AOT generation on Windows
...
Closes gh-30525
2022-05-18 10:54:35 +01:00
Phillip Webb
f8a41d34aa
Merge branch '2.7.x'
2022-05-17 22:22:08 -07: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
bcc27c5d22
Deleting existing output before running AOT processing
...
Closes gh-30981
2022-05-17 15:33:45 +01:00
Andy Wilkinson
08768b5821
Join compile classpath using system-dependent separator
...
See gh-30525
2022-05-16 12:37:30 +01:00
Andy Wilkinson
6c4fedb4a4
Revert "Logback 1.3 and SLF4J 2.0"
...
This reverts commit f39a080a0e
that was
pushed prematurely.
2022-05-13 16:23:48 +01:00
Andy Wilkinson
f39a080a0e
Logback 1.3 and SLF4J 2.0
2022-05-13 14:48:20 +01:00
Andy Wilkinson
0ce6e437a9
Align AotGenerateTests with spring.factories changes in Framework
2022-05-11 11:08:26 +01:00
Andy Wilkinson
770cb840c3
Use more flexible SpringFactoriesLoader
...
Closes gh-30235
Co-authored-by: Madhura Bhave <bhavem@vmware.com>
Co-authored-by: Stephane Nicoll <snicoll@vmware.com>
2022-05-09 14:13:04 +01: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
Stephane Nicoll
e81c6337c6
Add support for invoking AOT to the Maven Plugin
...
This commit adds an `aot-generate` goal to the Maven Plugin that
triggers AOT generation on the application. The new goal shares a
number of properties with the existing `run` goal and uses the same
algorithm to detect the main class to use.
Closes gh-30525
2022-04-28 13:48:52 +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
Phillip Webb
7a6ca8ce25
Merge branch '2.7.x'
2022-04-20 15:30:01 -07:00
Phillip Webb
dd5696b59b
Update copyright year of changed files
2022-04-20 15:26:30 -07: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
dreis2211
a63e730136
Remove unused private methods
...
See gh-30655
2022-04-19 08:45:44 +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
Scott Frederick
9aff0a998f
Merge branch '2.7.x'
2022-04-13 16:09:48 -05:00
Scott Frederick
f032690d0a
Add support for CNB platform API 0.9
...
Fixes gh-30566
2022-04-13 16:09:32 -05:00
Scott Frederick
e32511516e
Merge branch '2.7.x'
2022-04-04 16:29:52 -05:00
Scott Frederick
ef79a18514
Use provided scope for Maven core dependencies in Maven plugin
...
Fixes gh-29520
2022-04-04 16:00:15 -05:00
Stephane Nicoll
2a2c4be809
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30510
2022-04-03 09:33:02 +02:00
Stephane Nicoll
b2a4ae38e8
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30509
2022-04-03 09:32:39 +02:00
izeye
40d0e38e76
Test Spring Boot Gradle Plugin against Gradle 7.4.2
...
See gh-30506
2022-04-03 09:29:50 +02:00
Stephane Nicoll
5f66019706
Remove the ability to run an application in the Maven process
...
Closes gh-30501
2022-04-01 15:26:21 +02:00
Stephane Nicoll
13c9c1adb5
Merge branch '2.7.x'
2022-04-01 11:58:27 +02:00
Stephane Nicoll
2c5398898b
Polish "Deprecate running an application in the Maven JVM"
...
See gh-30479
2022-04-01 11:57:59 +02:00
Stephane Nicoll
c21b4a5280
Merge branch '2.7.x'
2022-04-01 11:35:48 +02:00
Stephane Nicoll
09696c90c7
Deprecate running an application in the Maven JVM
...
This commit deprecates the "fork" property so that the application
always runs in a dedicated process. This aligns with the behaviour of
the Gradle plugin, and simplifies the lifecycle of certain features that
would not work in a non-forked process.
Closes gh-30479
2022-04-01 11:35:34 +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
fbb060e0fe
Polish
...
See 5d8c1d9bd7
.
2022-03-29 15:22:01 +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
5d8c1d9bd7
Merge branch '2.7.x'
2022-03-29 14:30:42 +01:00
Andy Wilkinson
2f3ae02385
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30466
2022-03-29 14:24:42 +01:00
Andy Wilkinson
8f985474a6
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30465
2022-03-29 14:24:25 +01:00
Andy Wilkinson
d574563616
Document @ConstructorBinding and @DefaultValue with records
...
Closes gh-30460
2022-03-29 14:14:28 +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
Scott Frederick
040afdeafe
Merge branch '2.7.x'
2022-03-11 15:20:38 -06:00
Scott Frederick
93622d18eb
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30195
2022-03-11 15:20:15 -06:00
Scott Frederick
35a9a7fee2
Ignore deprecation warnings in Paketo system tests
...
Closes gh-30194
2022-03-11 15:19:53 -06:00
Andy Wilkinson
2600bf4719
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30142
2022-03-09 18:39:45 +00:00
Andy Wilkinson
382c6972ec
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30141
2022-03-09 18:39:32 +00: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
Moritz Halbritter
24a68fc595
Merge branch '2.7.x'
2022-03-07 14:12:19 +01:00
Moritz Halbritter
d95dc75de9
Merge branch '2.6.x' into 2.7.x
2022-03-07 14:11:22 +01:00
Moritz Halbritter
e980a53399
Merge branch '2.5.x' into 2.6.x
2022-03-07 14:11:11 +01:00
Moritz Halbritter
f3eb90046f
Remove @Repeatable support for @DisabledOnOs
...
We'll add it back again when we need it, and delay the naming issue.
See gh-30082
2022-03-07 14:10:13 +01:00
Moritz Halbritter
74fe5735d9
Polish
2022-03-07 13:28:41 +01:00
Moritz Halbritter
a1b1377733
Merge branch '2.7.x'
2022-03-07 13:23:06 +01:00
Moritz Halbritter
50d766020c
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30084
2022-03-07 13:22:53 +01:00
Moritz Halbritter
564555347f
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30083
2022-03-07 13:22:34 +01:00
Moritz Halbritter
be38311c5d
Disable incompatible tests on Linux AArch64
...
- Adds a new @DisableOnOs annotation, which is inspired from JUnit5s
@DisableOnOs annotation. This new annotation supports the architecture
and is repeatable
Closes gh-30082
2022-03-07 13:22:17 +01:00
Andy Wilkinson
5ee3fdab77
Polish "Allow @DefaultValue to be used on record components"
...
See gh-29010
2022-03-04 14:52:20 +00:00
Pavel Anisimov
976ed90cd7
Allow @DefaultValue to be used on record components
...
See gh-29010
2022-03-04 12:12:08 +00: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
89b2015adf
Merge branch '2.7.x'
2022-03-01 17:49:48 +00:00
Andy Wilkinson
07b87668a4
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30023
2022-03-01 17:49:31 +00:00
Andy Wilkinson
3630952f7b
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30022
2022-03-01 17:49:14 +00:00
Andy Wilkinson
a265f150ac
Improve parsing of numeric default values
...
Previously, all integral numbers were parsed as integers. This
caused two problems:
1. Compilation would fail if the default value for a long wasn't a
valid integer.
2. The default value for a byte or short could be out of range,
resulting in the generation of invalid metadata and an error
that could have been caught at compile time not being caught
until runtime.
This commit updates the parsing of all numeric values to use the
parse method of the target primitive type. For example,
Short.parseShort(String) is now used to parse a short.
Fixes gh-30020
2022-03-01 17:38:19 +00:00
Phillip Webb
5454e2e26a
Merge branch '2.7.x'
2022-02-23 23:02:59 -08:00
Phillip Webb
9f00c3acf5
Polish
2022-02-23 21:44:43 -08:00
Phillip Webb
adfaa8f778
Merge branch '2.6.x' into 2.7.x
2022-02-23 21:44:37 -08:00
Phillip Webb
1a3841f74e
Polish
2022-02-23 21:44:14 -08:00
Scott Frederick
df549190b5
Merge branch '2.7.x'
2022-02-23 17:56:55 -06:00
Scott Frederick
ee4e7bb923
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29982
2022-02-23 17:56:34 -06:00
Scott Frederick
59ffe28639
Ignore buildpack deprecation warnings in Paketo system tests
...
Fixes gh-29885
2022-02-23 17:56:21 -06:00
Moritz Halbritter
54f1058d63
Merge branch '2.7.x'
2022-02-23 16:10:49 +01:00
Moritz Halbritter
fd36215d72
Omit empty values for AutoConfigureAfter and AutoConfigureBefore
...
As @AutoConfiguration is now meta-annotated with @AutoConfigureAfter
and @AutoConfigureBefore, the generated property files have a lot of
superfluous lines in the format <class>.AutoConfigureAfter= and
<class>.AutoConfigureBefore=.
One can now configure in the annotation processor for each property key
if empty values should be omitted. This is currently only activated for
AutoConfigureAfter and AutoConfigureBefore
See gh-29907
2022-02-23 15:39:46 +01:00
Moritz Halbritter
7872f61bfc
Add @AutoConfiguration annotation support to the autoconfigure-processor
...
See gh-29907
2022-02-23 15:39:46 +01: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
Madhura Bhave
bf1ed5f2f8
Update copyright header on changed files
2022-02-16 14:24:22 -08:00
Madhura Bhave
44b88cc88c
Allow @ConstructorBinding to be optional
...
This commit makes @ConstructorBinding optional for a type
that has a single parameterized constructor. An @Autowired annotation
on any of the constructors indicates that the type should not be constructor
bound.
Since @ConstructorBinding is now deduced for a single parameterized constructor,
the annotation is no longer needed at the type level.
Closes gh-23216
2022-02-16 13:47:26 -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
Scott Frederick
85ea6a1b8f
Merge branch '2.7.x' into main
2022-02-11 15:31:33 -06:00
Scott Frederick
db6ef0e802
Exclude duplicate properties file when building a jar from jars
...
See gh-29670 and gh-23955
2022-02-11 15:31:20 -06: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
52ed7f74a0
Merge branch '2.7.x'
2022-02-10 16:01:18 +00:00
Andy Wilkinson
4f724f14d3
Polish "Override available() in RandomAccessDataFile's InputStream"
...
See gh-29295
2022-02-10 15:25:01 +00:00
Gnaily
49bf620f4b
Override available() in RandomAccessDataFile's InputStream
...
See gh-29295
2022-02-10 15:23:19 +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
Moritz Halbritter
7c99fbc785
Merge branch '2.7.x'
2022-02-09 14:10:56 +01:00
Moritz Halbritter
94d095ce1a
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29692
2022-02-09 14:10:41 +01:00
Moritz Halbritter
079ea41d6d
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29691
2022-02-09 14:09:33 +01:00
Moritz Halbritter
262db65a38
Ignore invalid stream types when reading log update events
...
See gh-29675
2022-02-09 14:03:02 +01: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
Phillip Webb
501d174db0
Merge branch '2.7.x'
2022-02-02 10:38:46 -08:00
Phillip Webb
ce08b519b1
Merge branch '2.6.x' into 2.7.x
2022-02-02 10:37:55 -08:00
Phillip Webb
50e0e28155
Merge branch '2.5.x' into 2.6.x
2022-02-02 10:37:32 -08:00
Phillip Webb
2b40ce09d8
Update copyright year of changed files
2022-02-02 10:35:40 -08:00
Stephane Nicoll
41fb9cf562
Merge branch '2.7.x'
2022-02-01 11:15:49 +01:00
Stephane Nicoll
f812b33cbd
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29613
2022-02-01 11:07:31 +01:00
Stephane Nicoll
136b5959c3
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29612
2022-02-01 10:59:08 +01:00
Stephane Nicoll
7f17f819a6
Polish "Enforce use of BDDMockito"
...
See gh-29178
2022-02-01 10:03:18 +01:00
Yanming Zhou
b49418aaaf
Enforce use of BDDMockito
...
1. Replace Mockito.verify*() with BDDMockito.then()
2. Replace Mockito.doReturn() with BDDMockito.willReturn()
3. Adjust checkstyle rule
See gh-29178
2022-02-01 09:37:15 +01:00
Andy Wilkinson
f2ac7d10ef
Merge branch '2.7.x'
2022-01-25 12:19:51 +00:00
Andy Wilkinson
8480abca20
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29561
2022-01-25 12:19:37 +00:00
Andy Wilkinson
fe43d527b5
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29560
2022-01-25 12:19:16 +00:00
Andy Wilkinson
3ed65f2383
Avoid running Maven plugin ITs for each s-b-dependencies change
...
Closes gh-28781
2022-01-25 12:11:19 +00:00
Scott Frederick
4494d3a805
Merge branch '2.7.x' into main
2022-01-24 16:21:11 -06:00
Scott Frederick
698eb94913
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29554
2022-01-24 16:20:33 -06:00
Scott Frederick
909ef6d635
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29553
2022-01-24 16:19:43 -06:00
Scott Frederick
000cbfa2d9
Set file permissions on all created test files
...
Closes gh-29551
2022-01-24 16:19:20 -06:00
Andy Wilkinson
de3b9a4910
Remove code deprecated for removal in 2.x
...
Closes gh-29482
2022-01-19 17:25:14 +00:00
Phillip Webb
1b7db2750d
Merge branch '2.7.x'
...
Closes gh-29373
2022-01-12 14:08:04 -08:00
Phillip Webb
e1c84e2972
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29372
2022-01-12 14:07:48 -08:00
Phillip Webb
72696cdb0f
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29371
2022-01-12 14:07:31 -08:00
Phillip Webb
9cf55808fb
Ensure run user actually exists
...
Update `launch.script` so that the `run_user` variable is only set when
the user actually exists. Prior to this commit, if the jar file was
owned by a non-existing user the startup script could fail.
Fixes gh-29370
2022-01-12 14:05:30 -08: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
Andy Wilkinson
ccc924b908
Merge branch '2.7.x'
2022-01-05 11:58:50 +00:00
Andy Wilkinson
508d0af453
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29269
2022-01-05 11:58:33 +00:00
Andy Wilkinson
a6d8ff4677
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29268
2022-01-05 11:58:03 +00:00
Andy Wilkinson
41b01cc289
Only write parent entries when entry is new
...
Previously, when writing a repackaged jar, an attempt to write all of
an entry's parent directories would always be made, irrespective of
whether or not the entry itself had already been written. This was
inefficient as, due to the way that the jar is written, once an entry
itself has been written, we know that all of its parent directories
will also have been written.
This commit updates the jar writer so that no attempt is made to
write parent directory entries if the entry itself has already been
written.
Fixes gh-29175
2022-01-05 11:49:48 +00:00
Stephane Nicoll
eb81cbf053
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29173
2021-12-25 09:55:38 +01:00
Stephane Nicoll
8ee0640cc0
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29172
2021-12-25 09:55:24 +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
a05714ad9f
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29097
2021-12-17 10:30:42 +01:00
Stephane Nicoll
10362a9315
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29096
2021-12-17 10:30:26 +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
Scott Frederick
2b7a034776
Merge branch '2.7.x'
2021-12-07 14:11:06 -06:00
Scott Frederick
3cb30cb283
Merge branch '2.6.x' into 2.7.x
...
Closes gh-28923
2021-12-07 14:10:46 -06:00
Scott Frederick
3555837845
Merge branch '2.5.x' into 2.6.x
...
Closes gh-28922
2021-12-07 14:10:28 -06:00
Scott Frederick
b0b2cd79b4
Use latest buildpack image tag when no tag is provided
...
Fixes gh-28921
2021-12-07 14:10:10 -06:00
Scott Frederick
16f54d2c5c
Merge branch '2.7.x'
2021-12-03 11:42:52 -06:00
Scott Frederick
61fb9f83df
Merge branch '2.6.x' into 2.7.x
...
Closes gh-28905
2021-12-03 11:42:28 -06:00
Scott Frederick
ab0cc55e20
Merge branch '2.5.x' into 2.6.x
...
Closes gh-28904
2021-12-03 11:42:03 -06:00
Scott Frederick
467c092fdc
Remove classpath index manifest attribute from repackaged war files
...
Fixes gh-28895
2021-12-03 11:41:28 -06:00
Andy Wilkinson
a3ecdcf058
Merge branch '2.6.x' into 2.7.x
...
Closes gh-28892
2021-12-02 10:31:11 +00:00
Andy Wilkinson
4606e17696
Merge branch '2.5.x' into 2.6.x
...
Closes gh-28891
2021-12-02 10:30:51 +00:00
Andy Wilkinson
af60a8a7cf
Test our Gradle plugin against Gradle 7.3.1
...
Closes gh-28890
2021-12-02 10:29:22 +00:00
Scott Frederick
1f838bf2ee
Merge branch '2.7.x'
2021-12-01 14:08:26 -06:00
Scott Frederick
5f14cffea3
Add support for CNB platform API 0.5 through 0.8
...
Fixes gh-28850
2021-12-01 14:05:20 -06:00
Andy Wilkinson
fe7b13ec46
Upgrade to Spring Framework 6 and Jakarta EE 9
...
Closes gh-28619
Closes gh-28620
Closes gh-28621
Closes gh-28622
Closes gh-28623
Closes gh-28624
Closes gh-28625
Closes gh-28626
Closes gh-28627
Closes gh-28628
Closes gh-28629
Closes gh-28630
Closes gh-28631
Closes gh-28632
Closes gh-28633
Closes gh-28634
Closes gh-28635
Closes gh-28636
Closes gh-28638
Closes gh-28639
Closes gh-28640
Closes gh-28644
Closes gh-28645
Closes gh-28650
Closes gh-28711
Closes gh-28866
Closes gh-28867
Closes gh-28868
Closes gh-28872
See gh-28641
See gh-28642
See gh-28643
See gh-28646
See gh-28647
See gh-28648
See gh-28649
See gh-28721
See gh-28869
See gh-28871
2021-11-30 20:32:16 +00:00
Andy Wilkinson
900085628a
Raise the minimum supported version of Java to 17
...
Closes gh-28101
2021-11-30 15:37:40 +00:00
Andy Wilkinson
99f33ede14
Remove SecurityManager support
...
Closes gh-28213
2021-11-30 15:37:15 +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
Andy Wilkinson
e06b0d97f7
Update main branch to start work on 3.0.x
2021-11-30 15:07:24 +00:00
Andy Wilkinson
86a773a8e9
Update main branch to start work on 2.7.x
2021-11-30 11:16:53 +00:00
Andy Wilkinson
4bd86a6e20
Allow spring-boot-image-tests to run without an existing snapshot
...
Closes gh-28817
2021-11-26 13:01:34 +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
258222781a
Merge branch '2.5.x'
...
Closes gh-28752
2021-11-19 14:52:03 +00:00
Andy Wilkinson
96d98a0f6f
Declare dir task inputs with relative path sensitivity
...
Closes gh-28751
2021-11-19 14:29:29 +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
a1e7375fc0
Polish
2021-11-15 13:03:10 +00:00
Andy Wilkinson
2d7e0314f3
Merge branch '2.5.x'
...
# Conflicts:
# spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleCompatibilityExtension.java
# spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleMultiDslExtension.java
2021-11-15 12:51:43 +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
b1ff60c728
Merge branch '2.5.x'
...
Closes gh-28681
2021-11-15 12:09:06 +00:00
Andy Wilkinson
4cfbc0db36
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28680
2021-11-15 12:08:49 +00:00
Leo Li
9de9983e25
Fix @deprecated and @see in Archive's javadoc
...
See gh-28677
2021-11-15 12:07:22 +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
Stephane Nicoll
188278ae4a
Polish "Fix typo"
...
See gh-28548
2021-11-08 08:29:11 +01:00
slowjoe007
5a121197fc
Fix typo
...
See gh-28548
2021-11-08 08:28:28 +01:00
Stephane Nicoll
9241f228d5
Add .gitattributes
...
Closes gh-28474
2021-10-28 15:31:40 +02:00
Stephane Nicoll
66553ac8c7
Add .gitattributes
...
Closes gh-28473
2021-10-28 15:27:49 +02:00
Stephane Nicoll
1b3f52d609
Harmonize line endings
...
See gh-27615
2021-10-28 15:22:57 +02:00
Andy Wilkinson
24ef4e6fb9
Merge branch '2.5.x'
...
Closes gh-28471
2021-10-28 13:07:22 +01:00
Andy Wilkinson
7fbbb4e08a
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28470
2021-10-28 13:07:07 +01:00
Andy Wilkinson
72f80f3ae6
Upgrade to Testcontainers 1.16.1
...
Closes gh-28468
2021-10-28 13:06:41 +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
bcef8ee4c9
Merge branch '2.5.x'
...
Closes gh-28357
2021-10-14 21:49:06 -07:00
Phillip Webb
a93304c973
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28356
2021-10-14 21:48:53 -07:00
Phillip Webb
7388f2b60b
Attempt to reduce JarFileWrapper heap consumption
...
Update `JarURLConnection` to use a single shared wrapper per
jar file rather than creating a new one each time. This update
should help to reduce GC pressure.
Fixes gh-28042
2021-10-14 21:48:01 -07: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
9514a72d5a
Test using an up-to-date version of Postgres
...
See gh-28296
2021-10-13 11:56:44 +01:00
Stephane Nicoll
cc8d7fc605
Polish contribution
...
See gh-28239
2021-10-13 09:10:11 +02:00
Leo Li
1770f065a5
Polish
...
See gh-28239
2021-10-13 09:07:33 +02:00
Andy Wilkinson
48b1175559
Merge branch '2.5.x'
...
Closes gh-28263
2021-10-08 12:39:45 +01:00
Andy Wilkinson
d47260637b
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28262
2021-10-08 12:39:17 +01:00
Andy Wilkinson
c5d45585d9
Remove unnecessary overrides of finalize
...
Closes gh-28209
2021-10-08 12:39:00 +01: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
Andy Wilkinson
9c9fbf400e
Upgrade to Spring Java Format 0.0.29
...
Closes gh-28205
2021-10-06 09:52:45 +01:00
Andy Wilkinson
2b7645b806
Merge branch '2.5.x'
...
Closes gh-28191
2021-10-04 10:23:02 +01:00
Andy Wilkinson
ff3eed73ee
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28190
2021-10-04 10:21:49 +01:00
Andy Wilkinson
b7a2a2d5e0
Set last access and last modified times in layertools extract
...
Closes gh-28167
2021-10-04 10:17:11 +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
Andy Wilkinson
0b5d178e5b
Merge branch '2.5.x'
...
Closes gh-28120
2021-09-23 13:23:54 +01:00
Andy Wilkinson
ef18a2166d
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28119
2021-09-23 13:23:40 +01:00
Andy Wilkinson
5957dfeea4
Don't include binary jars in loader-tools source jar
...
Closes gh-28113
2021-09-23 13:23:29 +01:00
Phillip Webb
c9dc40a465
Merge branch '2.5.x'
2021-09-21 14:44:17 -07:00
Phillip Webb
40d65a74dc
Merge branch '2.4.x' into 2.5.x
2021-09-21 14:43:38 -07:00
Phillip Webb
ec12d51f30
Polish
2021-09-21 14:00:28 -07:00
Phillip Webb
55a1ec72cc
Update copyright year of changed files
2021-09-21 11:25:50 -07:00
Phillip Webb
4c2c4ec16c
Merge branch '2.5.x'
2021-09-21 11:25:36 -07:00
Phillip Webb
5ba69634c9
Merge branch '2.4.x' into 2.5.x
2021-09-21 11:17:55 -07:00
Phillip Webb
dfd36673f7
Update copyright year of changed files
2021-09-21 11:17:19 -07:00
Phillip Webb
cfeafee826
Polish
2021-09-21 11:16:46 -07: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
Scott Frederick
a6d03279ca
Merge branch '2.5.x'
...
Closes gh-27994
2021-09-14 16:45:58 -05:00
Scott Frederick
a540da11ad
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27993
2021-09-14 16:45:34 -05:00
Scott Frederick
c8ff874e91
Add builderFor label to ephemeral builder image
...
Adding a label to the ephemeral builder image cloned from the base
builder image eliminates contention between builds that are run
concurrently. Without this label, concurrent builds could result in
a race condition in the Docker daemon if the ephemeral builder image
shared by builds was deleted by both builds at exactly the same time.
Fixes gh-27888
2021-09-14 15:22:23 -05:00
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
c65013f717
Merge branch '2.5.x'
...
Closes gh-27901
2021-09-09 10:14:03 +01:00
Andy Wilkinson
37240bda3f
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27900
2021-09-09 10:13:40 +01:00
Andy Wilkinson
47163af9b6
Fix handling of Zip64 jar files larger than 4,294,967,295 bytes
...
Previously, a Zip64 jar file was identified by the number of entries
in the central directory being 0xFFFF. This value indicates that
there the number of entries is too big for the 2-byte field. However,
a jar may be in Zip64 format due to it exceeding the Zip format's
maximum size rather than its maximum number of entries so this field
cannot be used as a reliable indicator. The Zip specification doesn't
require any of the fields of the end of central directory record to
have a value of 0xFFFF (2-byte fields) or 0xFFFFFFFF (4-byte fields)
when using Zip64 format so we need to take a different approach.
Additionally, a number of places in the code assumed that an entry's
offset would always be available from the central directory file
header directly. This assumption did not hold true when the jar was
a Zip64 archive due to its size as the offset's value would be
0xFFFFFFF indicating that it should be read from the Zip64 extended
information field within the header's extra field instead.
This commit updates the Zip64 detection to look for the Zip64 end of
central directory locator instead. If present, it begins 20 bytes
before the beginning of the end of central directory record. Its
first four bytes are always 0x07064b50. The code that reads the
local header offset has also been updated to refer to the Zip64
extended information field when the offset is too large to fit in
the 4-byte field in the central directory file header. To allow
greater-than-4-byte offsets to be handled, a number of fields,
method parameters, and local variables have had their type changed
from an int to a long.
Fixes gh-27822
2021-09-09 09:17:48 +01:00
Andy Wilkinson
8362ff9b54
Merge branch '2.5.x'
...
Closes gh-27886
2021-09-07 17:00:19 +01:00
Andy Wilkinson
ba19577646
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27885
2021-09-07 17:00:09 +01:00
Andy Wilkinson
93ac6455d3
Document that starter parent enables compilation with -parameters
...
Closes gh-27762
2021-09-07 16:57:56 +01:00
Scott Frederick
f386ebe61d
Remove tests that rely on an unpredictable order of repackaged libs
...
See gh-27436
2021-08-20 14:09:23 -05:00
Scott Frederick
40a9c4d90f
Sort repackaged libraries in a reproducible Maven build
...
When a Maven build is configured to ensure reproducibility, any
libraries added to `BOOT-INF/lib` in a jar archive or to `WEB-INF/lib`
in a war archive by the Spring Boot plugin repackaging should be
sorted by name to ensure a stable and predictable order.
Fixes gh-27436
2021-08-20 13:00:39 -05: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
8966b1308b
Merge branch '2.5.x'
...
Closes gh-27733
2021-08-17 16:11:17 +01:00
Andy Wilkinson
b4f0f29bff
Test our Gradle plugin against Gradle 7.2
...
Closes gh-27732
2021-08-17 15:58:40 +01:00
Andy Wilkinson
79be0766bc
Merge branch '2.5.x'
...
Closes gh-27731
2021-08-17 15:42:17 +01:00
Andy Wilkinson
ea641d3aab
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27730
2021-08-17 15:42:05 +01:00
Andy Wilkinson
29f5570208
Stop s-b-configuration-metadata leaking enforced constraints
...
Fixes gh-27726
2021-08-17 15:34:29 +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
1966d1650b
Merge branch '2.5.x'
...
Closes gh-27650
2021-08-12 15:46:24 +01: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
ee669dbf11
Merge branch '2.5.x'
...
Closes gh-27594
2021-08-09 11:41:15 +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
Scott Frederick
dc5bf0368d
Merge branch '2.5.x'
...
Closes gh-27536
2021-07-30 13:51:25 -05:00
Scott Frederick
f60d998ea1
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27535
2021-07-30 13:50:56 -05:00
Scott Frederick
5d793afcb5
Prevent hanging when deleting Docker builder container after exception
...
An exception being thrown while the Maven plugin is uploading the app
archive bits to an ephemeral builder container would leave the
interaction with the Docker daemon in a state that caused further
interaction with the daemon (such as deleting the ephemeral builder)
to hang indefinitely. This commit cleans up the connection on an
exception to prevent this condition.
Fixes gh-27515
2021-07-30 13:41:40 -05:00
Andy Wilkinson
2482607a06
Merge branch '2.5.x'
...
Closes gh-27526
2021-07-29 17:42:40 +01:00
Andy Wilkinson
533bb24b55
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27525
2021-07-29 17:42:26 +01:00
Andy Wilkinson
ad2d9c0ab1
Customize Cassandra's configuration to reduce container startup time
...
Closes gh-27524
2021-07-29 17:33:56 +01: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
Andy Wilkinson
681df90d33
Generate metadata for records using implicit constructor binding
...
Closes gh-27216
2021-07-26 09:43:32 +01:00
Andy Wilkinson
37f690323f
Polish
...
Closes gh-27432
2021-07-21 11:55:38 +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
6f4d8449be
Initiate layers-2.6
...
See gh-27326
2021-07-14 14:48:23 +02:00
Stephane Nicoll
b393031dbe
Merge branch '2.5.x'
...
Closes gh-27326
2021-07-14 14:45:52 +02:00
Stephane Nicoll
d8f9a20221
Add missing XSD version for layers configuration
...
Closes gh-27321
2021-07-14 14:32:08 +02:00
Stephane Nicoll
dc5acb0019
Remove deprecated code flagged for removal
...
Closes gh-27303
2021-07-14 11:50:01 +02:00
Stephane Nicoll
d67089cdfe
Merge branch '2.5.x'
...
Closes gh-27236
2021-07-10 17:38:44 +02:00
dreis2211
dacfe27350
Fix tests for multi-release JARs on JDK 17
...
See gh-27229
2021-07-10 17:38:16 +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
5ebe2f4539
Merge branch '2.5.x'
...
Closes gh-27192
2021-07-08 18:08:39 +01:00
dreis2211
00d3330c9a
Avoid illegal reflective access on ZipEntry.xdostime
...
See gh-27100
2021-07-08 18:05:16 +01:00
Andy Wilkinson
87591d94ee
Merge branch '2.5.x'
...
Closes gh-27188
2021-07-08 10:45:57 +01: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
7c744db0e9
Merge branch '2.5.x'
...
Closes gh-27180
2021-07-07 17:57:25 +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
d00db60bab
Merge branch '2.5.x'
2021-06-24 14:06:25 -07:00
Phillip Webb
dfbd82b838
Fix Kotlin 1.5.20 classpath issues
...
See gh-27086
2021-06-24 14:05:36 -07:00
Phillip Webb
716e8ab717
Merge branch '2.5.x'
2021-06-24 11:31:33 -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
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
Phillip Webb
e85b0c7012
Merge branch '2.5.x'
2021-06-23 17:29:41 -07:00
Phillip Webb
fd83158fa5
Merge branch '2.4.x' into 2.5.x
2021-06-23 17:28:31 -07:00
Phillip Webb
63ed921554
Restore simple Library constructor
...
See gh-15808
2021-06-23 17:27:26 -07:00
Phillip Webb
5fc0e1ca81
Merge branch '2.5.x'
...
Closes gh-27057
2021-06-23 17:23:25 -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
752a92960c
Merge branch '2.5.x'
...
Closes gh-27001
2021-06-21 18:20:18 +01: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
9025529dcf
Merge branch '2.5.x'
...
Closes gh-26998
2021-06-21 14:34:24 +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
897a7196c0
Merge branch '2.5.x'
...
Closes gh-26948
2021-06-17 17:28:07 +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
043cf88687
Merge branch '2.5.x'
...
Closes gh-26905
2021-06-14 21:02:19 +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
0ec598c99d
Merge branch '2.5.x'
2021-06-14 13:36:37 +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
bc715c64b1
Merge branch '2.5.x'
...
Closes gh-26892
2021-06-14 13:33:19 +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
Stephane Nicoll
b7f126020e
Update copyright year of change file
...
See gh-26422
2021-06-12 18:00:24 +02:00
Marcus Klimstra
10ffaffb7b
Improve configuration of Start and Stop goals
...
See gh-26422
2021-06-12 18:00:24 +02:00
Stephane Nicoll
69c2621a14
Polish "Add support for @Value annotation"
...
See gh-26337
2021-06-12 17:40:34 +02:00
Mark Jeffrey
14d86034a1
Add support for @Value annotation
...
This commit adds support for `@Value` from project Lombok for metadata
generation. This is very similar to the existing `@Data` support.
See gh-26337
2021-06-12 17:40:34 +02:00
Stephane Nicoll
a1183c4641
Polish "Reproducible build for spring-boot-maven-plugin:build-info"
...
See gh-26221
2021-06-12 17:11:14 +02:00
Slawomir Jaranowski
2dec6dd552
Reproducible build for spring-boot-maven-plugin:build-info
...
See gh-26221
2021-06-12 17:11:14 +02: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
f798f26596
Merge branch '2.4.x'
2021-06-08 18:05:50 -07:00
Phillip Webb
4d62e47c5d
Merge branch '2.3.x' into 2.4.x
2021-06-08 18:05:12 -07:00
Phillip Webb
9e1c78da99
Update copyright year of changed files
2021-06-08 18:03:46 -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
Phillip Webb
d19b2681ab
Rework build-image-customization table in docs
...
Collapse parameter name and user property into a single column to give
a little more room for the description and default value.
Closes gh-25739
2021-06-08 14:46:53 -07:00
Scott Frederick
fba5ffc626
Fix FilePermissionsTests on Windows
...
See gh-26658
2021-06-08 15:58:03 -05:00
Andy Wilkinson
1a0e008a8c
Prevent Netty tcNative from loading classes with wrong class loader
...
In our tests, the JNI code in Netty tcNative can cause some of its
classes to be loaded using a ModifiedClassPathClassLoader. When the
wrong class loader is used, SSL-related tests fail, for example due
to the same Netty tcNative classes being loaded by two different
ClassLoders and no longer being the same. This appears to be
dependent upon the order in which tests are executed and results in
intermittent test failures.
It looks like this should be addressed in Netty tcNative 2.0.40 which
preloads all of its classes. In the meantime, this commit updates
ModifiedClassPathClassLodaer to ignore Netty tcNative classes so that
they're only ever loaded by the system class loader.
Closes gh-26749
2021-06-08 11:20:02 +01: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
Stephane Nicoll
75f31f6bc4
Merge branch '2.4.x'
...
Closes gh-26748
2021-06-03 09:27:01 +02:00
Stephane Nicoll
ad99aa2f4a
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26747
2021-06-03 09:26:38 +02:00
dreis2211
f470151535
Remove reference to surefirebooter JAR
...
See gh-26737
2021-06-03 09:24:56 +02:00
Phillip Webb
02494d63d2
Merge branch '2.4.x'
...
Closes gh-26744
2021-06-02 17:26:05 -07:00
Phillip Webb
1cda557d03
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26743
2021-06-02 17:25:51 -07:00
Phillip Webb
1beee5700c
Don't close early when SecurityManager present
...
Update `JarFile` and `JarFileWrapper` classes so that they no longer
close the `JarFile` early if a `SecurityManager` is in use.
Prior to this commit, the closed `JarFile` would cause (an ultimately
swallowed) NPE in `ZipFile` which manifested itself as a
`ClassNotFoundException` when starting the app.
Closes gh-25538
2021-06-02 17:24:05 -07: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
Stephane Nicoll
e9ed92a305
Polish
2021-06-02 14:14:04 +02:00
Phillip Webb
d3f0f04f05
Merge branch '2.4.x'
...
Closes gh-26703
2021-05-28 14:53:27 -07:00
Phillip Webb
49d3ecc2b2
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26702
2021-05-28 14:53:12 -07:00
Phillip Webb
617f7b9587
Improve ImageName/ImageReference parse performance
...
Update `ImageName` and `ImageReference` to use distinct regex patterns
to parse specific parts of the value. Prior to this commit a single
regex pattern was used which could hang given certain input strings.
Fixes gh-23115
2021-05-28 14:52:27 -07: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
Stephane Nicoll
cb7c3774a7
Merge branch '2.4.x'
...
Closes gh-26646
2021-05-24 11:39:57 +02:00
Stephane Nicoll
942691753d
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26645
2021-05-24 11:39:38 +02:00
dreis2211
01ee6190a2
Remove workaround for SUREFIRE-1679
...
See gh-26632
2021-05-24 11:15:58 +02: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
f0896c2de6
Rework title anchors for maven docs
...
Closes gh-26617
2021-05-19 21:19:24 -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
582d7b46fd
Merge branch '2.4.x'
...
Closes gh-26571
2021-05-17 14:36:44 +02:00
Stephane Nicoll
ef093bc9c6
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26570
2021-05-17 14:24:03 +02:00
Stephane Nicoll
306b6f6999
Configure SessionCookieConfig in MockServletWebServer
...
Closes gh-26479
2021-05-17 14:05:45 +02: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
Andy Wilkinson
f92510e39d
Merge branch '2.4.x'
...
Closes gh-26451
2021-05-13 11:44:27 +01:00
Andy Wilkinson
970f933806
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26450
2021-05-13 11:44:01 +01:00
Andy Wilkinson
2dd94b5554
Polish "Use try-with-resources statement"
...
See gh-26449
2021-05-13 11:37:10 +01:00
weixsun
5ba9db391f
Use try-with-resources statements
...
See gh-26449
2021-05-13 11:36:14 +01:00
Scott Frederick
e9adb1ab88
Handle long file names in buildpack images
...
Fixes gh-26445
2021-05-12 18:14:56 -05: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
Stephane Nicoll
b4424605af
Merge branch '2.4.x'
...
Closes gh-26406
2021-05-07 09:14:46 +02:00
Stephane Nicoll
559af275a4
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26405
2021-05-07 09:14:35 +02:00
Sach Nguyen
afa77b8253
Fix wrong reference to Cassandra in DockerImageNames#couchbase
...
See gh-26399
2021-05-07 09:12:43 +02: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
Scott Frederick
bb8188b681
Merge branch '2.4.x'
...
Closes gh-26313
2021-04-29 16:16:32 -05:00
Scott Frederick
17fa215cf5
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26312
2021-04-29 15:33:33 -05:00
Scott Frederick
c37b9b8a8e
Use layout configuration in Maven build-image goal
...
This commit changes the Maven build-image goal to honor the `layout` and
`layoutFactory` parameters to ensure that the archive content sent to the
builder is the same as is used by the `repackage` goal to build the
archive file.
Fixes gh-26216
2021-04-29 15:03:08 -05: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
Stephane Nicoll
52994027f4
Fix checkstyle violation
2021-04-28 15:14:33 +02:00
Stephane Nicoll
7465eb0f03
Merge branch '2.4.x'
2021-04-28 15:12:45 +02:00
Stephane Nicoll
85e1cc4d65
Fix checkstyle violation
2021-04-28 15:12:22 +02:00
Stephane Nicoll
09ae65e3b7
Merge branch '2.4.x'
...
Closes gh-26277
2021-04-28 14:13:11 +02:00
Stephane Nicoll
05b09907e0
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26275
2021-04-28 14:12:35 +02:00
Stephane Nicoll
d610f3c2ff
Polish "Fix ordering of metadata entries"
...
See gh-26230
2021-04-28 14:07:37 +02:00
Dmitry Pavlov
3e34b0a60a
Fix ordering of metadata entries
...
This commit provides a consistent ordering for groups that share the
same configuration property prefix.
See gh-26230
2021-04-28 14:07:37 +02:00
Stephane Nicoll
9e3c3b73ac
Merge branch '2.4.x'
2021-04-28 13:58:05 +02:00
Stephane Nicoll
d98fe36b88
Merge branch '2.3.x' into 2.4.x
2021-04-28 13:57:45 +02:00
Stephane Nicoll
20da9826cc
Disable incrementalBuildTypeRenamed test
...
This commit disables a test that does not test what it is supposed to
and improve the Metadata assertions to fail early if more than one
matching item by name and type is found in the metadata.
See gh-26271
2021-04-28 13:54:35 +02: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
Slawomir Jaranowski
50118f67fd
Test Maven plugin against latest Maven versions
...
See gh-26200
2021-04-22 14:59:16 +02: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
Phillip Webb
b4c9bb0d5c
Merge branch '2.4.x'
...
Closes gh-26122
2021-04-14 15:05:55 -07:00
Phillip Webb
fb3796dae8
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26121
2021-04-14 15:02:58 -07:00
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
2021-04-14 15:02:42 -07: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
5bc35e8f44
Extract XML example from Maven plugin adoc file
...
See gh-25993
2021-04-09 14:22:51 -05: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
Scott Frederick
86303c017b
Merge branch '2.4.x'
...
Closes gh-25938
2021-04-08 13:03:45 -05:00
Scott Frederick
9108b81bb2
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25937
2021-04-08 13:03:26 -05:00
Scott Frederick
0ad7f76263
Preserve file permissions in images built by Gradle
...
This commit copies the file mode along with other attributes when
copying files from the source archive to the build container while
building an image using the Gradle plugin. This preserves file
permissions on any resources included in the source archive.
Fixes gh-25915
2021-04-08 12:56:41 -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
5595fb2423
Polish "Extract XML examples from Maven plugin adoc files"
...
See gh-25534
2021-03-31 14:05:11 -05:00
robert-smith-911
4e287594bf
Extract XML examples from Maven plugin adoc files
...
See gh-25534
2021-03-31 14:05:10 -05: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
Andy Wilkinson
6f9b1ed6a3
Merge branch '2.4.x'
...
See gh-25837
2021-03-30 20:52:38 +01:00
Andy Wilkinson
563b8a8cec
Merge branch '2.3.x' into 2.4.x
...
See gh-25836
2021-03-30 20:52:15 +01:00
Andy Wilkinson
e94f8bba62
Ensure that upstream jars have been built
...
See gh-25835
2021-03-30 20:51:33 +01:00
Andy Wilkinson
df4b1ffb0d
Merge branch '2.4.x'
...
Closes gh-25837
2021-03-30 20:42:41 +01:00
Andy Wilkinson
38a4f135a9
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25836
2021-03-30 20:42:29 +01:00
Andy Wilkinson
ca9a619259
Defer processing of zipTree source until execution time
...
Closes gh-25835
2021-03-30 20:41:46 +01:00
Andy Wilkinson
09173b81d6
Merge branch '2.4.x'
...
Closes gh-25833
2021-03-30 18:18:36 +01:00
Andy Wilkinson
7a846ad41f
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25832
2021-03-30 18:18:10 +01:00
Andy Wilkinson
5a086321c6
Polish "Document Failsafe configuration when not using starter parent"
...
See gh-25621
2021-03-30 18:16:21 +01:00
robert-smith-911
0d79fd3e01
Document Failsafe configuration when not using starter parent
...
See gh-25621
2021-03-30 18:02:12 +01: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
Scott Frederick
269fc68c1d
Merge branch '2.4.x'
...
Closes gh-25811
2021-03-26 16:43:13 -05:00
Scott Frederick
4015d70f00
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25789
2021-03-26 15:16:01 -05:00
dreis2211
a9a37f0dd5
Increase test coverage on Java 16
...
See gh-25809
2021-03-26 19:38:54 +00:00
Scott Frederick
3ad5f1013a
Fix Maven image building with classifiers
...
Fixes gh-25736
2021-03-26 11:36:38 -05:00
Andy Wilkinson
340893747b
Merge branch '2.4.x'
...
Closes gh-25799
2021-03-25 15:50:45 +00:00
Andy Wilkinson
af7e4e211c
Support all known endpoint types
...
Previously, the configuration metadata annotation processor only
declared support for `@Endpoint` and none of the other more
specialized `@…Endpoint` annotations that are meta-annotated with
`@Endpoint` such as `@WebEndpoint` and `@JmxEndpoint. This would
result in missing metadata if a full or incremental build only
compiled classes annotated with one of the more specialized
`@…Endpoint` annotations as the annotation processor would not be
called.
This commit updates the processor's supported annotation types to
include every known `@…Endpoint` annotation. The test processor has
also been similarly updated to align its behaviour with that of the
main processor.
Fixes gh-25388
2021-03-25 15:23:09 +00:00
Phillip Webb
deaff1a522
Merge branch '2.4.x'
...
Closes gh-25775
2021-03-23 17:08:18 -07:00
Phillip Webb
ca9fae6b47
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25774
2021-03-23 17:07:44 -07:00
Phillip Webb
ec21202d54
Delete unpacked jars when the JVM exits
...
Update `JarFileArchive` so that any unpacked files are now deleted when
the JVM exits.
Closes gh-25773
2021-03-23 17:06:56 -07:00
Phillip Webb
05f61bccea
Align unpack logic with Files.createTempDirectory
...
Update `JarFileArchive` to align the way that it creates temp files and
folders with the way that `Files.createTempDirectory` works.
Closes gh-25772
2021-03-23 17:06:56 -07:00
Phillip Webb
b8873578ca
Add missing @Deprecated annotations
2021-03-23 17:06:53 -07:00
Phillip Webb
77ddb45704
Merge branch '2.4.x'
2021-03-23 12:53:59 -07:00
Phillip Webb
11a94ee6f0
Merge branch '2.3.x' into 2.4.x
2021-03-23 12:52:07 -07:00
Phillip Webb
82127fdaa3
Update copyright year of changed files
2021-03-23 12:50:49 -07: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
Scott Frederick
2dd4010eb0
Merge branch '2.4.x'
...
Closes gh-25701
2021-03-19 15:58:14 -05:00
Scott Frederick
6f860b441b
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25700
2021-03-19 14:52:20 -05: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
Phillip Webb
663fd8ce5e
Update copyright year of changed files
2021-03-18 14:49:52 -07:00
Phillip Webb
685b045c3d
Polish
2021-03-18 14:49:52 -07:00
Scott Frederick
e4fa39df01
Fail fast when finalName is misconfigured
...
When the `finalName` parameter is incorrectly set in the Spring Boot
Maven plugin configuration instead of in the `build` configuration, the
repackaged and original archive files are not named as expected. Prior
to this commit, the image building goal would detect this error
condition and throw an exception late in the process of creating the
build container, leaving the container in an unstable state. This
commit changes the image building goal to detect this condition early,
before attempting to create the container.
Fixes gh-25590
2021-03-17 15:19:21 -05:00
Andy Wilkinson
67545cf4f1
Polish
2021-03-17 12:39:50 +00:00
Andy Wilkinson
2adf3f836c
Merge branch '2.4.x'
2021-03-17 12:25:24 +00:00
Andy Wilkinson
c815195f13
Polish
2021-03-17 12:25:13 +00:00
Andy Wilkinson
36c72cb6ef
Merge branch '2.4.x'
...
Closes gh-25716
2021-03-17 11:33:48 +00:00
Andy Wilkinson
5595fd4017
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25715
2021-03-17 11:31:46 +00:00
Andy Wilkinson
0e0418546b
Test spring-boot:build-image when repackage is also invoked
...
Closes gh-25714
2021-03-17 11:19:29 +00:00
Andy Wilkinson
68e5a107cc
Revert "Merge branch '2.4.x'"
...
This reverts commit 5488b8cb46
, reversing
changes made to dee0df5c53
.
See gh-25701
2021-03-17 11:17:54 +00:00
Andy Wilkinson
ed4e419b0c
Revert "Merge branch '2.3.x' into 2.4.x"
...
This reverts commit eaa510872a
, reversing
changes made to 3e69522e2d
.
See gh-25700
2021-03-17 11:13:58 +00:00
Andy Wilkinson
ae2ff7849b
Revert "Fail fast when finalName is misconfigured"
...
This reverts commit 263b7c20e4
.
See gh-25590
2021-03-17 11:11:24 +00:00
Scott Frederick
5488b8cb46
Merge branch '2.4.x'
...
Closes gh-25701
2021-03-16 17:48:54 -05:00
Scott Frederick
eaa510872a
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25700
2021-03-16 17:31:32 -05:00
Scott Frederick
263b7c20e4
Fail fast when finalName is misconfigured
...
When the `finalName` parameter is incorrectly set in the Spring Boot
Maven plugin configuration instead of in the `build` configuration, the
repackaged and original archive files are not named as expected. Prior
to this commit, the image building goal would detect this error
condition and throw an exception late in the process of creating the
build container, leaving the container in an unstable state. This
commit changes the image building goal to detect this condition early,
before attempting to create the container.
Fixes gh-25590
2021-03-16 17:22:48 -05: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
Stephane Nicoll
e517ee8635
Merge branch '2.4.x'
...
Closes gh-25618
2021-03-13 18:22:57 +01:00
izeye
09f4d4b9bf
Polish
...
See gh-25617
2021-03-13 18:08:54 +01:00
Jurrie Overgoor
3c0e236562
Support Maven's reproducible build feature for war repackaging
...
See gh-25571
2021-03-11 11:08:10 +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
5a0c3a8497
Merge branch '2.4.x'
...
Closes gh-25516
2021-03-05 15:47:50 +01:00
Stephane Nicoll
ddf75f095c
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25515
2021-03-05 15:47:36 +01:00
Stephane Nicoll
6ebc69d704
Polish "Include properties in source merge algorithm"
...
See gh-25507
2021-03-05 15:47:09 +01:00
Bertrand Renuart
cf4bc6e9e0
Include properties in source merge algorithm
...
This commit improves SimpleConfigurationMetadataRepository to include
properties that are contributed to an existing configuration metadata
source.
See gh-25507
2021-03-05 15:47:09 +01:00
Andy Wilkinson
2b7f23b29d
Merge branch '2.4.x'
...
Closes gh-25509
2021-03-05 10:44:24 +00:00
Andy Wilkinson
ac258a95a2
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25508
2021-03-05 10:39:52 +00:00
Andy Wilkinson
c6ca7a53ab
Polish "Prevent extracting zip entries outside of destination path"
...
See gh-25505
2021-03-05 10:13:32 +00:00
trungPa
2993e68715
Prevent extracting zip entries outside of destination path
...
See gh-25505
2021-03-05 10:12:06 +00: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
Stephane Nicoll
e58353a32d
Merge branch '2.4.x'
...
Closes gh-25484
2021-03-03 15:16:58 +01:00
Stephane Nicoll
e5d8b6029b
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25483
2021-03-03 15:16:08 +01:00
Stephane Nicoll
8e67ae7113
Fix fallback fork value for spring-boot:stop
...
This commit harmonizes the fallback value that spring-boot:stop goal
should use if no information is available in the current context.
Closes gh-25472
2021-03-03 15:15:04 +01: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
Andy Wilkinson
84984fb148
Merge branch '2.4.x'
...
Closes gh-25431
2021-02-25 14:28:41 +00:00
Andy Wilkinson
ecf8437d4a
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25430
2021-02-25 14:28:28 +00:00
dreis2211
101d88a840
Update Testcontainers image versions
...
See gh-25412
2021-02-25 14:27:41 +00:00
Scott Frederick
4be04b0ea2
Support image building with Maven and war packaging
...
This commit updates the Maven image building goal to support building
images from executable and non-executable war files.
Fixes gh-23823
2021-02-24 15:23:33 -06: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
Stephane Nicoll
817a4c5397
Merge branch '2.4.x'
...
Closes gh-25386
2021-02-22 10:46:13 +01:00
Stephane Nicoll
7c5a5c6663
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25385
2021-02-22 10:45:55 +01:00
Stephane Nicoll
77daae1480
Update copyright year of changed file
...
See gh-25382
2021-02-22 10:41:49 +01:00
Mustafa Ulu
abc90db32f
Fix wording error in build-info goal description
...
See gh-25382
2021-02-22 10:26:53 +01:00
Andy Wilkinson
a14bf7a3b8
Deprecate support for Gradle's maven plugin
...
Closes gh-25267
2021-02-19 19:29:17 +00:00
Phillip Webb
4ad149e1e7
Protect against bad paths and URLs
...
See gh-21722
2021-02-18 16:23:56 -08:00
Scott Frederick
88e9f1d28c
Fix Maven buildpacks example in docs
...
See gh-21722
2021-02-18 18:22:36 -06:00
Scott Frederick
e3e229cc3d
Remove unused import
...
See gh-21722
2021-02-18 17:39:59 -06: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