Commit Graph

3640 Commits

Author SHA1 Message Date
Phillip Webb 202db9b7f4 Update copyright year of changed files 2024-11-04 14:28:23 -08:00
Andy Wilkinson ba56bbe490 Merge branch '3.3.x'
Closes gh-42983
2024-11-04 13:15:27 +00:00
Andy Wilkinson bffde8228e Merge branch '3.2.x' into 3.3.x
Closes gh-42982
2024-11-04 13:15:12 +00:00
Andy Wilkinson 2fc0016ef1 Fix spring-boot-gradle-plugin's tests in Eclipse
Closes gh-32625
2024-11-04 13:11:45 +00:00
Andy Wilkinson a3168e3a2f Centralize dependency management of Commons Compress
Closes gh-39368
2024-11-04 11:45:41 +00:00
Stéphane Nicoll fdf24c6caa Merge branch '3.3.x'
Closes gh-42976
2024-11-02 20:25:35 +09:00
Tran Ngoc Nhan 9e92bfe906 Polish
See gh-42974
2024-11-02 20:20:06 +09:00
Phillip Webb 2fa1180332 Make NamedPipeSocket.connect a no-op to fix connection exceptions
Update `NamedPipeSocket` so that `connect` methods are now no-ops. This
restores the behavior of Spring Boot 3.3 which previously handled the
case by overriding `ConnectionSocketFactory.connectSocket`. The newer
HTTP client code uses the `DetachedSocketFactory` interface which
doesn't offer a method that we can override, so instead we must change
the socket implementation itself.

Fixes gh-42952
2024-11-01 13:22:07 -07:00
Phillip Webb bc5a25bf16 Polish 2024-11-01 13:14:05 -07:00
Andy Wilkinson 4a9da78eb8 Merge branch '3.3.x'
Closes gh-42969
2024-11-01 14:32:51 +00:00
Andy Wilkinson f9281a61ff Rework Antora Gradle Infrastructure
Closes gh-40572

Co-authored-by: Phillip Webb <phil.webb@broadcom.com>
2024-11-01 14:28:18 +00:00
Moritz Halbritter 8f6aabc15b Merge branch '3.3.x'
Closes gh-42960
2024-10-31 15:07:11 +01:00
Moritz Halbritter 6470748d6d Merge branch '3.2.x' into 3.3.x
Closes gh-42959
2024-10-31 15:07:02 +01:00
Moritz Halbritter 90b920a410 Use default address if null address is given
Closes gh-42958
2024-10-31 14:34:30 +01:00
Stéphane Nicoll a52bdc98e7 Merge branch '3.3.x'
Closes gh-42936
2024-10-30 16:39:46 +09:00
Stéphane Nicoll 35d6d76d12 Merge branch '3.2.x' into 3.3.x
Closes gh-42935
2024-10-30 16:39:32 +09:00
Stéphane Nicoll 1a3f1a41b1 Polish "Complete support for project.build.outputTimestamp"
See gh-42922
2024-10-30 11:04:48 +09:00
Andreas Höhmann 491515e6e3 Complete support for project.build.outputTimestamp
This commit completes the support of project.build.outputTimestamp to
also support a value that's expressed as seconds since the epoch.

See gh-42922
2024-10-30 10:51:07 +09:00
Andy Wilkinson 9a3605fcb9 Merge branch '3.3.x'
Closes gh-42931
2024-10-29 20:27:13 +00:00
Andy Wilkinson c8b0e7f66a Merge branch '3.2.x' into 3.3.x
Closes gh-42930
2024-10-29 17:54:55 +00:00
Andy Wilkinson c340c691c5 Avoid calling getProject() during task execution
Closes gh-32980
2024-10-29 17:54:00 +00:00
Stéphane Nicoll e5ec38074b Merge branch '3.3.x'
Closes gh-42917
2024-10-29 13:39:31 +09:00
Stéphane Nicoll 5fcc585178 Merge branch '3.2.x' into 3.3.x
Closes gh-42916
2024-10-29 13:39:23 +09:00
Stéphane Nicoll eba7a5a077 Update copyright year of changed files
See gh-42901
2024-10-29 13:35:35 +09:00
Tran Ngoc Nhan ff855d9421 Remove redundant null check
See gh-42901
2024-10-29 13:33:55 +09:00
Stéphane Nicoll cc443366fa Merge branch '3.3.x'
Closes gh-42915
2024-10-29 13:28:42 +09:00
Stéphane Nicoll 4401673d6d Merge branch '3.2.x' into 3.3.x
Closes gh-42914
2024-10-29 13:27:06 +09:00
Stéphane Nicoll d4010d3be0 Polish "Prevent auth header to be included in Docker API call"
See gh-42910
2024-10-29 13:24:09 +09:00
YiXuan Ding 351018ea65 Prevent auth header to be included in Docker API call
See gh-42910
2024-10-29 13:16:08 +09:00
Phillip Webb 005ea96307 Revert "Add spring-aop to work around Spring Framework mock detection issue"
This reverts commit 2a64cf6fb1.

