Commit Graph

272 Commits

Author SHA1 Message Date
Andy Wilkinson 6384e3265c Create beginnings of spring-boot-tomcat module
See gh-46073
2025-07-01 11:53:17 +01:00
Andy Wilkinson 71f74c7ee2 Start splitting up spring-boot
See gh-46071
2025-07-01 11:53:13 +01:00
Phillip Webb 3aeb18d618 Add license header to gradle files
See gh-46065
2025-06-20 17:20:50 -07:00
Stéphane Nicoll 08b2c560dd Order dependencies
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[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:true 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:true version:21], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true 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:true 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-44757
2025-03-18 15:22:26 +01:00
Phillip Webb 2f9fbc6b70 Merge branch '3.2.x' into 3.3.x
Closes gh-42493
2024-10-01 12:20:32 -07:00
Andy Wilkinson 4b54e48789 Upgrade to Develocity Conventions 0.0.22
Closes gh-42492
2024-10-01 12:20:03 -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
Andy Wilkinson 462a6776e2 Merge branch '3.2.x' into 3.3.x
Closes gh-42211
2024-09-11 10:34:42 +01:00
Andy Wilkinson 2d89cf539c Upgrade to Develocity Conventions 0.0.21
Closes gh-42210
2024-09-11 10:34:14 +01:00
Andy Wilkinson 8634c5fb9f Merge branch '3.2.x' into 3.3.x 2024-07-08 14:54:46 +01:00
Andy Wilkinson 35ce4ca18d Remove remnants of Concourse build 2024-07-08 14:54:31 +01:00
Andy Wilkinson cd4d9c124c Merge branch '3.2.x' into 3.3.x
Closes gh-41345
2024-07-08 11:42:57 +01:00
Andy Wilkinson 305ab51927 Upgrade to latest Develocity plugins
Closes gh-41344
2024-07-08 11:42:34 +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 654016af7f Move Docker-related test support into a separate module
See gh-41228
2024-06-26 19:47:35 +01:00
Moritz Halbritter f6b431eb4f Merge branch '3.2.x' 2024-05-02 14:07:55 +02:00
Moritz Halbritter 516d3b1294 Test ANSI disabled in logging tests instead of integration tests
See gh-40172
2024-05-02 13:59:48 +02:00
Moritz Halbritter 16291b0fcf Merge branch '3.2.x'
Closes gh-40609
2024-05-02 11:30:09 +02:00
facewise 1f9b62b122 Fix broken AnsiOutput.detectIfAnsiCapable on JDK22
See gh-40172
2024-05-02 11:03:06 +02:00
Andy Wilkinson 592571c16e Merge branch '3.2.x'
Closes gh-40528
2024-04-26 09:34:00 +01:00
Andy Wilkinson 087e467387 Merge branch '3.1.x' into 3.2.x
Closes gh-40527
2024-04-26 09:33:12 +01:00
Andy Wilkinson 83f692237d Migrate to com.gradle.develocity plugin
Closes gh-40153
2024-04-26 09:30:48 +01:00
Scott Frederick ad79c373f8 Add SNI support to web server SSL auto-configuration
Properties under `server.ssl.server-name-bundles` and
`management.server.ssl.server-name-bundles` can be used to configure
mappings of host names to SSL bundles to support SNI in embedded web
servers.

Closes gh-26022
2024-03-28 14:12:20 -05:00
Andy Wilkinson d726e523f5 Merge branch '3.2.x'
Closes gh-40130
2024-03-28 11:25:09 +00:00
Andy Wilkinson 9d9ea5cf66 Merge branch '3.1.x' into 3.2.x
Closes gh-40129
2024-03-28 11:24:56 +00:00
Andy Wilkinson 6825bdaf79 Upgrade to Gradle Enterprise Conventions 0.0.16
Closes gh-40122
2024-03-28 11:23:01 +00:00
Andy Wilkinson 6153e23342 Merge branch '3.2.x' 2024-03-27 19:30:50 +00:00
Andy Wilkinson 50a53dced0 Merge branch '3.1.x' into 3.2.x 2024-03-27 19:30:38 +00:00
Andy Wilkinson 61fc4e88af Upgrade to 0.0.16-SNAPSHOT of Gradle Enterprise Conventions
See gh-40122
2024-03-27 19:24:10 +00:00
Moritz Halbritter 793aca60d2 Implement extract and list-layers command
Adds a new jarmode called 'tools'. This provides two commands,
'extract' and 'list-layers'. list-layers is the same as list from
the layertools.

