Prepare 4.0.x branch

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

@@ -3,7 +3,7 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - main
+      - 4.0.x
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
 jobs:
@@ -28,7 +28,7 @@ jobs:
       - name: Deploy
         uses: spring-io/artifactory-deploy-action@dc1913008c0599f0c4b1fdafb6ff3c502b3565ea # v0.0.2
         with:
-          build-name: ${{ vars.COMMERCIAL && format('spring-boot-commercial-{0}', '3.5.x') || format('spring-boot-{0}', '3.5.x') }}
+          build-name: ${{ vars.COMMERCIAL && format('spring-boot-commercial-{0}', '4.0.x') || format('spring-boot-{0}', '4.0.x') }}
           folder: 'deployment-repository'
           password: ${{ vars.COMMERCIAL && secrets.COMMERCIAL_ARTIFACTORY_PASSWORD || secrets.ARTIFACTORY_PASSWORD }}
           project: ${{ vars.COMMERCIAL && 'spring' }}

.github/workflows/ci.yml

@@ -2,7 +2,7 @@ name: CI
 on:
   push:
     branches:
-      - main
+      - 4.0.x
 jobs:
   ci:
     name: '${{ matrix.os.name}} | Java ${{ matrix.java.version}}'

.github/workflows/run-system-tests.yml

@@ -2,7 +2,7 @@ name: Run System Tests
 on:
   push:
     branches:
-      - main
+      - 4.0.x
 jobs:
   run-system-tests:
     name: 'Java ${{ matrix.java.version}}'

gradle.properties

@@ -1,4 +1,4 @@
-version=3.5.0-SNAPSHOT
+version=4.0.0-SNAPSHOT
 latestVersion=true
 spring.build-type=oss
 

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/jar-layered-custom/jar/src/layers.xml

@@ -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-3.5.xsd">
+					  https://www.springframework.org/schema/layers/layers-4.0.xsd">
 	<application>
 		<into layer="configuration">
 			<include>**/application*.*</include>

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/war-layered-custom/war/src/layers.xml

@@ -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-3.5.xsd">
+					  https://www.springframework.org/schema/layers/layers-4.0.xsd">
 	<application>
 		<into layer="configuration">
 			<include>**/application*.*</include>

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/xsd/layers-4.0.xsd

@@ -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>

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/resources/dependencies-layer-no-filter.xml

@@ -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-3.5.xsd">
+					  https://www.springframework.org/schema/boot/layers/layers-4.0.xsd">
 	<dependencies>
 		<into layer="my-deps" />
 	</dependencies>

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/resources/layers.xml

@@ -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-3.5.xsd">
+					  https://www.springframework.org/schema/boot/layers/layers-4.0.xsd">
 	<application>
 		<into layer="my-resources">
 			<include>META-INF/resources/**</include>

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/resources/resource-layer-no-filter.xml

@@ -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-3.5.xsd">
+					  https://www.springframework.org/schema/boot/layers/layers-4.0.xsd">
 	<application>
 		<into layer="my-layer" />
 	</application>