Closes gh-42855
2024-10-23 12:36:36 -07:00
Phillip Webb 2a64cf6fb1 Add spring-aop to work around Spring Framework mock detection issue 2024-10-23 11:13:28 -07:00
Stéphane Nicoll 27e8f14c31 Polish "Add container support for ClickHouse"
See gh-42837
2024-10-23 18:15:43 +02:00
Moritz Halbritter 5e5f41b7a6 Merge branch '3.3.x'
Closes gh-42845
2024-10-23 08:27:51 +02:00
Moritz Halbritter 9cced069a0 Delete argfile on JVM exit
Closes gh-42841
2024-10-23 08:27:31 +02:00
Tran Ngoc Nhan fcbf6b0200 Polish
See gh-42798
2024-10-21 13:23:42 +02:00
Phillip Webb 2f5f224559 Merge branch '3.3.x' 2024-10-18 10:49:15 -07:00
Phillip Webb 223886ff37 Merge branch '3.2.x' into 3.3.x 2024-10-18 10:48:51 -07:00
Phillip Webb 3481107ff7 Update copyright year of changed files 2024-10-18 10:48:29 -07:00
Moritz Halbritter ba1a780147 Merge branch '3.3.x'
Closes gh-42774
2024-10-17 18:06:43 +02:00
Moritz Halbritter 73150b799a Merge branch '3.2.x' into 3.3.x
Closes gh-42772
2024-10-17 17:58:11 +02:00
Moritz Halbritter ce106eb43c Remove calls to deprecated Project.getBuildDir() in Gradle files
Closes gh-42739
2024-10-17 17:46:17 +02:00
Andy Wilkinson 25082d33e7 Provide more control over access to endpoint operations
This commit reworks the support for enabling and disabling endpoints,
replacing the on/off support that it provided with a finer-grained
access model that supports only allowing read-only access to endpoint
operations in addition to disabling an endpoint (access of none) and
fully enabling it (access of unrestricted).

The following properties are deprecated:

- management.endpoints.enabled-by-default
- management.endpoint.<id>.enabled

Their replacements are:

- management.endpoints.access.default
- management.endpoint.<id>.access

Similarly, the enableByDefault attribute on @Endpoint has been
deprecated with a new defaultAccess attribute replacing it.

Additionally, a new property has been introduced that allows an
operator to control the level of access to Actuator endpoints
that is permitted:

- management.endpoints.access.max-permitted

This property caps any access that may has been configured for
an endpoint. For example, if
management.endpoints.access.max-permitted is set to read-only and
management.endpoint.loggers.access is set to unrestricted, only
read-only access to the loggers endpoint will be allowed.

Closes gh-39046
2024-10-17 13:56:44 +01:00
Moritz Halbritter c018c43886 Merge branch '3.3.x'
Closes gh-42736
2024-10-17 13:44:25 +02:00
Moritz Halbritter 8efe6e02d9 Merge branch '3.2.x' into 3.3.x
Closes gh-42735
2024-10-17 13:38:03 +02:00
Moritz Halbritter a3060652f8 Call String.toLowerCase and .toUppercase with explicit locale
Closes gh-42719
2024-10-17 13:20:39 +02:00
Moritz Halbritter d1976a48dc Upgrade to HttpClient5 5.4
Closes gh-42675
2024-10-17 09:51:39 +02:00
Yanming Zhou 87cc2efb64 Strengthen package-like assertions
See gh-42682
2024-10-16 16:52:13 -07:00
Phillip Webb 465e909974 Merge branch '3.3.x' 2024-10-16 13:09:09 -07:00
Phillip Webb 5732782043 Merge branch '3.2.x' into 3.3.x 2024-10-16 13:08:44 -07:00
Phillip Webb 41ae973d16 Update copyright year of changed files 2024-10-16 13:08:37 -07:00
Phillip Webb 0a6d3f312e Polish 2024-10-16 13:08:21 -07:00
Stéphane Nicoll e0152097f3 Polish "Upgrade to Testcontainers 1.20.2"
This commit review the original upgrade to retain compatiblity with the
deprecated Cassandra and ConfluentKafka containers.

This commit also fixes the SSL Cassandra tests. The new container uses
a custom wait strategy that uses plain text and does not work with an
SSL container.

Closes gh-42670

Co-authored-by: Moritz Halbritter <moritz.halbritter@broadcom.com>
2024-10-15 14:45:15 +02:00
Stéphane Nicoll a66d3d2f00 Merge branch '3.3.x'
Closes gh-42689
2024-10-15 10:42:41 +02:00
Stéphane Nicoll 056e2b6029 Merge branch '3.2.x' into 3.3.x
Closes gh-42688
2024-10-15 10:42:33 +02:00
Stéphane Nicoll b0dd42e9b9 Transform Maven settings with proper plugin repository tag
This commit adapts d44e7c9 to transforms plugin repositories using the
correct root tag. Previously, they were transformed with the regular
<repository> tag, which is invalid.

