7c744db0e9
Merge branch '2.5.x'
...
Closes gh-27180
2021-07-07 17:57:25 +01:00
c21791e671
Test our Gradle plugin against Gradle 7.1.1
...
Closes gh-27142
2021-07-07 17:57:14 +01:00
d00db60bab
Merge branch '2.5.x'
2021-06-24 14:06:25 -07:00
dfbd82b838
Fix Kotlin 1.5.20 classpath issues
...
See gh-27086
2021-06-24 14:05:36 -07:00
716e8ab717
Merge branch '2.5.x'
2021-06-24 11:31:33 -07:00
d44207161f
Suppress Kotlin 1.5.20 deprecation warning
...
See gh-27086
2021-06-24 11:30:58 -07:00
6102f10639
Merge branch '2.5.x'
2021-06-23 21:02:36 -07:00
2c518f1dff
Merge branch '2.4.x' into 2.5.x
2021-06-23 21:02:05 -07:00
a76e5c043e
Update copyright year of changed files
2021-06-23 21:01:45 -07:00
e85b0c7012
Merge branch '2.5.x'
2021-06-23 17:29:41 -07:00
fd83158fa5
Merge branch '2.4.x' into 2.5.x
2021-06-23 17:28:31 -07:00
63ed921554
Restore simple Library constructor
...
See gh-15808
2021-06-23 17:27:26 -07:00
5fc0e1ca81
Merge branch '2.5.x'
...
Closes gh-27057
2021-06-23 17:23:25 -07:00
af37f59136
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27056
2021-06-23 17:13:13 -07:00
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
752a92960c
Merge branch '2.5.x'
...
Closes gh-27001
2021-06-21 18:20:18 +01:00
07e7398d10
Include 6.9.x in version requirements message
...
Fixes gh-26952
2021-06-21 18:20:08 +01:00
9025529dcf
Merge branch '2.5.x'
...
Closes gh-26998
2021-06-21 14:34:24 +01:00
8405df10b8
Merge branch '2.4.x' into 2.5.x
...
Closes gh-26997
2021-06-21 14:34:11 +01:00
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
897a7196c0
Merge branch '2.5.x'
...
Closes gh-26948
2021-06-17 17:28:07 +01:00
a2772e288a
Merge branch '2.4.x' into 2.5.x
...
Closes gh-26947
2021-06-17 17:27:56 +01:00
cd808d2f18
Only get Kotlin plugin's version once we know we need it
...
Fixes gh-26946
2021-06-17 17:27:03 +01:00
043cf88687
Merge branch '2.5.x'
...
Closes gh-26905
2021-06-14 21:02:19 +01:00
6a51c272b9
Test our Gradle plugin against Gradle 7.1
...
Closes gh-26904
2021-06-14 21:01:06 +01:00
0ec598c99d
Merge branch '2.5.x'
2021-06-14 13:36:37 +01:00
9e2339b5d0
Merge branch '2.4.x' into 2.5.x
2021-06-14 13:36:29 +01:00
16bfa669e1
Polish authors separators
2021-06-14 13:35:30 +01:00
bc715c64b1
Merge branch '2.5.x'
...
Closes gh-26892
2021-06-14 13:33:19 +01:00
5f26fd9ccb
Merge branch '2.4.x' into 2.5.x
...
Closes gh-26891
2021-06-14 13:28:54 +01:00
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
b7f126020e
Update copyright year of change file
...
See gh-26422
2021-06-12 18:00:24 +02:00
10ffaffb7b
Improve configuration of Start and Stop goals
...
See gh-26422
2021-06-12 18:00:24 +02:00
69c2621a14
Polish "Add support for @Value annotation"
...
See gh-26337
2021-06-12 17:40:34 +02:00
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
a1183c4641
Polish "Reproducible build for spring-boot-maven-plugin:build-info"
...
See gh-26221
2021-06-12 17:11:14 +02:00
2dec6dd552
Reproducible build for spring-boot-maven-plugin:build-info
...
See gh-26221
2021-06-12 17:11:14 +02:00
de410b7621
Merge branch '2.4.x'
...
Closes gh-26828
2021-06-09 18:01:32 +01:00
a1c5fcca58
Move common Asciidoctor configuration into our conventions
...
Closes gh-26620
2021-06-09 18:00:45 +01:00
03f8a46c80
Test our Gradle plugin against 7.1-rc-2
...
Closes gh-26825
2021-06-09 09:41:25 +01:00
f798f26596
Merge branch '2.4.x'
2021-06-08 18:05:50 -07:00
4d62e47c5d
Merge branch '2.3.x' into 2.4.x
2021-06-08 18:05:12 -07:00
9e1c78da99
Update copyright year of changed files
2021-06-08 18:03:46 -07:00
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
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
fba5ffc626
Fix FilePermissionsTests on Windows
...
See gh-26658
2021-06-08 15:58:03 -05:00
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
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
aff1366731
Polish "Fix typo in 'Reacting to the Maven plugin' title"
...
See gh-26751
2021-06-04 09:51:48 +02:00
9eea502c3e
Fix typo in 'Reacting to the Maven plugin' title
...
See gh-26751
2021-06-04 09:46:47 +02:00
75f31f6bc4
Merge branch '2.4.x'
...
Closes gh-26748
2021-06-03 09:27:01 +02:00
ad99aa2f4a
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26747
2021-06-03 09:26:38 +02:00
f470151535
Remove reference to surefirebooter JAR
...
See gh-26737
2021-06-03 09:24:56 +02:00
02494d63d2
Merge branch '2.4.x'
...
Closes gh-26744
2021-06-02 17:26:05 -07:00
1cda557d03
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26743
2021-06-02 17:25:51 -07:00
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
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
e9ed92a305
Polish
2021-06-02 14:14:04 +02:00
d3f0f04f05
Merge branch '2.4.x'
...
Closes gh-26703
2021-05-28 14:53:27 -07:00
49d3ecc2b2
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26702
2021-05-28 14:53:12 -07:00
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
5258c26f90
Merge branch '2.4.x'
2021-05-27 13:15:19 -07:00
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
ac0c1b1456
Merge branch '2.4.x'
...
Closes gh-26687
2021-05-27 12:08:49 -07:00
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
cb7c3774a7
Merge branch '2.4.x'
...
Closes gh-26646
2021-05-24 11:39:57 +02:00
942691753d
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26645
2021-05-24 11:39:38 +02:00
01ee6190a2
Remove workaround for SUREFIRE-1679
...
See gh-26632
2021-05-24 11:15:58 +02:00
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
f0896c2de6
Rework title anchors for maven docs
...
Closes gh-26617
2021-05-19 21:19:24 -07:00
1702c9fc3d
Rework title anchors for gradle docs
...
Closes gh-26618
2021-05-19 21:19:24 -07:00
2dbf39c738
Polish asciidoc formatting
2021-05-19 21:19:24 -07:00
8a3f835ffe
Set Asciidoctor attribute-missing to warn
...
Closes gh-26590
2021-05-19 11:53:46 -07:00
582d7b46fd
Merge branch '2.4.x'
...
Closes gh-26571
2021-05-17 14:36:44 +02:00
ef093bc9c6
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26570
2021-05-17 14:24:03 +02:00
306b6f6999
Configure SessionCookieConfig in MockServletWebServer
...
Closes gh-26479
2021-05-17 14:05:45 +02:00
d3c817b7ba
Polish "Remove unnecessary throws declaration in tests"
...
See gh-26441
2021-05-17 09:36:53 +02:00
8a2be288a3
Remove unnecessary throws declaration in tests
...
See gh-26441
2021-05-17 09:31:51 +02:00
1db8ca60aa
Test our Gradle plugin against Gradle 7.0.2
...
Closes gh-26464
2021-05-14 13:58:46 +01:00
f92510e39d
Merge branch '2.4.x'
...
Closes gh-26451
2021-05-13 11:44:27 +01:00
970f933806
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26450
2021-05-13 11:44:01 +01:00
2dd94b5554
Polish "Use try-with-resources statement"
...
See gh-26449
2021-05-13 11:37:10 +01:00
5ba9db391f
Use try-with-resources statements
...
See gh-26449
2021-05-13 11:36:14 +01:00
e9adb1ab88
Handle long file names in buildpack images
...
Fixes gh-26445
2021-05-12 18:14:56 -05:00
b62905b91d
Merge branch '2.4.x'
...
Closes gh-25840
2021-05-12 15:48:59 -05:00
8ac297d6f3
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25839
2021-05-12 14:57:40 -05:00
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
07de9e3920
Merge branch '2.4.x'
2021-05-12 17:40:58 +01:00
e29d2e208e
Merge branch '2.3.x' into 2.4.x
2021-05-12 17:40:48 +01:00
b3af6d6403
Polish
...
See gh-25798
2021-05-12 17:40:33 +01:00
ba2a4781d2
Test our Gradle Plugin against Gradle 7.0.1
...
See gh-26420
2021-05-11 08:25:19 +02:00
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
dc5f115c04
Document support for Gradle 6.9
...
Closes gh-26409
2021-05-07 11:29:51 +01:00
b3071dab91
Merge branch '2.4.x'
...
Closes gh-26412
2021-05-07 11:26:18 +01:00
fe4d20c976
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26411
2021-05-07 11:25:10 +01:00
6daf67a88c
Upgrade to Gradle 6.9
...
Closes gh-26408
2021-05-07 11:21:24 +01:00
b4424605af
Merge branch '2.4.x'
...
Closes gh-26406
2021-05-07 09:14:46 +02:00
559af275a4
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26405
2021-05-07 09:14:35 +02:00
afa77b8253
Fix wrong reference to Cassandra in DockerImageNames#couchbase
...
See gh-26399
2021-05-07 09:12:43 +02:00
2976fd9165
Merge branch '2.4.x'
...
Closes gh-26397
2021-05-06 20:12:41 +01:00
fe696ee22a
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26396
2021-05-06 20:11:59 +01:00
ef9e3bafff
Test our Gradle plugin against 6.9-rc-2
...
Closes gh-26395
2021-05-06 20:10:54 +01:00
aeea15be0f
Merge branch '2.4.x'
...
Closes gh-26365
2021-05-05 09:53:20 +01:00
f7fae8f0f2
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26364
2021-05-05 09:52:53 +01:00
b3275c5647
Align productionRuntimeClasspath with runtimeClasspath
...
Fixes gh-25798
2021-05-05 09:52:44 +01:00
b976483852
Merge branch '2.4.x'
...
Closes gh-26330
2021-04-30 16:56:46 +01:00
c0fe23181c
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26329
2021-04-30 16:55:10 +01:00
94ca2d1e78
Test the Gradle plugin against Gradle 6.9-rc-1
...
Closes gh-26267
2021-04-30 16:52:52 +01:00
bb8188b681
Merge branch '2.4.x'
...
Closes gh-26313
2021-04-29 16:16:32 -05:00
17fa215cf5
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26312
2021-04-29 15:33:33 -05:00
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
fa81b41afc
Merge branch '2.4.x'
...
Closes gh-26301
2021-04-29 11:37:13 +01:00
94519c33b1
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26300
2021-04-29 11:36:15 +01:00
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
52994027f4
Fix checkstyle violation
2021-04-28 15:14:33 +02:00
7465eb0f03
Merge branch '2.4.x'
2021-04-28 15:12:45 +02:00
85e1cc4d65
Fix checkstyle violation
2021-04-28 15:12:22 +02:00
09ae65e3b7
Merge branch '2.4.x'
...
Closes gh-26277
2021-04-28 14:13:11 +02:00
05b09907e0
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26275
2021-04-28 14:12:35 +02:00
d610f3c2ff
Polish "Fix ordering of metadata entries"
...
See gh-26230
2021-04-28 14:07:37 +02:00
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
9e3c3b73ac
Merge branch '2.4.x'
2021-04-28 13:58:05 +02:00
d98fe36b88
Merge branch '2.3.x' into 2.4.x
2021-04-28 13:57:45 +02:00
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
6953da2013
Merge branch '2.4.x'
...
Closes gh-26257
2021-04-27 15:19:04 +01:00
a1138efc5f
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26256
2021-04-27 15:18:23 +01:00
a470c1af3a
Align documentation with main default branch name
...
Closes gh-26255
2021-04-27 15:18:00 +01:00
50118f67fd
Test Maven plugin against latest Maven versions
...
See gh-26200
2021-04-22 14:59:16 +02:00
b9348c6d28
Merge branch '2.4.x'
...
Closes gh-26169
2021-04-20 11:26:46 +01:00
bc1a462143
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26168
2021-04-20 11:19:10 +01:00
82198a99e0
Polish nohttp configuration
...
Closes gh-26166
2021-04-20 11:15:13 +01:00
548baf7914
Update copyright year of changed file
...
See gh-26145
2021-04-19 09:34:56 +02:00
996472b42d
Polish
...
See gh-26145
2021-04-19 09:34:55 +02:00
b4c9bb0d5c
Merge branch '2.4.x'
...
Closes gh-26122
2021-04-14 15:05:55 -07:00
fb3796dae8
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26121
2021-04-14 15:02:58 -07:00
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
b0cce645dd
Use a non-deprecated class to identify kotlin-gradle-plugin-api jar
...
See gh-26080
2021-04-13 20:29:36 +01:00
6f2b4aa685
Upgrade to Kotlin 1.5.0-RC
...
Closes gh-26080
Closes gh-25498
2021-04-13 19:51:03 +01:00
c4750fd0ff
Support Gradle 7 and raise minimum supported version to 6.8
...
Closes gh-26026
2021-04-12 15:20:32 +01:00
db79fe8b2c
Test our Gradle Plugin against Gradle 7.0
...
See gh-25997
2021-04-10 10:48:44 +02:00
5bc35e8f44
Extract XML example from Maven plugin adoc file
...
See gh-25993
2021-04-09 14:22:51 -05:00
e27d4848dd
Merge branch '2.4.x'
...
Closes gh-25993
2021-04-09 14:12:36 -05:00
6a7f1f1c56
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25992
2021-04-09 14:11:47 -05:00
e19443093d
Document runtime JVM configuration when building an image
...
Fixes gh-21478
2021-04-09 14:06:24 -05:00
86303c017b
Merge branch '2.4.x'
...
Closes gh-25938
2021-04-08 13:03:45 -05:00
9108b81bb2
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25937
2021-04-08 13:03:26 -05:00
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
8b5f914ba5
Revert "Merge branch '2.4.x'"
...
This reverts commit 97b26b48866f9b1ed6a3
2021-04-07 10:20:23 +01:00
e9ce20dbf4
Revert "Merge branch '2.3.x' into 2.4.x"
...
This reverts commit 586ce00e06563b8a8cec
2021-04-07 10:19:20 +01:00
b35d1ec6e8
Revert "Use test harness for image building integration tests"
...
This reverts commit da9d8d6055
2021-04-07 09:30:51 +01:00
807ea1af0d
Update copyright year of changed files
2021-04-06 14:59:52 -07:00
095ff18854
Test our Gradle plugin against Gradle 7.0-rc-2
...
Closes gh-25888
2021-04-06 10:30:35 +01:00
5595fb2423
Polish "Extract XML examples from Maven plugin adoc files"
...
See gh-25534
2021-03-31 14:05:11 -05:00
4e287594bf
Extract XML examples from Maven plugin adoc files
...
See gh-25534
2021-03-31 14:05:10 -05:00
97b26b4886
Merge branch '2.4.x'
...
Closes gh-25840
2021-03-30 21:00:38 -05:00
586ce00e06
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25839
2021-03-30 17:39:10 -05:00
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
6f9b1ed6a3
Merge branch '2.4.x'
...
See gh-25837
2021-03-30 20:52:38 +01:00
563b8a8cec
Merge branch '2.3.x' into 2.4.x
...
See gh-25836
2021-03-30 20:52:15 +01:00
e94f8bba62
Ensure that upstream jars have been built
...
See gh-25835
2021-03-30 20:51:33 +01:00
df4b1ffb0d
Merge branch '2.4.x'
...
Closes gh-25837
2021-03-30 20:42:41 +01:00
38a4f135a9
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25836
2021-03-30 20:42:29 +01:00
ca9a619259
Defer processing of zipTree source until execution time
...
Closes gh-25835
2021-03-30 20:41:46 +01:00
09173b81d6
Merge branch '2.4.x'
...
Closes gh-25833
2021-03-30 18:18:36 +01:00
7a846ad41f
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25832
2021-03-30 18:18:10 +01:00
5a086321c6
Polish "Document Failsafe configuration when not using starter parent"
...
See gh-25621
2021-03-30 18:16:21 +01:00
0d79fd3e01
Document Failsafe configuration when not using starter parent
...
See gh-25621
2021-03-30 18:02:12 +01:00
8c31d29acf
Merge branch '2.4.x'
2021-03-30 09:29:59 -07:00
a28a3ae090
Merge branch '2.3.x' into 2.4.x
2021-03-30 09:25:46 -07:00
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
c9451b59f2
Merge branch '2.4.x'
2021-03-29 15:51:23 -07:00
a0f5169966
Polish
2021-03-29 15:51:13 -07:00
44b1751bb4
Merge branch '2.4.x'
...
Closes gh-25826
2021-03-29 15:48:20 -07:00
363f5829d1
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25825
2021-03-29 15:46:50 -07:00
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
269fc68c1d
Merge branch '2.4.x'
...
Closes gh-25811
2021-03-26 16:43:13 -05:00
4015d70f00
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25789
2021-03-26 15:16:01 -05:00
a9a37f0dd5
Increase test coverage on Java 16
...
See gh-25809
2021-03-26 19:38:54 +00:00
3ad5f1013a
Fix Maven image building with classifiers
...
Fixes gh-25736
2021-03-26 11:36:38 -05:00
340893747b
Merge branch '2.4.x'
...
Closes gh-25799
2021-03-25 15:50:45 +00:00
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
deaff1a522
Merge branch '2.4.x'
...
Closes gh-25775
2021-03-23 17:08:18 -07:00
ca9fae6b47
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25774
2021-03-23 17:07:44 -07:00
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
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
b8873578ca
Add missing @Deprecated annotations
2021-03-23 17:06:53 -07:00
77ddb45704
Merge branch '2.4.x'
2021-03-23 12:53:59 -07:00
11a94ee6f0
Merge branch '2.3.x' into 2.4.x
2021-03-23 12:52:07 -07:00
82127fdaa3
Update copyright year of changed files
2021-03-23 12:50:49 -07:00
ca46fe7cd0
Test our Gradle plugin against Gradle 7.0-rc-1
...
Closes gh-25763
2021-03-23 10:41:43 +00:00
2dd4010eb0
Merge branch '2.4.x'
...
Closes gh-25701
2021-03-19 15:58:14 -05:00
6f860b441b
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25700
2021-03-19 14:52:20 -05:00
fb670ee654
Drop support for Gradle 5.6.x
...
Closes gh-24225
2021-03-19 17:30:27 +00:00
83342c7aa7
Test the Gradle plugin against 7.0-milestone-3
...
Closes gh-25747
2021-03-19 17:01:38 +00:00
663fd8ce5e
Update copyright year of changed files
2021-03-18 14:49:52 -07:00
685b045c3d
Polish
2021-03-18 14:49:52 -07:00
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
67545cf4f1
Polish
2021-03-17 12:39:50 +00:00
2adf3f836c
Merge branch '2.4.x'
2021-03-17 12:25:24 +00:00
c815195f13
Polish
2021-03-17 12:25:13 +00:00
36c72cb6ef
Merge branch '2.4.x'
...
Closes gh-25716
2021-03-17 11:33:48 +00:00
5595fd4017
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25715
2021-03-17 11:31:46 +00:00
0e0418546b
Test spring-boot:build-image when repackage is also invoked
...
Closes gh-25714
2021-03-17 11:19:29 +00:00
68e5a107cc
Revert "Merge branch '2.4.x'"
...
This reverts commit 5488b8cb46dee0df5c53
2021-03-17 11:17:54 +00:00
ed4e419b0c
Revert "Merge branch '2.3.x' into 2.4.x"
...
This reverts commit eaa510872a3e69522e2d
2021-03-17 11:13:58 +00:00
ae2ff7849b
Revert "Fail fast when finalName is misconfigured"
...
This reverts commit 263b7c20e4
2021-03-17 11:11:24 +00:00
5488b8cb46
Merge branch '2.4.x'
...
Closes gh-25701
2021-03-16 17:48:54 -05:00
eaa510872a
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25700
2021-03-16 17:31:32 -05:00
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
ebdb046ca9
Leave jar and war tasks enabled but configured with a classifier
...
Closes gh-23797
2021-03-16 10:31:56 +00:00
e517ee8635
Merge branch '2.4.x'
...
Closes gh-25618
2021-03-13 18:22:57 +01:00
09f4d4b9bf
Polish
...
See gh-25617
2021-03-13 18:08:54 +01:00
3c0e236562
Support Maven's reproducible build feature for war repackaging
...
See gh-25571
2021-03-11 11:08:10 +00:00
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
5a0c3a8497
Merge branch '2.4.x'
...
Closes gh-25516
2021-03-05 15:47:50 +01:00
ddf75f095c
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25515
2021-03-05 15:47:36 +01:00
6ebc69d704
Polish "Include properties in source merge algorithm"
...
See gh-25507
2021-03-05 15:47:09 +01:00
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
2b7f23b29d
Merge branch '2.4.x'
...
Closes gh-25509
2021-03-05 10:44:24 +00:00
ac258a95a2
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25508
2021-03-05 10:39:52 +00:00
c6ca7a53ab
Polish "Prevent extracting zip entries outside of destination path"
...
See gh-25505
2021-03-05 10:13:32 +00:00
2993e68715
Prevent extracting zip entries outside of destination path
...
See gh-25505
2021-03-05 10:12:06 +00:00
76d0a7f8ba
Merge branch '2.4.x'
...
Closes gh-25506
2021-03-05 10:03:42 +01:00
89a44f3da4
Fix some assertions
...
See gh-25499
2021-03-05 09:56:55 +01:00
961a34a5ee
Merge branch '2.4.x'
...
Closes gh-25497
2021-03-04 19:15:03 +00:00
1ce6e796fe
Polish "Allow the project to be built with Java 16"
...
See gh-25171
2021-03-04 18:54:58 +00:00
1ccd8dae8a
Allow the project to be built with Java 16
...
See gh-25171
2021-03-04 18:54:56 +00:00
e58353a32d
Merge branch '2.4.x'
...
Closes gh-25484
2021-03-03 15:16:58 +01:00
e5d8b6029b
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25483
2021-03-03 15:16:08 +01:00
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
434db48969
Merge branch '2.4.x'
...
Closes gh-25469
2021-03-01 16:01:12 -06:00
afb60d6161
Add tests for Gradle examples used in plugin docs
...
Fixes gh-25468
2021-03-01 15:22:15 -06:00
a80f1af811
Merge branch '2.4.x'
...
Closes gh-25463
2021-03-01 10:18:42 +01:00
ed1c68f567
Update copyright year of changed file
...
See gh-25454
2021-03-01 10:06:23 +01:00
cbab2396e2
Fix property name in gradle plugin documentation
...
See gh-25454
2021-03-01 10:01:52 +01:00
b36caec413
Merge branch '2.4.x'
...
Closes gh-25438
2021-02-25 17:33:00 +00:00
d48551ff12
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25437
2021-02-25 17:32:40 +00:00
86ca32e694
Enable stricter validation for Gradle plugin
...
See gh-25409
2021-02-25 17:28:51 +00:00
84984fb148
Merge branch '2.4.x'
...
Closes gh-25431
2021-02-25 14:28:41 +00:00
ecf8437d4a
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25430
2021-02-25 14:28:28 +00:00
101d88a840
Update Testcontainers image versions
...
See gh-25412
2021-02-25 14:27:41 +00:00
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
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
9836b060d4
Test the Gradle plugin against 7.0-milestone-2
...
Closes gh-25404
2021-02-24 11:28:45 +00:00
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
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
817a4c5397
Merge branch '2.4.x'
...
Closes gh-25386
2021-02-22 10:46:13 +01:00
7c5a5c6663
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25385
2021-02-22 10:45:55 +01:00
77daae1480
Update copyright year of changed file
...
See gh-25382
2021-02-22 10:41:49 +01:00
abc90db32f
Fix wording error in build-info goal description
...
See gh-25382
2021-02-22 10:26:53 +01:00
Andy Wilkinson
Phillip Webb
Madhura Bhave
Stephane Nicoll
Marcus Klimstra
Mark Jeffrey
Slawomir Jaranowski
Scott Frederick
Abel Salgado Romero
dreis2211
weixsun
Sach Nguyen
Dmitry Pavlov
izeye
robert-smith-911
Jurrie Overgoor
Bertrand Renuart
trungPa
jnizet
Stefan Wolf
Scott Frederick
Mustafa Ulu