Skip to content

Commit 9f9fbe0

Browse files
authored
Merge branch 'spring-projects:main' into main
2 parents b5272a9 + 7347d7e commit 9f9fbe0

File tree

155 files changed

+1801
-1500
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

155 files changed

+1801
-1500
lines changed

.github/workflows/build-and-deploy-snapshot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
- name: Run Deploy Docs Workflow
6161
env:
6262
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
63-
run: gh workflow run deploy-docs.yml --repo ${{ github.repository }} -r docs-build -f build-refname=${{ github.ref_name }} -f build-version=${{ needs.build-and-deploy-snapshot.outputs.version }}
63+
run: gh workflow run deploy-docs.yml --repo ${{ github.repository }} -r docs-build -f build-sha=${{ github.sha }} -f build-refname=${{ github.ref_name }} -f build-version=${{ needs.build-and-deploy-snapshot.outputs.version }}
6464
verify:
6565
name: Verify
6666
needs: build-and-deploy-snapshot

.github/workflows/trigger-docs-build.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,16 @@ on:
55
paths: [ 'antora/*' ]
66
workflow_dispatch:
77
inputs:
8+
build-version:
9+
description: 'Version being build (e.g. 1.0.3-SNAPSHOT)'
10+
required: false
11+
build-sha:
12+
description: Enter the SHA to build (e.g. 82c97891569821a7f91a77ca074232e0b54ca7a5)
13+
required: false
814
build-refname:
915
description: 'Git refname to build (e.g., 1.0.x)'
1016
required: false
11-
build-version:
12-
description: 'Version being build (e.g. 1.0.3-SNAPSHOT)'
13-
required: false
17+
1418
permissions:
1519
contents: read
1620
jobs:
@@ -28,4 +32,4 @@ jobs:
2832
- name: Trigger Workflow
2933
env:
3034
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
31-
run: gh workflow run deploy-docs.yml -r docs-build -f build-refname=${{ github.event.inputs.build-refname }} -f build-version=${{ github.event.inputs.build-version }}
35+
run: gh workflow run deploy-docs.yml -r docs-build -f build-refname=${{ github.event.inputs.build-refname }} -f build-sha=${{ github.event.inputs.build-sha }} -f build-version=${{ github.event.inputs.build-version }}

.github/workflows/verify.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
- name: Check Out Release Verification Tests
4141
uses: actions/checkout@v6
4242
with:
43-
ref: 'v0.0.14'
43+
ref: 'v0.0.15'
4444
repository: spring-projects/spring-boot-release-verification
4545
token: ${{ secrets.token }}
4646
- name: Check Out Send Notification Action

README.adoc

Lines changed: 4 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -85,15 +85,16 @@ We like to know the Spring Boot version, operating system, and JVM version you'r
8585

8686
== Building from Source
8787

88-
You don't need to build from source to use Spring Boot (binaries in https://repo.spring.io[repo.spring.io]), but if you want to try out the latest and greatest, Spring Boot can be built and published to your local Maven cache using the https://docs.gradle.org/current/userguide/gradle_wrapper.html[Gradle wrapper].
89-
You also need JDK 24.
88+
You don't need to build from source to use Spring Boot.
89+
If you want to try out the latest and greatest, Spring Boot can be built and published to your local Maven cache using the https://docs.gradle.org/current/userguide/gradle_wrapper.html[Gradle wrapper].
90+
You also need JDK 25.
9091

9192
[source,shell]
9293
----
9394
$ ./gradlew publishToMavenLocal
9495
----
9596

96-
This will build all of the jars and documentation and publish them to your local Maven cache.
97+
This command builds all modules and publishes them to your local Maven cache.
9798
It won't run any of the tests.
9899
If you want to build everything, use the `build` task:
99100

@@ -104,87 +105,6 @@ $ ./gradlew build
104105

105106

106107