Closes gh-42687
2024-10-15 10:39:59 +02:00
Stéphane Nicoll a40ae49a76 Upgrade to Testcontainers 1.20.2
Closes gh-42670
2024-10-14 16:25:57 +02:00
Moritz Halbritter 4429e847bf Merge branch '3.3.x'
Closes gh-42629
2024-10-14 11:59:26 +02:00
Moritz Halbritter 5754be36f1 Improve documentation for CycloneDX integration
Closes gh-41506
2024-10-14 11:55:45 +02:00
Moritz Halbritter 957e2f8b7f Add warning if sensitive container paths are bound
Closes gh-41643
2024-10-14 10:18:34 +02:00
Anthony Dahanne 416413957a Use builder-jammy-java-tiny when using Buildpacks
See gh-42508
2024-10-07 13:30:41 +02:00
Phillip Webb 54dcd9894c Remove remaining use of loader classic
Closes gh-42495
2024-10-01 18:23:35 -07:00
Phillip Webb e529769b0c Merge branch '3.3.x' 2024-10-01 17:20:14 -07:00
Phillip Webb 9f34899454 Merge branch '3.2.x' into 3.3.x 2024-10-01 17:20:10 -07:00
Phillip Webb d342eefa27 Use Sync task rather than Copy
See gh-42333
2024-10-01 17:19:52 -07:00
Andy Wilkinson 42ad6ddf0a Raise the minimum supported version of Gradle to 8.4
Closes gh-42481
2024-10-01 17:23:24 +01:00
Phillip Webb 99142dbbb2 Merge branch '3.3.x' 2024-09-30 16:25:47 -07:00
Phillip Webb ec615f631c Merge branch '3.2.x' into 3.3.x 2024-09-30 16:03:30 -07:00
Phillip Webb 05b4edfd2c Use `ifeval` block for Commercial/OSS documentation
See gh-42333
2024-09-30 15:56:40 -07:00
Stéphane Nicoll 689bce88d2 Merge branch '3.3.x'
Closes gh-42477
2024-09-30 13:09:50 +02:00
Stéphane Nicoll c8d3e07eec Merge branch '3.2.x' into 3.3.x
Closes gh-42476
2024-09-30 13:09:40 +02:00
Stéphane Nicoll ab968494e6 Document how to handle the manifest in a native image with Maven
Closes gh-42412
2024-09-30 10:55:58 +02:00
Phillip Webb bc5a718cfa Merge branch '3.3.x' 2024-09-27 17:35:23 -07:00
Phillip Webb 3b8ae47096 Merge branch '3.2.x' into 3.3.x 2024-09-27 17:35:01 -07:00
Phillip Webb d44e7c9af2 Dynamically populate repositories used in Ant/Maven integration tests
Update build scripts and tests so that repository settings are copied
dynamically from the build.

See gh-42333
2024-09-27 17:33:00 -07:00
Phillip Webb 7d8507d186 Polish 2024-09-27 17:31:24 -07:00
Phillip Webb 7fe7c61e7f Merge branch '3.3.x' 2024-09-27 12:18:11 -07:00
Phillip Webb e086439e51 Merge branch '3.2.x' into 3.3.x 2024-09-27 12:18:06 -07:00
Phillip Webb c347ccaa76 Attempt to fix system tests following repository updates
See gh-42333
2024-09-27 12:17:29 -07:00
Moritz Halbritter 33def6d6b4 Polish "Add service connection support for Hazelcast"
See gh-42416
2024-09-26 16:45:26 +02:00
Dmytro Nosan cee7439dbe Add service connection support for Hazelcast
See gh-42416
2024-09-26 14:34:12 +02:00
Moritz Halbritter 593d2cccc4 Polish "Add support for virtual threads in OtlpMetricRegistry configuration"
See gh-42407
2024-09-26 13:42:39 +02:00
Mike Turbe e615eb313a Add support for virtual threads in OtlpMetricRegistry configuration
See gh-42407
2024-09-26 13:26:30 +02:00
Yanming Zhou 0871feb0d9 Polish javadoc of TestImage for consistency
See gh-42426
2024-09-25 13:59:35 +02:00
Moritz Halbritter 3ec55b2157 Merge branch '3.3.x'
Closes gh-42447
2024-09-25 13:56:45 +02:00
Moritz Halbritter 003b182d95 Merge branch '3.2.x' into 3.3.x
Closes gh-42446
2024-09-25 13:56:33 +02:00
Yanming Zhou 72d68a2cb8 Remove duplicated dependency
See gh-42442
2024-09-25 13:56:01 +02:00
Phillip Webb 7b3077280c Merge branch '3.3.x'
Closes gh-42441
2024-09-24 14:32:48 -07:00
Phillip Webb 100bedc07d Merge branch '3.2.x' into 3.3.x
Closes gh-42440
2024-09-24 14:29:09 -07:00
Phillip Webb ad72411e2b Apply conventions plugin to all subprojects
Closes gh-42438
2024-09-24 14:26:32 -07:00
Phillip Webb 72f379a5b2 Merge branch '3.2.x' into 3.3.x
Closes gh-42434
2024-09-24 13:01:05 -07:00
Phillip Webb eafe61c4ca Backport upgrade to Gradle 8.10.1
Cherry-pick commits d756bf4e86, 083ac67d13 and 162c929a80 to
upgrade to Gradle 8.10.1.

Closes gh-42433
2024-09-24 12:55:29 -07:00
Phillip Webb 21b0bdec12 Merge branch '3.3.x'
Closes gh-42418
2024-09-22 17:52:42 -07:00
Phillip Webb 593862b082 Merge branch '3.2.x' into 3.3.x
Closes gh-42417
2024-09-22 17:52:37 -07:00
arefbehboudi 0d3fceec5d Polish
See gh-42413
2024-09-22 17:45:59 -07:00
Andy Wilkinson 1a4f5abb13 Merge branch '3.3.x'
Closes gh-42358
2024-09-18 14:58:35 +01:00
Andy Wilkinson 4a6793eab5 Merge branch '3.2.x' into 3.3.x
Closes gh-42357
2024-09-18 14:55:35 +01:00
Andy Wilkinson 1240c59482 Only configure plugin classpath where it's needed
When spring-boot-gradle-plugin is using GradleRunner, it needs to be
configured with a custom plugin classpath to account for the fact
that our Gradle plugin is on the classpath of the system classloader
but some of the other plugins would only be available on a
Gradle-created classloader. This imbalance cause class loading
problems as code in spring-boot-gradle-plugin can't see types at
runtime that are only available on the Gradle-created classloader.