extract is able to extract the JAR in four different modes:

- CDS compatible extraction with libraries in a lib folder and a runner
.jar
- CDS compatible as above, but with layers
- Launcher based
- Launcher based with layers. This is essentially the same as extract
  from the layertools

The commands in layertools have been deprecated in favor of the commands
in 'tools'.

This also changes the behavior of layers.enabled from the Gradle and
Maven plugin: before this commit, layers.enabled prevents the inclusion
of the layer index file as well as the layertools JAR.
After this commit, layers.enabled only prevents the inclusion of the
layer index file.

layer.includeLayerTools have been deprecated in favor of includeTools,
and the layertools JAR has been renamed to tools.

Closes gh-38276
2024-03-07 13:34:13 +01:00
Andy Wilkinson 75fa963f72 Merge branch '3.1.x' into 3.2.x
Closes gh-39142
2024-01-16 12:23:43 +00:00
Andy Wilkinson 38f078fc9d Upgrade Gradle Enterprise Plugins
Closes gh-39141
2024-01-16 12:23:08 +00:00
Phillip Webb a89057b7c7 Reintroduce spring-boot-loader modules
Restore the `spring-boot-loader` with the previous loader code so
that we can develop it further.

See gh-37669
2023-10-03 15:40:25 -07:00
Phillip Webb aeb6537f57 Rename spring-boot-loader to spring-boot-loader-classic
Rename the `spring-boot-loader` module to `spring-boot-loader-classic`
so that we can introduce an alternative loader implementation.

See gh-37669
2023-10-03 15:40:04 -07:00
Andy Wilkinson 32b7b312f0 Add config metadata changelog generator to main build
Closes gh-21486
2023-06-30 10:26:33 +01:00
Mortitz Halbritter 842e17eced Add Docker Compose support
Add `spring-boot-docker-compose` module with service connection
support.

Closes gh-34747

Co-authored-by: Phillip Webb <pwebb@vmware.com>
Co-authored-by: "Andy Wilkinson <wilkinsona@vmware.com>
2023-04-17 01:00:08 -07:00
Phillip Webb 11dac5b5b7 Create dedicated spring-boot-testcontainers module
Create a dedicated testcontainers module containing the service
connectors code.

