eed86c0d0a
Test Boot's Gradle plugin against Gradle 7.6-rc-2
...
Closes gh-33073
2022-11-08 16:46:22 +00:00
7c0f397129
Merge branch '2.6.x' into 2.7.x
...
See gh-33015
2022-11-07 13:36:11 +00:00
ac6ad7c0f1
Fix ModifiedClassPathExtension with parameterized tests
...
Closes gh-33014
2022-11-07 13:34:54 +00:00
b4283d45c5
Merge branch '2.6.x' into 2.7.x
2022-11-05 17:03:02 -07:00
d2cceb6b77
Polish
2022-11-05 17:02:57 -07:00
2ab1f49442
Merge branch '2.6.x' into 2.7.x
...
Closes gh-33018
2022-11-05 16:35:26 -07:00
caf46043c6
Add @DirtiesUrlFactories annotation
...
Add `@DirtiesUrlFactories` annotation that can be used to reset URL
factories.
Closes gh-33017
2022-11-05 16:30:27 -07:00
948893f36d
Merge branch '2.6.x' into 2.7.x
...
Closes gh-33015
2022-11-05 16:04:40 -07:00
d4cc8fc3a6
Support modified classpath on methods and parameterized tests
...
Update `ModifiedClassPathExtension` and related classes so that
annotations can be used directly on test methods, or on classes
passed into parameterized tests.
Closes gh-33014
2022-11-05 16:04:19 -07:00
a3870f8da7
Merge branch '2.6.x' into 2.7.x
...
Closes gh-32987
2022-11-03 10:23:30 +00:00
beb62be843
Test Boot's Gradle plugin against Gradle 7.6-rc-1
...
Closes gh-32933
2022-11-03 10:22:14 +00:00
c8676a81de
Merge branch '2.6.x' into 2.7.x
2022-10-25 15:48:04 -07:00
d7ac20cd6c
Update copyright year of changed files
2022-10-25 15:47:30 -07:00
d8c4aec946
Merge branch '2.6.x' into 2.7.x
2022-10-20 17:04:37 -07:00
1a14f39f83
Polish
2022-10-20 17:04:29 -07:00
3d5c864bc9
Merge branch '2.6.x' into 2.7.x
...
Closes gh-32758
2022-10-17 17:11:59 +01:00
dade5ec3aa
Test against Gradle 6.9.3
...
Closes gh-32757
2022-10-17 17:11:37 +01:00
ed01a77a99
Merge branch '2.6.x' into 2.7.x
...
Closes gh-32681
2022-10-11 23:19:34 -07:00
e0c79ce598
Support PEM formatted elliptic-curve TLS keys
...
Update `PrivateKeyParser` to support loading PEM formatted
elliptic-curve keys. We need to do a similar trick to the PKCS1 keys
and convert them to a `PKCS8EncodedKeySpec`.
Fixes gh-32646
2022-10-11 23:18:44 -07:00
1b604e30f7
Merge branch '2.6.x' into 2.7.x
...
Closes gh-32678
2022-10-11 19:15:33 +01:00
215eb96355
Improve error handling in SpringBootPlugin
...
Closes gh-32677
2022-10-11 19:15:23 +01:00
3ef633b096
Merge branch '2.6.x' into 2.7.x
...
Closes gh-32543
2022-09-29 11:39:42 +01:00
84a25c7dcf
Configure Log4j2 classpath overrides consistently
...
Closes gh-32537
2022-09-29 11:25:21 +01:00
5124ae94ae
Merge branch '2.6.x' into 2.7.x
...
Closes gh-32499
2022-09-26 13:15:11 +01:00
cfac7f55a4
Correct annotations on BootBuildImage's file-based inputs
...
Closes gh-32495
2022-09-26 13:13:16 +01:00
f17df7bf30
Merge branch '2.6.x' into 2.7.x
...
Closes gh-32284
2022-09-09 16:46:43 +01:00
23c2f73b3f
Update tests to allow them to run on Java 19
...
Closes gh-32280
2022-09-09 16:46:14 +01:00
144fdaa703
Merge branch '2.6.x' into 2.7.x
...
Closes gh-32283
2022-09-09 15:14:40 +01:00
78f4242e46
Build with Gradle 7.5 while still supporting Gradle 6.8+
...
Closes gh-32281
2022-09-09 15:13:43 +01:00
e88a682220
Merge branch '2.6.x' into 2.7.x
2022-09-08 19:37:52 -07:00
85697ac482
Update copyright year of changed files
2022-09-08 19:36:59 -07:00
257e236b06
Fix image-building unit tests on Windows
...
See gh-32000
2022-08-24 13:14:39 -05:00
c16094e04b
Disable SELinux label security policy when building images
...
When using the Gradle `bootBuildImage` task or Maven
`spring-boot:build-image` goal on a Linux distribution with SELinux
enabled, binding the Docker socket in the builder container might
fail. This commit disables the `label` security policy in the builder
container to prevent this type of failure.
Fixes gh-32000
2022-08-19 13:56:34 -05:00
60e1cc510c
Merge branch '2.6.x' into 2.7.x
...
See gh-32085
2022-08-17 12:48:21 -07:00
bd74344025
Revert "Don't close jar files early"
...
This reverts commit b42f056ddb
2022-08-17 11:38:42 -07:00
674022d401
Revert "Don't close nested jars or wrapper when parent is closed"
...
This reverts commit 360eb027be
2022-08-17 11:37:19 -07:00
1c6624db44
Merge branch '2.6.x' into 2.7.x
...
Closes gh-32097
2022-08-17 08:34:38 +02:00
e94ddfa589
Polish "Explicit error message if source is not an archive"
...
See gh-31997
2022-08-17 08:33:54 +02:00
a0f273a041
Explicit error message if source is not an archive
...
This commit split the existing assertion to provide an explicit error
message if the source file is not an archive.
See gh-31997
2022-08-17 08:30:03 +02:00
ef7aac8c14
Merge branch '2.6.x' into 2.7.x
...
Closes gh-32085
2022-08-15 17:59:06 -07:00
360eb027be
Don't close nested jars or wrapper when parent is closed
...
Update `JarFile` so that the `close()` method no longer closes nested
jars or the wrapper. Prior to this commit it was possible for a parent
jar file to be garbage collected and closed even though references still
existed to the nested jars. When this happened the nested jars would get
closed and any access to entries would result in `JarFile.ensureOpen()`
throwing an `IllegalStateException`. The user would often not see this
exception directly, but rather find `ClassNotFoundException` being
thrown.
Fixes gh-31853
2022-08-15 17:55:25 -07:00
9caad3d31b
Merge branch '2.6.x' into 2.7.x
...
Closes gh-32059
2022-08-10 12:28:26 +01:00
c9e69f555e
Test our Gradle plugin against Gradle 7.5.1
...
Closes gh-32058
2022-08-10 12:27:47 +01:00
012fbb3a57
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31949
2022-08-01 20:51:18 +01:00
c0daede1aa
Ensure that jarmode jar added to an app has same SHA as published jar
...
Closes gh-31862
2022-08-01 20:49:10 +01:00
6786659aae
Merge branch '2.6.x' into 2.7.x
2022-07-28 16:07:18 +02:00
7d860df5f0
Polish
2022-07-28 16:05:16 +02:00
fd076ab9ef
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31875
2022-07-26 17:46:20 +01:00
8c93d2e8a7
Ensure PROTOCOL_HANDLER system property is reset
...
See gh-31870
2022-07-26 17:20:55 +01:00
a4ef6a7c5c
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31865
2022-07-26 12:13:16 +01:00
f8412847dc
Update copyright year for "Fix typos in code and documentation"
...
See gh-31734
2022-07-26 12:08:30 +01:00
dbfc6bded4
Fix typos in code and documentation
...
See gh-31734
2022-07-26 12:08:07 +01:00
3931e82841
Merge branch '2.6.x' into 2.7.x
2022-07-26 10:50:42 +01:00
4bcec6e0ee
Polish
2022-07-26 10:50:01 +01:00
9da38c8d2d
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31826
2022-07-20 17:29:58 -05:00
4e0b3aad9f
Clarify how docker image publishing registry is determined
...
Closes gh-31820
2022-07-20 17:29:40 -05:00
f9cf31e59e
Fix compile errors
...
See gh-28844
2022-07-20 16:07:19 -05:00
09c7ce6dab
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31824
2022-07-20 15:10:43 -05:00
9b0cdac58a
Simplify support for pushing images to unauthenticated registries
...
This commit removes the requirement that `docker.publishRegistry`
configuration must be provided when an image is published by the Gradle
or Maven plugin.
Fixes gh-28844
2022-07-20 15:06:05 -05:00
92a7af4038
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31777
2022-07-18 11:30:36 +02:00
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
9c250cae92
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31754
2022-07-14 17:28:54 +01:00
8c4708982b
Test our Gradle plugin against 7.5
...
Closes gh-31753
2022-07-14 17:25:34 +01:00
e24c49a09a
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31558
2022-06-30 14:58:28 -05:00
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
dfb8979456
Merge branch '2.6.x' into 2.7.x
2022-06-24 15:03:25 +01:00
c87340e5c1
Remove unnecessary throws
2022-06-24 15:02:58 +01:00
1e08f545d0
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31525
2022-06-24 13:05:06 +01:00
f49b16c645
Upgrade to Spring Java Format 0.0.34
...
Closes gh-31524
2022-06-24 12:57:52 +01:00
e967d0383b
Merge branch '2.6.x' into 2.7.x
2022-06-22 08:16:18 +02:00
79d3e3080f
Polish
2022-06-22 08:15:04 +02:00
13b2de3bb8
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31484
2022-06-21 19:10:23 -07:00
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
7c91ebb1b0
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31408
2022-06-16 15:36:00 -07:00
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
5e1cd28d3f
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31402
2022-06-16 12:14:28 +01:00
e8a1a0399a
Upgrade to Bouncycastle 1.71
...
Closes gh-31400
2022-06-16 12:14:06 +01:00
bcbcc53a09
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31395
2022-06-15 10:51:40 -07:00
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
499f54a335
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31362
2022-06-13 15:51:45 +02:00
8c9557f552
Enable Links for the Javadoc of the Gradle Plugins
...
See gh-31279
2022-06-13 15:51:08 +02:00
8e550933a8
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31261
2022-06-07 09:16:10 +02:00
bbb5966bca
Upgrade integration tests to Apache Maven 3.8.5
...
Closes gh-31260
2022-06-07 09:15:41 +02:00
430040415b
Merge branch '2.6.x' into 2.7.x
2022-05-30 19:22:37 +01:00
0b6c147a87
Polish
2022-05-30 19:22:30 +01:00
d1420b6abb
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31213
2022-05-30 18:24:00 +01:00
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
682ac53f32
Ensure that config processor runs with only AutoConfiguration
...
Fixes gh-31186
2022-05-27 15:58:00 +01:00
137318a845
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31180
2022-05-26 19:49:35 +01:00
3f91ed037f
Fix Custom Layers Configuration section title in Maven plugin docs
...
See gh-31172
2022-05-26 19:46:11 +01:00
935d1264e0
Merge branch '2.6.x' into 2.7.x
2022-05-26 18:13:08 +01:00
3d203d0215
Polish
2022-05-26 17:30:39 +01:00
455ee0ce22
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31177
2022-05-26 15:53:38 +01:00
ee45fd2fc8
Remove redundant throws declarations from internal APIs
...
Closes gh-31176
2022-05-26 15:47:35 +01:00
b3a4982f31
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31174
2022-05-26 14:01:23 +01:00
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
e617035dba
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31167
2022-05-26 13:45:52 +01:00
3e7bd582a3
Upgrade to Spring Java Format 0.0.33
...
Closes gh-31166
2022-05-26 13:22:23 +01:00
06679a4c46
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31128
2022-05-19 18:07:17 -07:00
9fa33e5645
Merge branch '2.5.x' into 2.6.x
...
Closes gh-31127
2022-05-19 18:04:54 -07:00
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
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
ea41e89c6c
Merge branch '2.5.x' into 2.6.x
2022-05-17 22:21:10 -07:00
7d2f1bafc0
Update copyright year of changed files
2022-05-17 22:20:05 -07:00
d5d5997be7
Merge branch '2.6.x' into 2.7.x
2022-05-17 21:49:20 -07:00
99f5c781a5
Merge branch '2.5.x' into 2.6.x
2022-05-17 21:48:50 -07:00
350d27fe50
Polish code to use method references when possible
2022-05-17 21:16:42 -07:00
4cd850cfc0
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30851
2022-05-03 15:17:13 +01:00
fa327a783d
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30850
2022-05-03 15:14:00 +01:00
4fd2e0c916
Polish "Fix typos"
...
See gh-30773
2022-05-03 14:09:53 +01:00
f6d24dc1a8
Fix typos
...
See gh-30773
2022-05-03 14:09:37 +01:00
56690a7eb9
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30791
2022-04-25 15:03:32 +01:00
409ec48e2a
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30790
2022-04-25 15:00:51 +01:00
193ef9a06d
Package META-INF/services/ files beneath BOOT-INF/classes/
...
Closes gh-30413
2022-04-25 14:32:47 +01:00
dd5696b59b
Update copyright year of changed files
2022-04-20 15:26:30 -07:00
ed412af138
Polish
...
See gh-30695
2022-04-19 09:34:28 +02:00
74494f1d37
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30671
2022-04-14 18:38:09 +01:00
1720290234
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30670
2022-04-14 18:37:55 +01:00
f7d181e65b
Handle null additional properties more gracefully
...
Closes gh-30654
2022-04-14 18:36:15 +01:00
f032690d0a
Add support for CNB platform API 0.9
...
Fixes gh-30566
2022-04-13 16:09:32 -05:00
ef79a18514
Use provided scope for Maven core dependencies in Maven plugin
...
Fixes gh-29520
2022-04-04 16:00:15 -05:00
2a2c4be809
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30510
2022-04-03 09:33:02 +02:00
b2a4ae38e8
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30509
2022-04-03 09:32:39 +02:00
40d0e38e76
Test Spring Boot Gradle Plugin against Gradle 7.4.2
...
See gh-30506
2022-04-03 09:29:50 +02:00
2c5398898b
Polish "Deprecate running an application in the Maven JVM"
...
See gh-30479
2022-04-01 11:57:59 +02:00
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
4722d9d17e
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30470
2022-03-29 15:06:56 +01:00
880d33f391
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30469
2022-03-29 15:06:47 +01:00
05b7befc7a
Fix javadoc of ResolveMainClassName setClasspath(Object)
...
Closes gh-30468
2022-03-29 15:05:54 +01:00
2f3ae02385
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30466
2022-03-29 14:24:42 +01:00
8f985474a6
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30465
2022-03-29 14:24:25 +01:00
d574563616
Document @ConstructorBinding and @DefaultValue with records
...
Closes gh-30460
2022-03-29 14:14:28 +01:00
b4cbcd797e
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30218
2022-03-15 17:36:08 +00:00
c4d2602a3e
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30217
2022-03-15 17:34:53 +00:00
264a6888a9
Refactor code to avoid using internal LazyPublishArtifact
...
See gh-30209
2022-03-15 17:09:15 +00:00
4935c11a07
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30215
2022-03-15 15:30:40 +00:00
464fce621d
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30213
2022-03-15 15:30:06 +00:00
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
de321b00b7
Support podman for building images
...
Closes gh-30196
2022-03-11 16:39:07 -06:00
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
93622d18eb
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30195
2022-03-11 15:20:15 -06:00
35a9a7fee2
Ignore deprecation warnings in Paketo system tests
...
Closes gh-30194
2022-03-11 15:19:53 -06:00
2600bf4719
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30142
2022-03-09 18:39:45 +00:00
382c6972ec
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30141
2022-03-09 18:39:32 +00:00
5264fb3d1e
Test our Gradle Plugin against Gradle 7.4.1
...
Closes gh-30139
2022-03-09 18:09:07 +00:00
83de1995c7
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30130
2022-03-09 12:44:53 +00:00
b0e4cabdd8
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30123
2022-03-09 12:37:45 +00:00
20d21d4e58
Set up CI with JDK 18
...
Closes gh-30104
2022-03-09 12:28:34 +00:00
9628507756
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30094
2022-03-07 21:53:59 -08:00
d131003456
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30093
2022-03-07 21:53:44 -08:00
Andy Wilkinson
Phillip Webb
Scott Frederick
Stephane Nicoll
Nils Hartmann
aoyvx
Marc Wrobel
Johnny Lim
Lars Grefer
Damiano Albani
Liuzh
Octavia Togami
Madhura Bhave