To overcome this, we need to configure the GradleRunner with a custom
plugin classpath that contains both spring-boot-gradle-plugin and all
of the other plugins that are used in its various integration tests.
Previously, this was done in GradleBuild that's used by both
spring-boot-gradle-plugin and spring-boot-image-tests. This caused
a problem as spring-boot-image-tests does not have the
above-described problem and trying to correct it did not work leaving
tests that use spring-boot-gradle-plugin unable to see other plugins
such that the native image plugin.

This commit reworks the customization of the plugin classpath so that
it's only done in spring-boot-gradle-plugin's integration tests.

Closes gh-42338
2024-09-18 14:53:54 +01:00
Moritz Halbritter 9294c003b4 Remove setting BP_NATIVE_IMAGE
Closes gh-32884
2024-09-17 15:50:57 +02:00
Stéphane Nicoll 00440b982c Merge branch '3.3.x'
Closes gh-42321
2024-09-16 09:04:19 +02:00
Stéphane Nicoll 437ff754ef Merge branch '3.2.x' into 3.3.x
Closes gh-42320
2024-09-16 09:04:07 +02:00
Stéphane Nicoll 242803d59b Polish "Replace Configuration fully qualified name by constant"
See gh-42311
2024-09-16 09:01:36 +02:00
mushroom528 9bcfc72307 Replace Configuration fully qualified name by constant
See gh-42311
2024-09-16 09:01:23 +02:00
Phillip Webb 3723a9e040 Support Testcontainer JDBC URLs with `Replace.NON_TEST`
Update `TestDatabaseAutoConfiguration` so that Testcontainer JDBC URLs
are also detected when using `Replace.NON_TEST`.

Closes gh-35253
2024-09-12 13:02:23 -07:00
Andy Wilkinson c460600c43 Merge branch '3.3.x'
Closes gh-42189
2024-09-09 13:53:14 +01:00
Andy Wilkinson 2c9f693d17 Merge branch '3.2.x' into 3.3.x
Closes gh-42188
2024-09-09 13:53:03 +01:00
Andy Wilkinson 9a74437fbc Delete unused javadoc CSS file
Closes gh-42187
2024-09-09 13:52:23 +01:00
Phillip Webb b05336d218 Merge branch '3.3.x' 2024-09-03 21:05:05 -07:00
Phillip Webb 599f1f1a9c Merge branch '3.2.x' into 3.3.x 2024-09-03 21:04:36 -07:00
Phillip Webb f3645bba13 Update copyright year of changed files 2024-09-03 21:04:26 -07:00
Moritz Halbritter 742bfa91eb Merge branch '3.3.x'
Closes gh-42099
2024-09-03 14:47:06 +02:00
Moritz Halbritter 8c5a0f08a4 Merge branch '3.2.x' into 3.3.x
Closes gh-42098
2024-09-03 14:46:52 +02:00
Moritz Halbritter e7d6bd6ccd Test spring-boot-maven-plugin against Maven 3.9.9
Closes gh-42097
2024-09-03 14:29:49 +02:00
Phillip Webb 09684295e0 Merge branch '3.3.x'
Closes gh-42083
2024-09-01 18:56:14 -07:00
martinfrancois fd9d907ef3 Improve formatting for Docker configuration example with Colima
See gh-42078
2024-09-01 18:55:59 -07:00
Phillip Webb 7fc5c4bb6c Merge branch '3.3.x'
Closes gh-42082
2024-09-01 18:51:45 -07:00
Phillip Webb b29bc2dc2e Merge branch '3.2.x' into 3.3.x
Closes gh-42081
2024-09-01 18:51:33 -07:00
Johnny Lim a8452b54b5 Polish
See gh-42069
2024-09-01 18:50:38 -07:00
Phillip Webb 85682f8498 Merge branch '3.3.x'
Closes gh-42080
2024-09-01 15:25:25 -07:00
Phillip Webb 101ed0e543 Merge branch '3.2.x' into 3.3.x
Closes gh-42079
2024-09-01 15:25:15 -07:00
Phillip Webb 8c1d9872d2 Fix support for large zip files
Update `spring-boot-loader` to support large zip files by correctly
dealing with unsigned ints.

Fixes gh-42012
2024-09-01 15:13:46 -07:00
Phillip Webb 9b85c73d06 Merge branch '3.3.x'
Closes gh-42072
2024-08-31 11:22:10 -07:00
Phillip Webb 3a458d8062 Merge branch '3.2.x' into 3.3.x
Closes gh-42071
2024-08-31 11:21:51 -07:00
Phillip Webb cc2dc558f1 Don't report already migrated properties when has group
Refine the fix adding commit 962936370a so that items with a group
are correctly checked.

Fixes gh-42068
2024-08-31 11:18:47 -07:00
Scott Frederick e7faca3bbb Add support for Testcontainer Redis
Add support for the official `com.redis:testcontainers-redis` container.

