1904 Commits

Author SHA1 Message Date
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
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
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
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