107-
== Modules
108-
109-
There are several modules in Spring Boot. Here is a quick overview:
110-
111-
112-
113-
=== spring-boot
114-
115-
The main library providing features that support the other parts of Spring Boot. These include:
116-
117-
* The `SpringApplication` class, providing static convenience methods that can be used to write a stand-alone Spring Application.
118-
Its sole job is to create and refresh an appropriate Spring `ApplicationContext`.
119-
* Embedded web applications with a choice of container (Tomcat, Jetty).
120-
* First-class externalized configuration support.
121-
* Convenience `ApplicationContext` initializers, including support for sensible logging defaults.
122-
123-
124-
125-
=== spring-boot-autoconfigure
126-
127-
Spring Boot can configure large parts of typical applications based on the content of their classpath.
128-
A single `@EnableAutoConfiguration` annotation triggers auto-configuration of the Spring context.
129-
130-
Auto-configuration attempts to deduce which beans a user might need. For example, if `HSQLDB` is on the classpath, and the user has not configured any database connections, then they probably want an in-memory database to be defined.
131-
Auto-configuration will always back away as the user starts to define their own beans.
132-
133-
134-
135-
=== spring-boot-starters
136-
137-
Starters are a set of convenient dependency descriptors that you can include in your application.
138-
You get a one-stop shop for all the Spring and related technology you need without having to hunt through sample code and copy-paste loads of dependency descriptors.
139-
For example, if you want to get started using Spring and JPA for database access, include the `spring-boot-starter-data-jpa` dependency in your project, and you are good to go.
140-
141-
142-
143-
=== spring-boot-actuator
144-
145-
Actuator endpoints let you monitor and interact with your application.
146-
Spring Boot Actuator provides the infrastructure required for actuator endpoints.
147-
It contains annotation support for actuator endpoints.
148-
This module provides many endpoints, including the `HealthEndpoint`, `EnvironmentEndpoint`, `BeansEndpoint`, and many more.
149-
150-
151-
152-
=== spring-boot-actuator-autoconfigure
153-
154-
This provides auto-configuration for actuator endpoints based on the content of the classpath and a set of properties.
155-
For instance, if Micrometer is on the classpath, it will auto-configure the `MetricsEndpoint`.
156-
It contains configuration to expose endpoints over HTTP or JMX.
157-
Just like Spring Boot AutoConfigure, this will back away as the user starts to define their own beans.
158-
159-
160-
161-
=== spring-boot-test
162-
163-
This module contains core items and annotations that can be helpful when testing your application.
164-
165-
166-
167-
=== spring-boot-test-autoconfigure
168-
169-
Like other Spring Boot auto-configuration modules, spring-boot-test-autoconfigure provides auto-configuration for tests based on the classpath.
170-
It includes many annotations that can automatically configure a slice of your application that needs to be tested.
171-
172-
173-
174-
=== spring-boot-loader
175-
176-
Spring Boot Loader provides the secret sauce that allows you to build a single jar file that can be launched using `java -jar`.
177-
Generally, you will not need to use `spring-boot-loader` directly but work with the link:spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin[Gradle] or link:spring-boot-project/spring-boot-tools/spring-boot-maven-plugin[Maven] plugin instead.
178-
179-
180-
181-
=== spring-boot-devtools
182-
183-
The spring-boot-devtools module provides additional development-time features, such as automatic restarts, for a smoother application development experience.
184-
Developer tools are automatically disabled when running a fully packaged application.
185-
186-
187-
188108
== Guides
189109

190110
The https://spring.io/[spring.io] site contains several guides that show how to use Spring Boot step-by-step:

SUPPORT.adoc

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,6 @@ https://stackoverflow.com/help/how-to-ask[advice on how to ask a good question].
2424

2525

2626

27-
== Gitter
27+
== VMware Tanzu Enterprise Support
2828

29-
If you want to discuss something or have a question that isn't suited to Stack Overflow,
30-
the Spring Boot community chat in the
31-
https://gitter.im/spring-projects/spring-boot[#spring-boot room on Gitter].
32-
33-
34-
35-
== VMware Open Source Software Support
36-
37-
If you are interested in more dedicated support, VMware provides
38-
https://spring.io/support[premium support] for Spring Boot.
29+
If you are interested in more dedicated support, VMware Tanzu provides https://enterprise.spring.io/[enterprise support] for Spring Boot.

0 commit comments

Comments
 (0)