See gh-41450
2024-08-29 19:23:40 -07:00
Phillip Webb 019dd678e6 Merge branch '3.3.x'
Closes gh-42051
2024-08-28 13:01:17 -07:00
Phillip Webb 71f509c9fd Fix broken tab markup
Closes gh-42046
2024-08-28 13:00:25 -07:00
Andy Wilkinson 162c929a80 Remove workaround that should now be redundant
See gh-41980
2024-08-23 16:29:20 +01:00
Andy Wilkinson d756bf4e86 Upgrade build to Gradle 8.10
Closes gh-41980
2024-08-23 12:41:05 +01:00
Stéphane Nicoll 25954d296c Merge branch '3.3.x'
Closes gh-42002
2024-08-22 16:50:56 +02:00
Stéphane Nicoll f0d2503b64 Merge branch '3.2.x' into 3.3.x
Closes gh-42001
2024-08-22 16:50:42 +02:00
Stéphane Nicoll 1822b2fade Include spring-boot-starter-parent in Integration tests repository
This commit makes sure that integration tests for the Maven Plugin have
access to the current "spring-boot-starter-parent" pom and its
hierarchy as new integration tests rely on that.

Closes gh-42000
2024-08-22 16:46:52 +02:00
Andy Wilkinson 5c7ea741f2 Merge branch '3.3.x' 2024-08-22 13:07:39 +01:00
Andy Wilkinson d4e1aedba5 Merge branch '3.2.x' into 3.3.x 2024-08-22 13:07:24 +01:00
Andy Wilkinson 0b24ee8571 Improve loading of jar entry certificates
Co-Authored-By: Phillip Webb <phil.webb@broadcom.com>
2024-08-22 10:56:25 +01:00
Phillip Webb c3ed545ffd Merge branch '3.3.x'
Closes gh-41995
2024-08-21 18:24:17 -07:00
Phillip Webb d9746861a7 Upgrade to apachepulsar/pulsar 3.2.4 2024-08-21 18:24:08 -07:00
Scott Frederick cbb738338d Merge branch '3.3.x'
Closes gh-41971
2024-08-20 15:49:39 -05:00
Scott Frederick 0451cb8686 Merge branch '3.2.x' into 3.3.x
Closes gh-41970
2024-08-20 15:49:25 -05:00
Scott Frederick 21b15558a2 Use classpath index when building classpath in PropertiesLauncher
Fixes gh-41719
2024-08-20 15:47:44 -05:00
Phillip Webb 450e31b42e Merge branch '3.3.x' 2024-08-19 16:47:31 -07:00
Phillip Webb 1d337b7c76 Merge branch '3.2.x' into 3.3.x 2024-08-19 16:46:51 -07:00
Phillip Webb f1987e6f8b Update copyright year of changed files 2024-08-19 16:45:34 -07:00
Phillip Webb c30a5572f3 Polish 2024-08-19 16:44:43 -07:00
Stéphane Nicoll 71ca952827 Merge branch '3.3.x'
Closes gh-41921
2024-08-19 09:46:34 +02:00
Stéphane Nicoll a19d69e052 Merge branch '3.2.x' into 3.3.x
Closes gh-41920
2024-08-19 09:46:23 +02:00
Christoph Dreis 393ec8ae51 Fix duplicate words
See gh-41916
2024-08-19 09:44:29 +02:00
Andy Wilkinson bb72a9dbc5 Merge branch '3.3.x'
Closes gh-41874
2024-08-15 11:11:59 +01:00
Andy Wilkinson 732a7baf50 Merge branch '3.2.x' into 3.3.x
Closes gh-41873
2024-08-15 11:11:50 +01:00
rajin c808d44c11 Register JarUrlClassLoader as parallel capable
See gh-41665
2024-08-15 11:11:18 +01:00
Andy Wilkinson 1bf9b258b5 Merge branch '3.3.x'
Closes gh-41872
2024-08-15 11:08:50 +01:00
Andy Wilkinson 1433b64f6f Merge branch '3.2.x' into 3.3.x
Closes gh-41871
2024-08-15 11:07:56 +01:00
Andy Wilkinson cc88a1db97 Test Gradle Plugin against Gradle 8.10
Closes gh-41870
2024-08-15 11:07:15 +01:00
Andy Wilkinson e9da0c237e Correct grammar in 'Running your Application with Maven'
Closes gh-41868
2024-08-15 10:38:57 +01:00
Andy Wilkinson 9a4c17016d Merge branch '3.3.x'
Closes gh-41869
2024-08-15 10:37:25 +01:00
John Blum e6f89c13a3 Correct grammar in 'Running your Application with Maven'
See gh-41840
2024-08-15 10:36:29 +01:00
Moritz Halbritter 46150bae89 Merge branch '3.3.x'
Closes gh-41858
2024-08-14 17:20:59 +02:00
Moritz Halbritter 2a84fe5760 Merge branch '3.2.x' into 3.3.x
Closes gh-41857
2024-08-14 16:47:52 +02:00
Moritz Halbritter 1d45016d8c Upgrade to spring-javaformat 0.0.43
Closes gh-41853
2024-08-14 16:32:41 +02:00
Stéphane Nicoll 90f847d454 Merge branch '3.3.x'
Closes gh-41696
2024-08-05 16:29:32 +02:00
Stéphane Nicoll 7607bf1ab8 Document that repackage should not be used on the command-line
This commit clarifies how we intend the spring-boot:repackage goal to
be used. As it operates on the source jar (or war) that must be
effectively up-to-date to produce an accurate result, the package phase
must have run.

Contrary to build-image that was designed to be used on the command-line
by forking a package lifecycle first, repackage does not do that. This
commit also clarifies that by providing a more focused error message.

Closes gh-22317
2024-08-05 16:16:09 +02:00
Scott Frederick 9e3e067a4c Add support for CNB platform API version 0.14
Closes gh-41549
2024-08-01 17:10:41 -05:00
Stéphane Nicoll 477bd7d15a Detect default enum value
This commit improves the configuration metadata annotation processor to
detect a default enum value. The algorithm is best-effort, similarly to
what it already does for well known prefixes (period, duration, etc).