Closes gh-34757
2023-04-17 00:42:31 -07:00
Andy Wilkinson 042c8e94a9 Merge branch '2.7.x' into 3.0.x
Closes gh-34750
2023-03-24 15:34:08 +00:00
Andy Wilkinson 0d82729a29 Upgrade to Gradle Enterprise Gradle plugin 3.12.5
Closes gh-34748
2023-03-24 15:34:01 +00:00
Andy Wilkinson 77932d92ea Merge branch '2.7.x' into 3.0.x
Closes gh-34464
2023-03-03 10:50:37 +00:00
Andy Wilkinson ac27c3cf7d Upgrade to Gradle Enterprise Gradle plugin 3.12.4
Closes gh-34459
2023-03-03 10:49:51 +00:00
Andy Wilkinson 24260cbd63 Merge branch '2.7.x' into 3.0.x
Closes gh-34187
2023-02-14 20:05:29 +00:00
Andy Wilkinson c11ff0dbb4 Upgrade to Gradle Enterprise Gradle Plugin 3.12.2
Closes gh-34186
2023-02-14 20:04:40 +00:00
Andy Wilkinson 8fa318453f Merge branch '2.7.x'
Closes gh-33714
2023-01-06 14:59:28 +00:00
Andy Wilkinson 44c201eeff Upgrade to Gradle Enterprise Conventions 0.0.13
Closes gh-33713
2023-01-06 14:55:40 +00:00
Andy Wilkinson 3bcc7ece55 Merge branch '2.7.x'
Closes gh-33676
2023-01-03 16:09:51 +00:00
Andy Wilkinson 84c021bc97 Upgrade to Gradle Enterprise Gradle Plugin 3.12.1
Closes gh-33672
2023-01-03 15:57:48 +00:00
Andy Wilkinson ce91415a27 Merge branch '2.7.x'
Closes gh-33675
2023-01-03 15:54:41 +00:00
Andy Wilkinson 68531bfba9 Upgrade to Gradle Enterprise Conventions 0.0.12
Closes gh-33674
2023-01-03 15:54:03 +00:00
Andy Wilkinson f8a2e68a5d Merge branch '2.7.x' 2022-11-08 13:53:44 +00:00
Andy Wilkinson 5dab9b0e9f Revert "Temporarily work around problems with Gradle's plugin portal"
This reverts commit fb954e8109.
2022-11-08 13:53:21 +00:00
Andy Wilkinson 7cbd90d87d Merge branch '2.7.x' 2022-11-08 10:18:48 +00:00
Andy Wilkinson fb954e8109 Temporarily work around problems with Gradle's plugin portal 2022-11-08 10:18:13 +00:00
Andy Wilkinson c380a64b8c Merge branch '2.7.x'
Closes gh-32689
2022-10-12 17:09:49 +01:00
Andy Wilkinson ee60ed6e78 Upgrade to Gradle Enterprise Gradle Plugin 3.11.2
Closes gh-32687
2022-10-12 17:08:40 +01:00
Andy Wilkinson f67db3d9ad Move spring-boot-cli into spring-boot-tools
Closes gh-32492
2022-09-23 16:44:57 +01:00
Andy Wilkinson 4a05230d5d Move spring-boot-properties-migrator into spring-boot-tools
Closes gh-32491
2022-09-23 16:18:30 +01:00
Stephane Nicoll 0916736629 Merge branch '2.7.x'
Closes gh-32418
2022-09-19 07:55:54 +02:00
Jerome Prinet 173b70c377 Upgrade to Gradle Enterprise plugin 3.11.1
See gh-32405
2022-09-19 07:51:55 +02:00
Andy Wilkinson 5d29057309 Enable stable configuration cache feature flag
Closes gh-32061
2022-08-10 12:35:22 +01:00
Andy Wilkinson 50aa92e60c Upgrade to Gradle Enterprise Conventions 0.0.11
Closes gh-31697
2022-07-14 16:16:33 +01:00
Andy Wilkinson b11776f07b Upgrade to Gradle Enterprise plugin 3.10.3
Closes gh-31684
2022-07-12 10:30:58 +01:00
Jerome Prinet c531bd33e2 Upgrade to Gradle Enterprise plugin 3.10.2
See gh-31462
2022-06-20 15:58:24 +01:00
Andy Wilkinson 2a01473ba9 Upgrade to Gradle Enterprise Conventions 0.0.10
Closes gh-31470
2022-06-20 15:56:31 +01:00
Stephane Nicoll a048e4ccb7 Merge branch '2.5.x' into 2.6.x
Closes gh-30736
2022-04-19 08:47:42 +02:00
Jerome Prinet 209e6fbe55 Upgrade to Gradle Enterprise plugin 3.9
See gh-30659
2022-04-19 08:46:39 +02:00
Andy Wilkinson d28942ea53 Merge branch '2.5.x' into 2.6.x
Closes gh-29449
2022-01-18 12:00:20 +00:00
Jerome Prinet 744d977480 Upgrade to Gradle Enterprise Plugin 3.8.1
See gh-29444
2022-01-18 11:59:36 +00:00
Andy Wilkinson e5a110215c Merge branch '2.5.x' into 2.6.x
Closes gh-29330
2022-01-12 10:28:47 +00:00
Andy Wilkinson 5744724af2 Merge branch '2.5.x' into 2.6.x
Closes gh-29329
2022-01-12 10:28:27 +00:00
Andy Wilkinson ba3842b7a6 Upgrade to Gradle Enterprise plugin 3.8
Closes gh-29254
2022-01-12 09:58:57 +00:00
Andy Wilkinson 63e2ccd489 Upgrade to Gradle Enterprise Conventions 0.0.9
Closes gh-29325
2022-01-12 09:58:57 +00:00
Andy Wilkinson b6135ce919 Merge branch '2.5.x' into 2.6.x
Closes gh-28880
2021-12-01 14:39:26 +00:00
Andy Wilkinson b2a1994f7d Make clean remove the root build folder
Closes gh-28857
2021-12-01 14:38:25 +00:00
Andy Wilkinson 70e42e09c6 Merge branch '2.5.x'
Closes gh-28750
2021-11-19 13:43:32 +00:00
Jerome Prinet 80e6bb2939 Upgrade Gradle Enterprise plugin to 3.7.2
See gh-28747
2021-11-19 13:42:47 +00:00
Scott Frederick 32bb6f6989 Move deployment tests to system tests pipeline
Closes gh-27499
2021-07-26 15:29:56 -05:00
Andy Wilkinson f34a2658b0 Merge branch '2.5.x'
Closes gh-27427
2021-07-21 11:02:44 +01:00
Andy Wilkinson dcced2561a Upgrade to Gradle Enterprise Conventions 0.0.8
Closes gh-26115
2021-07-21 11:02:15 +01:00
Scott Frederick a0b32251eb Split gradle test support into a separate module
See gh-25824
2021-07-16 12:52:39 -05:00
Scott Frederick 18c7c0af22 Add Paketo image building system tests
A new system test plugin is being made available for running test
suites that should be run less frequently than with every commit, such
as tests that verify Spring Boot compatibility with external
projects. CI pipeline configuration for running system tests is also
provided.

