spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-17 12:09:16 +00:00
Code Issues Projects Releases Wiki Activity

Start development of Spring Boot 4.2.x

Browse Source
This commit is contained in:
Stéphane Nicoll
2026-07-15 10:30:43 +02:00
parent 493315f8cf
commit 6d28fc10f9
15 changed files with 116 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/build-and-deploy-snapshot.yml
+1 -1
View File
@@ -30,7 +30,7 @@ jobs:
- name: Deploy
uses: spring-io/artifactory-deploy-action@926d7f7cc810569395346bf3a4d91b380b3e355b # v0.0.4
with:
build-name: ${{ vars.COMMERCIAL && format('spring-boot-commercial-{0}', '4.1.x') || format('spring-boot-{0}', '4.1.x') }}
build-name: ${{ vars.COMMERCIAL && format('spring-boot-commercial-{0}', '4.2.x') || format('spring-boot-{0}', '4.2.x') }}
folder: 'deployment-repository'
password: ${{ vars.COMMERCIAL && secrets.COMMERCIAL_ARTIFACTORY_PASSWORD || secrets.ARTIFACTORY_PASSWORD }}
project: ${{ vars.COMMERCIAL && 'spring' }}
.github/workflows/release-milestone.yml
+2 -2
View File
@@ -2,8 +2,8 @@ name: Release Milestone
on:
push:
tags:
- v4.1.0-M[0-9]
- v4.1.0-RC[0-9]
- v4.2.0-M[0-9]
- v4.2.0-RC[0-9]
permissions:
contents: read
concurrency:
.github/workflows/release.yml
+1 -1
View File
@@ -2,7 +2,7 @@ name: Release
on:
push:
tags:
- v4.1.[0-9]+
- v4.2.[0-9]+
permissions:
contents: read
concurrency:
build-plugin/spring-boot-maven-plugin/src/intTest/projects/jar-layered-custom-name/jar-layers-configuration/src/main/resources/META-INF/spring/layers/custom.xml
+1 -1
View File
@@ -1,7 +1,7 @@
<layers xmlns="http://www.springframework.org/schema/boot/layers"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/boot/layers
https://www.springframework.org/schema/boot/layers/layers-4.1.xsd">
https://www.springframework.org/schema/boot/layers/layers-4.2.xsd">
<application>
<into layer="configuration">
<include>**/application*.*</include>
build-plugin/spring-boot-maven-plugin/src/intTest/projects/jar-layered-custom/jar/src/layers.xml
+1 -1
View File
@@ -1,7 +1,7 @@
<layers xmlns="http://www.springframework.org/schema/boot/layers"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/boot/layers
https://www.springframework.org/schema/layers/layers-4.1.xsd">
https://www.springframework.org/schema/layers/layers-4.2.xsd">
<application>
<into layer="configuration">
<include>**/application*.*</include>
build-plugin/spring-boot-maven-plugin/src/intTest/projects/war-layered-custom/war/src/layers.xml
+1 -1
View File
@@ -1,7 +1,7 @@
<layers xmlns="http://www.springframework.org/schema/boot/layers"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/boot/layers
https://www.springframework.org/schema/layers/layers-4.1.xsd">
https://www.springframework.org/schema/layers/layers-4.2.xsd">
<application>
<into layer="configuration">
<include>**/application*.*</include>
build-plugin/spring-boot-maven-plugin/src/main/resources/META-INF/spring/layers/default.xml
+1 -1
View File
@@ -1,7 +1,7 @@
<layers xmlns="http://www.springframework.org/schema/boot/layers"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/boot/layers
https://www.springframework.org/schema/boot/layers/layers-4.1.xsd">
https://www.springframework.org/schema/boot/layers/layers-4.2.xsd">
<application>
<into layer="spring-boot-loader">
<include>org/springframework/boot/loader/**</include>
build-plugin/spring-boot-maven-plugin/src/main/xsd/layers-4.2.xsd
+100
View File
@@ -0,0 +1,100 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<xsd:schema elementFormDefault="qualified"
xmlns="http://www.springframework.org/schema/boot/layers"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
targetNamespace="http://www.springframework.org/schema/boot/layers">
<xsd:element name="layers" type="layersType" />
<xsd:complexType name="layersType">
<xsd:sequence>
<xsd:element name="application" type="applicationType" minOccurs="0"/>
<xsd:element name="dependencies" type="dependenciesType" minOccurs="0"/>
<xsd:element name="layerOrder" type="layerOrderType" minOccurs="0"/>
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="applicationType">
<xsd:annotation>
<xsd:documentation><![CDATA[
The 'into layer' selections that should be applied to application classes and resources.
]]></xsd:documentation>
</xsd:annotation>
<xsd:sequence maxOccurs="unbounded">
<xsd:element name="into" type="intoType" />
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="dependenciesType">
<xsd:annotation>
<xsd:documentation><![CDATA[
The 'into layer' selections that should be applied to dependencies.
]]></xsd:documentation>
</xsd:annotation>
<xsd:sequence maxOccurs="unbounded">
<xsd:element name="into" type="dependenciesIntoType" />
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="layerOrderType">
<xsd:annotation>
<xsd:documentation><![CDATA[
The order that layers should be added (starting with the least frequently changed layer).
]]></xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:element name="layer" maxOccurs="unbounded">
<xsd:annotation>
<xsd:documentation><![CDATA[
The layer name.
]]></xsd:documentation>
</xsd:annotation>
<xsd:simpleType>
<xsd:restriction base="xsd:string">
<xsd:minLength value="1" />
</xsd:restriction>
</xsd:simpleType>
</xsd:element>
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="intoType">
<xsd:choice maxOccurs="unbounded">
<xsd:element type="xsd:string" name="include"
minOccurs="0" maxOccurs="unbounded">
<xsd:annotation>
<xsd:documentation><![CDATA[
Pattern of the elements to include.
]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element type="xsd:string" name="exclude"
minOccurs="0" maxOccurs="unbounded">
<xsd:annotation>
<xsd:documentation><![CDATA[
Pattern of the elements to exclude.
]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:choice>
<xsd:attribute type="xsd:string" name="layer"
use="required" />
</xsd:complexType>
<xsd:complexType name="dependenciesIntoType">
<xsd:complexContent>
<xsd:extension base="intoType">
<xsd:choice minOccurs="0">
<xsd:element type="xsd:string" name="includeModuleDependencies" minOccurs="0">
<xsd:annotation>
<xsd:documentation><![CDATA[
Include dependencies on other modules in the build.
]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element type="xsd:string" name="excludeModuleDependencies" minOccurs="0">
<xsd:annotation>
<xsd:documentation><![CDATA[
Exclude dependencies on other modules in the build.
]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:choice>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
</xsd:schema>
build-plugin/spring-boot-maven-plugin/src/test/resources/dependencies-layer-no-filter.xml
+1 -1
View File
@@ -1,7 +1,7 @@
<layers xmlns="http://www.springframework.org/schema/boot/layers"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/boot/layers
https://www.springframework.org/schema/boot/layers/layers-4.1.xsd">
https://www.springframework.org/schema/boot/layers/layers-4.2.xsd">
<dependencies>
<into layer="my-deps" />
</dependencies>
build-plugin/spring-boot-maven-plugin/src/test/resources/layers.xml
+1 -1
View File
@@ -1,7 +1,7 @@
<layers xmlns="http://www.springframework.org/schema/boot/layers"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/boot/layers
https://www.springframework.org/schema/boot/layers/layers-4.1.xsd">
https://www.springframework.org/schema/boot/layers/layers-4.2.xsd">
<application>
<into layer="my-resources">
<include>META-INF/resources/**</include>
build-plugin/spring-boot-maven-plugin/src/test/resources/resource-layer-no-filter.xml
+1 -1
View File
@@ -1,7 +1,7 @@
<layers xmlns="http://www.springframework.org/schema/boot/layers"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/boot/layers
https://www.springframework.org/schema/boot/layers/layers-4.1.xsd">
https://www.springframework.org/schema/boot/layers/layers-4.2.xsd">
<application>
<into layer="my-layer" />
</application>
eclipse/spring-boot-project.setup
+2 -2
View File
@@ -10,8 +10,8 @@
xmlns:setup.p2="http://www.eclipse.org/oomph/setup/p2/1.0"
xmlns:setup.workingsets="http://www.eclipse.org/oomph/setup/workingsets/1.0"
xsi:schemaLocation="http://www.eclipse.org/oomph/setup/jdt/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/JDT.ecore http://www.eclipse.org/buildship/oomph/1.0 https://raw.githubusercontent.com/eclipse/buildship/master/org.eclipse.buildship.oomph/model/GradleImport-1.0.ecore http://www.eclipse.org/oomph/predicates/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/Predicates.ecore http://www.eclipse.org/oomph/setup/workingsets/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/SetupWorkingSets.ecore"
name="spring.boot.4.1.x"
label="Spring Boot 4.1.x">
name="spring.boot.4.2.x"
label="Spring Boot 4.2.x">
<setupTask
xsi:type="setup:VariableTask"
type="FOLDER"
git/hooks/prepare-forward-merge
+1 -1
View File
@@ -4,7 +4,7 @@ require 'net/http'
require 'yaml'
require 'logger'
$main_branch = "4.1.x"
$main_branch = "4.2.x"
$log = Logger.new(STDOUT)
$log.level = Logger::WARN
gradle.properties
+1 -1
View File
@@ -1,4 +1,4 @@
version=4.1.1-SNAPSHOT
version=4.2.0-SNAPSHOT
latestVersion=true
spring.build-type=oss
platform/spring-boot-dependencies/build.gradle
+1 -1
View File
@@ -23,7 +23,7 @@ description = "Spring Boot Dependencies"
bom {
upgrade {
policy = "same-minor-version"
policy = "same-major-version"
gitHub {
issueLabels = [
"type: dependency-upgrade",