Based on an expression and an identifier, the default value is inferred
if the expression matches the declaration of the property type.

See gh-7562
2024-08-01 15:43:21 +02:00
Stéphane Nicoll e49a2daf38 Merge branch '3.3.x'
Closes gh-41662
2024-07-31 17:04:21 +02:00
Stéphane Nicoll 8ea6d3c92e Merge branch '3.2.x' into 3.3.x
Closes gh-41661
2024-07-31 17:04:01 +02:00
Stéphane Nicoll 200fc15b5d Detect backup jar when the package lifecycle is forked
Previously, if a classifier was set and build-image was executed from
the command-line, the build will fail as the plugin was unable to find
the original jar. This is because it relies on the attached artifacts
of the project, and those are not set when package has run as part of
a forked lifecycle.

This commit makes sure that the backup file is found by convention
first, the same way it is done for the target file.

Closes gh-26721
2024-07-31 17:01:00 +02:00
Scott Frederick f2479bd4a6 Polish documentation
See gh-40944
2024-07-30 15:25:08 -05:00
Scott Frederick dfab18c965 Add imagePlatform option for image building
An `imagePlatform` option for the Maven and Gradle image-building
goal/task can be used to specify the os/architecture of any
builder, run, and buildpack images that are pulled during image
building.

Closes gh-40944
2024-07-30 14:19:40 -05:00
Stéphane Nicoll 3e7412fe7e Merge branch '3.3.x'
Closes gh-41653
2024-07-30 11:23:48 +02:00
Stéphane Nicoll e05a846a1c Merge branch '3.2.x' into 3.3.x
Closes gh-41652
2024-07-30 11:23:39 +02:00
Stéphane Nicoll 59b47e336b Remove invalid checksum policy setting
This might be a copy/paste error as the checksum policy is used for
deploying and our integration tests do not do that.

Closes gh-41651
2024-07-30 11:20:44 +02:00
Stéphane Nicoll 8ef5540624 Merge branch '3.3.x'
Closes gh-41648
2024-07-30 10:58:38 +02:00
Stéphane Nicoll 397aeee9b6 Merge branch '3.2.x' into 3.3.x
Closes gh-41647
2024-07-30 10:58:31 +02:00
Stéphane Nicoll 05468def54 Tolerate module-info with AOT processing
This commit updates the Maven Plugin to tolerate projects that are using
the module path on the JVM and targeting native images with AOT.

Previously, the plugin compiled AOT sources directly to target/classes
and the presence of a module-info there is enough to trigger a
compilation on the module path.

With this change we now compile in a separate directory that contains
the generated AOT classes (typically CGLIB proxies). These are copied to
target/classes once compilation completes already.

The integration test also uses our parent, rather than relying on what
Maven provides. That's because older Maven versions provide a default
compiler plugin version that did not handle the module path correctly.

Closes gh-33383
2024-07-30 10:56:06 +02:00
Stéphane Nicoll 6ab053d823 Merge branch '3.3.x'
Closes gh-41642
2024-07-29 16:56:29 +02:00
Stéphane Nicoll a63a1fe6c5 Merge branch '3.2.x' into 3.3.x
Closes gh-41641
2024-07-29 16:56:18 +02:00
Stéphane Nicoll 47465f6ed5 Do not validate settings if publishing is disabled
This commit improves the Maven Plugin to only validate the publishing
settings if publishing is actually enabled.

Closes gh-29756
2024-07-29 16:55:02 +02:00
Andy Wilkinson 6278d803a5 Merge branch '3.3.x'
Closes gh-41634
2024-07-29 12:13:07 +01:00
Andy Wilkinson 87417c0536 Merge branch '3.2.x' into 3.3.x
Closes gh-41633
2024-07-29 11:57:09 +01:00
Andy Wilkinson 4ee24bf9bd Polish "Add rule to prevent calls to Objects.requireNonNull()"
See gh-41611
2024-07-29 11:41:26 +01:00
Stéphane Nicoll dabc83338b Polish "Add support for Grafana LGTM stack"
See gh-41551
2024-07-29 10:43:56 +02:00
Eddú Meléndez 9eff627eb2 Add support for Grafana LGTM stack
See gh-41551
2024-07-29 10:33:08 +02:00
Phillip Webb fdd5d007f5 Merge branch '3.3.x' 2024-07-25 20:49:42 +01:00
Phillip Webb 28faf12062 Migrate plugins to javadoc asciidoctor macro
See gh-41605
2024-07-25 20:49:02 +01:00
Phillip Webb 84e2049fc5 Merge branch '3.3.x' 2024-07-25 18:25:23 +01:00
Phillip Webb fd58261b9d Revert "Migrate plugins to javadoc asciidoctor macro"
This reverts commit b63e1e7443.
2024-07-25 18:25:15 +01:00
Phillip Webb 7bbb5003db Merge branch '3.3.x' 2024-07-25 18:05:04 +01:00
Phillip Webb b63e1e7443 Migrate plugins to javadoc asciidoctor macro
See gh-41605
2024-07-25 18:03:37 +01:00
Andy Wilkinson e201b94d4f Merge branch '3.3.x'
Closes gh-41616
2024-07-25 16:17:52 +01:00
Andy Wilkinson c642f6d268 Merge branch '3.2.x' into 3.3.x
Closes gh-41613
2024-07-25 16:16:35 +01:00
Andy Wilkinson 5f666eec5b Reduce warnings reported by Eclipse
Closes gh-41598
2024-07-25 14:55:00 +01:00
Andy Wilkinson f1e98d0a73 Merge branch '3.3.x'
Closes gh-41608
2024-07-24 19:23:04 +01:00
Andy Wilkinson a00304de28 Merge branch '3.2.x' into 3.3.x
Closes gh-41607
2024-07-24 19:22:49 +01:00
Andy Wilkinson f9f530ddaa Remove method references to improve compatibility
The use of method references requires the referenced method to be
present even if it isn't called. This made it impossible for Gradle
to remove the deprecated methods as it would break our plugin.
By switching the lambdas, the methods only have to be present when
they're called which will only happen with Gradle 8.2 and earlier.