The first system tests verify the behavior of the Spring Boot image
building plugins when building images using Paketo buildpacks.

Closes gh-25824
2021-07-08 17:02:43 -05:00
Andy Wilkinson 90a7450737 Merge branch '2.3.x' into 2.4.x
Closes gh-25984
2021-04-09 14:43:00 +01:00
Nelson Osacky 087744e027 Upgrade to Gradle Enterprise Gradle Plugin 3.6.1
See gh-25951
2021-04-09 14:42:23 +01:00
Andy Wilkinson c7c3365da0 Polish 2021-03-06 13:15:11 +00:00
Andy Wilkinson 3f50b02049 Tag build scans with JDK-${toolchainVersion}
Closes gh-25525
2021-03-06 10:29:38 +00:00
dreis2211 1ccd8dae8a Allow the project to be built with Java 16
See gh-25171
2021-03-04 18:54:56 +00:00
Stephane Nicoll 890c95adba Merge branch '2.3.x' into 2.4.x
Closes gh-25144
2021-02-09 15:25:07 +01:00
dreis2211 4bb86d4d8d Upgrade to Gradle Enterprise Gradle Plugin 3.5.2
See gh-25120
2021-02-09 15:24:08 +01:00
Andy Wilkinson afa9ccba71 Merge branch '2.3.x' into 2.4.x
Closes gh-24787
2021-01-12 14:31:29 +00:00
Nelson Osacky 74ffc3e0fa Upgrade to Gradle Enterprise Gradle Plugin 3.5.1
See gh-24767
2021-01-12 14:30:47 +00:00
Phillip Webb 0730949325 Merge branch '2.3.x' into 2.4.x
Closes gh-24554
2020-12-17 20:47:13 -08:00
Phillip Webb c4e41305d5 Prevent Tomcat URL "reflective access" warnings
Update the jar `Handler` class to support a non-reflective fallback
mechanism when possible. The updated code attempts to capture a regular
jar URL before our handler is installed. It can then use that URL as
context when creating the a fallback URL. The JDK jar `Handler` will
be copied from the context URL to the fallback URL.

Without this commit, resolving new Tomcat URLs of the form
`jar:war:file:...` would result in an ugly "Illegal reflective access"
warning.

Fixes gh-18631
2020-12-17 20:43:41 -08:00
Andy Wilkinson 525cc4abf6 Merge branch '2.3.x'
See gh-24179
2020-11-17 14:39:23 +00:00
Andy Wilkinson 14b15027af Correct the ID of the GE conventions plugin
See gh-24178
2020-11-17 14:38:54 +00:00
Andy Wilkinson 9fdbf51024 Merge branch '2.3.x'
Closes gh-24180
2020-11-17 14:32:04 +00:00
Andy Wilkinson 23852aa06f Upgrade to Gradle Enterprise Gradle Plugin 3.5
Closes gh-24177
2020-11-17 14:31:43 +00:00
Andy Wilkinson 2cc6661054 Merge branch '2.3.x'
Closes gh-24179
2020-11-17 14:29:10 +00:00
Andy Wilkinson 666e9e1aa6 Merge branch '2.2.x' into 2.3.x
Closes gh-24178
2020-11-17 14:28:46 +00:00
Andy Wilkinson 2990b69693 Polish "Fix detection of snapshot version when configuring repositories"
See gh-21912
2020-06-15 09:19:09 +01:00
Eddú Meléndez 20f05f4d82 Fix detection of snapshot version when configuring repositories
As part of 8e8548756e, snapshot dependency resolution change from
`BUILD-SNAPSHOT` to `-SNAPSHOT`. Currently, if we add a version
dependency which is store in snapshots it is not resolved. This
commit allow to resolves plugins and dependencies.

