root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity
55,303 Commits 28 Branches 365 Tags 289 MiB
Commit Graph

183 Commits

Author SHA1 Message Date
Andy Wilkinson a560a08e32 Merge branch '3.4.x' into 3.5.x 
Closes gh-46480
 2025-07-22 11:25:22 +01:00
Andy Wilkinson 3e6e64ec49 Use build instead of temp dir for Gradle TestKit directories 
Closes gh-46479
 2025-07-22 11:24:40 +01:00
Phillip Webb 61c2d0766b Merge branch '3.4.x' into 3.5.x 
See gh-46066
 2025-06-20 17:21:58 -07:00
Phillip Webb 3aeb18d618 Add license header to gradle files 
See gh-46065
 2025-06-20 17:20:50 -07:00
Phillip Webb a37c84b7c5 Merge branch '3.4.x' into 3.5.x 
See gh-46066
 2025-06-20 17:14:59 -07:00
Phillip Webb d66b28fcba Update end copyright year to 'present' 
See gh-46065
 2025-06-20 17:12:38 -07:00
Andy Wilkinson 5141620615 Merge branch '3.4.x' 
Closes gh-45913
 2025-06-12 10:07:30 +01:00
Andy Wilkinson ec3eeb7185 Merge branch '3.3.x' into 3.4.x 
Closes gh-45912
 2025-06-12 10:06:22 +01:00
Andy Wilkinson ca21600fae Use Framework's StreamUtils instead of Commons Compress's IOUtils 
Closes gh-45911
 2025-06-12 10:00:30 +01:00
Moritz Halbritter 0fb369e8b8 Use paketobuildpacks/builder-noble-java-tiny as the default image builder 
Closes gh-42711
 2025-04-24 15:21:22 +02:00
Phillip Webb 4bbbc0d687 Merge branch '3.4.x'
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Trigger Docs Build (push) Blocked by required conditions Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[early-access:true toolchain:true version:24], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[early-access:true toolchain:true version:24], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:22], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:22], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:23], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:23], map[id:windows-latest name:Windows]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:false version:17]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Waiting to run Details 
Closes gh-45193
 2025-04-14 16:18:50 -07:00
Phillip Webb b80bdbb182 Merge branch '3.3.x' into 3.4.x
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Trigger Docs Build (push) Blocked by required conditions Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[early-access:true toolchain:true version:24], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[early-access:true toolchain:true version:24], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:22], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:22], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:23], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:23], map[id:windows-latest name:Windows]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:false version:17]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Waiting to run Details 
Closes gh-45192
 2025-04-14 16:18:41 -07:00
Johnny Lim 08c67cc353 Replace deprecated Project.task() 
See gh-45009

Signed-off-by: Johnny Lim <izeye@naver.com>
 2025-04-14 16:17:53 -07:00
Moritz Halbritter ae16856bda Revert "Use noble buildpacks instead of jammy" 
This reverts commit 4f672b9588.

See gh-42711
 2025-02-19 16:00:27 +01:00
Moritz Halbritter 1007061537 Revert to jammy base when running system tests 
These tests need a shell, which is not available in the noble tiny
image. There are no non-tiny images for noble available yet.

See gh-42711
 2025-02-19 14:53:16 +01:00
Moritz Halbritter 4f672b9588 Use noble buildpacks instead of jammy 
Closes gh-42711
 2025-02-19 13:59:21 +01:00
Andy Wilkinson 0be4062116 Merge branch '3.4.x' 
Closes gh-44213
 2025-02-11 11:35:12 +00:00
Andy Wilkinson 30d7af4e38 Add CI with Java 24 
Closes gh-44205
 2025-02-11 11:34:43 +00:00
Phillip Webb f08188d5cf Change relevant Assert calls to throw IllegalStateException 
Change certain Assert class from `assert...` to `assertState`
so that a more appropriate `IllegalStateException` is thrown.

Fixes gh-43779
 2025-01-11 21:16:36 -08:00
Andy Wilkinson 425876e95e Merge branch '3.3.x' 2025-01-02 15:36:39 +00:00
Andy Wilkinson b4d8a9f64d Address system tests' deprecation warnings with Gradle 8.12 
See gh-43496
 2025-01-02 15:35:41 +00:00
Phillip Webb 2fe1a93f58 Merge branch '3.3.x' 
Closes gh-43506
 2024-12-13 13:56:36 -08:00
Phillip Webb fbf981ca0a Run PaketoBuilderTests on all JDK versions 
Closes gh-43505
 2024-12-13 13:56:12 -08:00
Phillip Webb d83d34d111 Merge branch '3.3.x' 2024-11-15 14:26:28 -08:00
Phillip Webb fe7f247018 Merge branch '3.2.x' into 3.3.x 2024-11-15 14:26:22 -08:00
Phillip Webb 7d1cc78d6b Retry on failed plainWar test 
Add retry logic for plainWar in an attempt to deal with flaky Tomcat
downloads.
 2024-11-15 14:24:32 -08:00
Moritz Halbritter dbe50732e3 Merge branch '3.2.x' into 3.3.x 
Closes gh-43161
 2024-11-14 15:08:33 +01:00
Moritz Halbritter 4fc2aa1abf Remove workaround in GraalVM native Paketo Builder Test 
Closes gh-40641
 2024-11-14 15:08:07 +01: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
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
Phillip Webb 8282a90268 Merge branch '3.3.x' 2024-09-27 10:34:32 -07:00
Phillip Webb 055064f16b Merge branch '3.2.x' into 3.3.x 2024-09-27 10:33:30 -07:00
Phillip Webb 9836011ffd Create extension to configure Spring maven repositories 
Create a small Groovy script that can be used in `settings.gradle`
files to extend `repositories` to support the various maven
repositories required for our build.

See gh-42333
 2024-09-27 10:30:20 -07: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
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
Scott Frederick ea544822f6 Merge branch '3.3.x' 2024-07-11 18:39:45 -05:00
Scott Frederick d79ae11925 Fix formatting problem 
See gh-41350
 2024-07-11 18:39:33 -05:00
Scott Frederick 73294ba86c Merge branch '3.3.x' 
Closes gh-41453
 2024-07-11 17:47:40 -05:00
Scott Frederick 24dbee40ff Add CDS test case to Paketo system tests 
Closes gh-41350
 2024-07-11 17:47:05 -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
Scott Frederick 0fafb8d661 Merge branch '3.3.x' 
Closes gh-41284
 2024-07-01 13:41:24 -05:00