Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-09-03 04:26:12 +08:00
Code Issues Packages Projects Releases Wiki Activity
39,260 Commits 22 Branches 322 Tags 248 MiB
2.7.x
Commit Graph

2247 Commits

Author SHA1 Message Date
Phillip Webb
a4ef6a7c5c Merge branch '2.6.x' into 2.7.x 
Closes gh-31865
 2022-07-26 12:13:16 +01:00
Phillip Webb
f8412847dc Update copyright year for "Fix typos in code and documentation" 
See gh-31734
 2022-07-26 12:08:30 +01:00
Marc Wrobel
dbfc6bded4 Fix typos in code and documentation 
See gh-31734
 2022-07-26 12:08:07 +01:00
Phillip Webb
3931e82841 Merge branch '2.6.x' into 2.7.x 2022-07-26 10:50:42 +01:00
Phillip Webb
4bcec6e0ee Polish 2022-07-26 10:50:01 +01:00
Scott Frederick
9da38c8d2d Merge branch '2.6.x' into 2.7.x 
Closes gh-31826
 2022-07-20 17:29:58 -05:00
Scott Frederick
4e0b3aad9f Clarify how docker image publishing registry is determined 
Closes gh-31820
 2022-07-20 17:29:40 -05:00
Scott Frederick
f9cf31e59e Fix compile errors 
See gh-28844
 2022-07-20 16:07:19 -05:00
Scott Frederick
09c7ce6dab Merge branch '2.6.x' into 2.7.x 
Closes gh-31824
 2022-07-20 15:10:43 -05:00
Scott Frederick
9b0cdac58a Simplify support for pushing images to unauthenticated registries 
This commit removes the requirement that `docker.publishRegistry`
configuration must be provided when an image is published by the Gradle
or Maven plugin.

Fixes gh-28844
 2022-07-20 15:06:05 -05:00
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
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
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
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
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
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
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
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
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
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
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
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
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
682ac53f32 Ensure that config processor runs with only AutoConfiguration 
Fixes gh-31186
 2022-05-27 15:58:00 +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
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
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
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
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
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
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
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
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
dd5696b59b Update copyright year of changed files 2022-04-20 15:26:30 -07:00
izeye
ed412af138 Polish 
See gh-30695
 2022-04-19 09:34:28 +02: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
f032690d0a Add support for CNB platform API 0.9 
Fixes gh-30566
 2022-04-13 16:09:32 -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
2c5398898b Polish "Deprecate running an application in the Maven JVM" 
See gh-30479
 2022-04-01 11:57:59 +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
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
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
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
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
de321b00b7 Support podman for building images 
Closes gh-30196
 2022-03-11 16:39:07 -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
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
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
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
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
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
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
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
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
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
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
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
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
26512f8ac6 Merge branch '2.6.x' into 2.7.x 2022-02-16 20:24:59 -08:00
Phillip Webb
5b4ec32645 Merge branch '2.5.x' into 2.6.x 2022-02-16 18:56:12 -08:00
Phillip Webb
c86b1330cf Update copyright year of changed files 2022-02-16 17:56:19 -08:00
Phillip Webb
9ab1b669d0 Polish 2022-02-16 17:56:07 -08:00
Andy Wilkinson
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
980aa616c8 Fix build failure 
See gh-29290
 2022-01-07 17:58:15 +01:00
Stephane Nicoll
9821cdfd8b Remove deprecated code 
Closes gh-29290
 2022-01-07 14:42:14 +01: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
f3bcbca841 Update copyright year of changed files 2021-12-16 13:05:17 -08: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
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
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