See gh-21912
2020-06-15 09:17:44 +01:00
dreis2211 0f6767f274 Polish Slack notification when no build scan was published
See gh-21673
2020-06-03 18:46:58 +01:00
Andy Wilkinson 9bfb088931 Upgrade to Gradle Enterprise Plugin 3.3.3
Closes gh-21675
2020-06-03 17:47:35 +01:00
Andy Wilkinson 23b329be07 Upgrade to Gradle Enterprise Conventions Plugin 0.0.3
Closes gh-21674
2020-06-03 17:27:14 +01:00
Scott Frederick 9aae072872 Add build scan URI to Slack notifications from CI
Fixes gh-19703
2020-04-09 16:02:12 -05:00
Andy Wilkinson d8f218d863 Upgrade to Gradle Enterprise Plugin 3.2
Closes gh-20677
2020-03-25 20:41:54 +00:00
Andy Wilkinson 8f44bd89f4 Polish "Allow Gradle tasks to be executed with a custom Java home"
See gh-20179
2020-02-25 15:53:45 +00:00
Andy Wilkinson 6abd4f0737 Upgrade to Gradle Enterprise Conventions Plugin 0.0.2
Closes gh-20034
2020-02-05 16:25:28 +00:00
Andy Wilkinson ea5dfdec92 Switch to latest snapshots of the GE conventions plugin
See gh-20034
2020-02-04 20:03:22 +00:00
Andy Wilkinson 35991d5eab Adopt Gradle Enterprise Conventions Plugin
Closes gh-20033
2020-02-04 11:24:40 +00:00
Andy Wilkinson 820c671ddd Configure repositories based on the version that is being built
https://repo.spring.io/snapshot should only be available when
building a BUILD-SNAPSHOT. https://repo.spring.io/milestone should
only be available when not building a RELEASE (a BUILD-SNAPSHOT, Mn,
or RCn).

Closes gh-19700
2020-01-23 11:55:42 +00:00
Phillip Webb 71ce212f7f Rename spring-boot-layertools
Rename `spring-boot-layertools` to `spring-boot-jarmode-layertools`.

Closes gh-19853
2020-01-22 20:24:23 -08:00
Phillip Webb 0209cd3e4c Polish quote form used in Gradle scripts
Replace Gradle single quote strings with the double quote form
whenever possible. The change helps to being consistency to the
dependencies section where mostly single quotes were used, but
occasionally double quotes were required due to `${}` references.
2020-01-22 15:49:52 -08:00
Phillip Webb e28338d6cd Rename spring-boot-cloudnativebuildpack
Rename the `spring-boot-cloudnativebuildpack` module to
`spring-boot-buildpack-platform` and update the the package
name to `org.springframework.boot.buildpack.platform`.

Closes gh-19851
2020-01-22 11:01:32 -08:00
Phillip Webb e513fe4666 Add layertools jarmode
Add a new `spring-boot-layertools` module which provides jarmode support
for working with layers. The module works with both classic fat jars,
as well as layered jars.

Closes gh-19849
2020-01-22 01:26:55 -08:00
Phillip Webb bfd2ca7fd9 Polish Gradle expression references
Expand all expression `$` references to the full `${...}` form.
2020-01-21 18:33:33 -08:00
Phillip Webb aa1954717c Add cloud native buildpack module
Add a Java implementation of the buildpacks.io specification allowing
projects to be packaged into OCI containers. The `builder` class
provides a Java equivalent of `pack build` command and is based on
the `pack` CLI Go code published at https://github.com/buildpacks/pack.

Closes gh-19828
2020-01-20 23:48:47 -08:00
Andy Wilkinson f06af5a79b Only attempt to publish a build scan when we can authenticate 2020-01-16 10:06:16 +00:00
Andy Wilkinson ce7f501cf9 Revert "Publish a build scan only when authenticated"
publishIfAuthenticated() does not appear to work as intended as it
disables publishing even when authenticated.
2020-01-15 20:31:52 +00:00
Andy Wilkinson 8d6ead223f Publish a build scan only when authenticated 2020-01-15 20:14:41 +00:00
Vedran Pavic 57b7dfc730 Simplify Gradle's build settings
See gh-19619
2020-01-10 20:47:33 +00:00
Andy Wilkinson ce99db1902 Port the build to Gradle
Closes gh-19609
Closes gh-19608
2020-01-10 14:15:35 +00:00