Commit Graph

3409 Commits

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