Closes gh-41599
2024-07-24 19:22:05 +01:00
Andy Wilkinson 23b344691d Polish "Support `@Name` with JavaBean-based configuration properties"
See gh-39452
2024-07-23 14:00:20 +01:00
Phillip Webb 88480664d7 Polish 2024-07-22 19:59:27 +01:00
Phillip Webb 000600c68a Merge branch '3.3.x' 2024-07-22 18:41:53 +01:00
Phillip Webb d9360a034f Polish 2024-07-22 18:41:12 +01:00
Phillip Webb 36b1214feb Merge branch '3.2.x' into 3.3.x 2024-07-22 18:30:45 +01:00
Phillip Webb 61dc82d836 Update copyright year of changed files 2024-07-22 18:16:19 +01:00
Andy Wilkinson 46ec3e3a07 Polish "Support service connections for redis-stack and redis-stack-server"
See gh-41327
2024-07-17 11:08:52 +01:00
Eddú Meléndez 2634d0c6b1 Support service connections for redis-stack and redis-stack-server
See gh-41327
2024-07-17 10:54:06 +01:00
Stéphane Nicoll 4415b4ab1c Polish "Allow NestedConfigurationProperty on getters"
See gh-38844
2024-07-15 10:02:58 +02:00
Jared Bates 6c8987e0d8 Allow NestedConfigurationProperty on getters
This commit adds support adding `@NestedConfigurationProperty` on a
getter.

See gh-38844
2024-07-15 09:24:27 +02:00
Andy Wilkinson c563c501e9 Merge branch '3.3.x'
Closes gh-41456
2024-07-12 07:32:56 +01:00
Andy Wilkinson 8617c981cf Merge branch '3.2.x' into 3.3.x
Closes gh-41455
2024-07-12 07:31:58 +01:00
Andy Wilkinson f702230c12 Test Gradle plugin against Gradle 8.9
Closes gh-41454
2024-07-12 07:31:24 +01:00
Scott Frederick 7b8364d248 Fix LifecycleTests on Windows
See gh-gh-41352
2024-07-11 17:07:23 -05:00
Scott Frederick 224b06982e Add support for untrusted CNB builders
A `trustBuilder` configuration option has been added to the Maven and
Gradle CNB integration image building goal and task. A known set of
builders published by Paketo, Heroku, and Google are trusted by default,
all other builders are untrusted by default.

Closes gh-41352
2024-07-11 13:51:54 -05:00
Andy Wilkinson 375b3b16a0 Remove APIs that were deprecated for removal in 3.4.0
Closes gh-41435
2024-07-10 13:31:21 +01:00
Rui Figueira e7424eacf8 Add SslBundle support to MailSender
See gh-40037
2024-07-04 15:13:15 +02:00
Moritz Halbritter ee8a706e1f Merge branch '3.3.x'
Closes gh-41317
2024-07-04 11:10:22 +02:00
Alexis Couvreur 47c8a859ea Support NestedConfigurationProperty for record types
Add ElementType.RECORD_COMPONENT to NestedConfigurationProperty and
implement isMarkedAsNested for RecordParameterPropertyDescriptor.

This will allow nested records to be properly harvested for their
properties.

See gh-41251
2024-07-04 10:58:51 +02:00
Scott Frederick 17c5538062 Merge branch '3.3.x' 2024-07-01 11:24:00 -05:00
Scott Frederick 70e14d648d Polish documentation headings
Title case should be used in all headings.
2024-07-01 11:23:41 -05:00
Scott Frederick 26b59ae912 Use Paketo tiny builder by default for JVM and native apps
Closes gh-40859
2024-06-28 11:45:54 -05:00
Andy Wilkinson 99904d0307 Merge branch '3.3.x'
Closes gh-41274
2024-06-28 16:01:46 +01:00
Andy Wilkinson 55ac058385 Merge branch '3.2.x' into 3.3.x
Closes gh-41273
2024-06-28 15:47:54 +01:00
Andy Wilkinson d71fdd9712 Make buildSrc's custom Gradle tasks consistently abstract
Closes gh-41272
2024-06-28 15:40:56 +01:00
Moritz Halbritter a2378e1439 Merge branch '3.3.x'
Closes gh-41271
2024-06-28 13:52:12 +02:00
Moritz Halbritter 9984dc16a9 Merge branch '3.2.x' into 3.3.x
Closes gh-41270
2024-06-28 13:50:33 +02:00
Sébastien Deleuze a6f1bb9590 Update Kotlin DSL examples of bootBuildImage to be additive
See gh-41173
2024-06-28 13:47:42 +02:00
Andy Wilkinson 1521258695 Merge branch '3.3.x'
Closes gh-41269
2024-06-28 12:13:38 +01:00
Andy Wilkinson ac8a3b6332 Merge branch '3.2.x' into 3.3.x
Closes gh-41268
2024-06-28 12:12:15 +01:00
Andy Wilkinson a195394be6 Merge branch '3.3.x' 2024-06-28 11:41:37 +01:00
Andy Wilkinson 7f2e8f85ae Merge branch '3.2.x' into 3.3.x 2024-06-28 11:40:48 +01:00
Andy Wilkinson 365fdfee45 Reduce scope of mavenOptional feature to only the Maven Plugin
Previously, the mavenOptional was added to every published module but it
was only used by spring-boot-maven-plugin. This commit reduces its scope
so that it only affects the Maven plugin. It also reworks the
implementation to reuse the existing optional configuration rather than
declaring a new mavenOptional configuration. Lastly, publication of
Gradle Module Metadata (GMM) has been disabled for
spring-boot-maven-plugin. This is seen as preferable to publishing the
metadata – which isn't really needed as it does not contain any useful
additional information – and having to suppress warnings about
incomplete mapping of GMM to pom metadata.

Closes gh-41263
2024-06-28 11:39:46 +01:00
Andy Wilkinson 2ed72c6e4d Correct syntax for plexus-utils exclusion
See 07442f8366
See gh-41248
2024-06-28 11:39:46 +01:00
Andy Wilkinson 6749ad674f Polish "Add support for org.testcontainers.kafka.KafkaContainer"
See gh-40695
2024-06-27 15:10:58 +01:00
Eddú Meléndez 769f3e9d14 Add support for org.testcontainers.kafka.KafkaContainer
Testcontainers 1.19.8 provides `org.testcontainers.kafka.KafkaContainer`,
which relies on `apache/kafka` image.

See gh-40695
2024-06-27 14:58:57 +01:00
Andy Wilkinson 13ab5618a6 Merge branch '3.3.x' 2024-06-27 13:08:38 +01:00
Andy Wilkinson 0df946ccad Fix botched merge of spring-boot-maven-plugin's build.gradle 2024-06-27 13:06:44 +01:00
Andy Wilkinson 97612d5445 Merge branch '3.2.x' 2024-06-27 12:59:19 +01:00
Andy Wilkinson d01c44a66a Merge branch '3.2.x' into 3.3.x 2024-06-27 12:58:46 +01:00
Andy Wilkinson d2f74426f7 Work around bug in Gradle's Eclipse model
The model incorrectly marks the Gradle API and all of its
dependencies as test dependencies, making them unavailable in Eclipse
to code in src/main/java. We work around this by modifying the
classpath container to remove the test attribute from the
dependencies that should be available to main code.

See gh-41228
2024-06-27 12:58:36 +01:00
Andy Wilkinson 5b7365b63b Merge branch '3.3.x'
Closes gh-41258
2024-06-27 10:25:32 +01:00
Andy Wilkinson b0d4f1d356 Merge branch '3.2.x' into 3.3.x
Closes gh-41257
2024-06-27 10:16:36 +01:00
Andy Wilkinson 4515c882c7 Merge branch 'gh-41228' into 3.2.x
Closes gh-41228
2024-06-27 09:55:59 +01:00
Phillip Webb 00ed053ceb Merge branch '3.3.x'
Closes gh-41253
2024-06-26 16:27:56 -07:00
Phillip Webb 1a699aee24 Merge branch '3.2.x' into 3.3.x
Closes gh-41252
2024-06-26 16:27:41 -07:00
Phillip Webb 962936370a Don't report already migrated properties
Update `PropertiesMigrationReporter` so that already migrated properties
are not reported. Prior to this commit, if a deprecated property was
replaced by a property that could bind with the name relaxed name it
would be reported. For example: `test.someproperty` being replaced with
`test.some-property`.

In order to check the actual underlying property name, the
`PropertySourceOrigin` class has been updated so that it is always
returned, even if another `Origin` is available.

Fixes gh-35774
2024-06-26 16:24:32 -07:00
Scott Frederick 9da2d1e089 Revert "Use Paketo tiny builder by default for JVM and native apps"
This reverts commit 6d2ebc0713.
2024-06-26 15:25:37 -05:00
Scott Frederick 8623c92a29 Change spring-boot-buildpack-platform api deps to implementation
Closes gh-40935
2024-06-26 14:12:43 -05:00
Scott Frederick 267956cf5c Replace JNI domain sockets implementation with one that uses JDK support
Closes gh-41050
2024-06-26 14:09:19 -05:00
Andy Wilkinson 654016af7f Move Docker-related test support into a separate module
See gh-41228
2024-06-26 19:47:35 +01:00
Andy Wilkinson 89a06608d2 Update spring-boot-maven-plugin to use docker-test plugin
See gh-41228
2024-06-26 19:46:29 +01:00
Andy Wilkinson 7d5a761d51 Update spring-boot-gradle-plugin to use docker-test plugin
See gh-41228
2024-06-26 19:46:25 +01:00
Andy Wilkinson d5ef5e9c9d Update spring-boot-buildpack-platform to use docker-test plugin
See gh-41228
2024-06-26 19:46:08 +01:00
Scott Frederick 6d2ebc0713 Use Paketo tiny builder by default for JVM and native apps
Closes gh-40859
2024-06-26 13:42:23 -05:00
Andy Wilkinson 61ac0e32a1 Merge branch '3.3.x'
Closes gh-41250
2024-06-26 17:01:14 +01:00
Andy Wilkinson 2dd6c1c3a0 Merge branch '3.2.x' into 3.3.x
Closes gh-41249
2024-06-26 17:00:58 +01:00