From d8f9a20221286789320c9f0941e3f4693512d8c4 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Wed, 14 Jul 2021 14:32:08 +0200
Subject: [PATCH] Add missing XSD version for layers configuration

Closes gh-27321
---
 .../jar-layered-custom/jar/src/layers.xml     |   2 +-
 .../war-layered-custom/war/src/layers.xml     |   2 +-
 .../src/main/xsd/layers-2.5.xsd               | 100 ++++++++++++++++++
 .../dependencies-layer-no-filter.xml          |   2 +-
 .../src/test/resources/layers.xml             |   2 +-
 .../resources/resource-layer-no-filter.xml    |   2 +-
 6 files changed, 105 insertions(+), 5 deletions(-)
 create mode 100644 spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/xsd/layers-2.5.xsd

diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/jar-layered-custom/jar/src/layers.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/jar-layered-custom/jar/src/layers.xml
index c7552b97764a..fdf6d7ed8d55 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/jar-layered-custom/jar/src/layers.xml
+++ b/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-2.4.xsd">
+					  https://www.springframework.org/schema/layers/layers-2.5.xsd">
 	<application>
 		<into layer="configuration">
 			<include>**/application*.*</include>
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/war-layered-custom/war/src/layers.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/war-layered-custom/war/src/layers.xml
index c7552b97764a..fdf6d7ed8d55 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/war-layered-custom/war/src/layers.xml
+++ b/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-2.4.xsd">
+					  https://www.springframework.org/schema/layers/layers-2.5.xsd">
 	<application>
 		<into layer="configuration">
 			<include>**/application*.*</include>
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/xsd/layers-2.5.xsd b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/xsd/layers-2.5.xsd
new file mode 100644
index 000000000000..57eac0d6b9f5
--- /dev/null
+++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/xsd/layers-2.5.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" />
+			<xsd:element name="dependencies" type="dependenciesType" />
+			<xsd:element name="layerOrder" type="layerOrderType" />
+		</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="includeProjectDependencies" 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="excludeProjectDependencies" 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>
\ No newline at end of file
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/resources/dependencies-layer-no-filter.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/resources/dependencies-layer-no-filter.xml
index d0ed724ac57d..a4040cd0b8a5 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/resources/dependencies-layer-no-filter.xml
+++ b/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-2.4.xsd">
+					  https://www.springframework.org/schema/boot/layers/layers-2.5.xsd">
 	<dependencies>
 		<into layer="my-deps" />
 	</dependencies>
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/resources/layers.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/resources/layers.xml
index 929e2b9f104b..a3908ccbb0a1 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/resources/layers.xml
+++ b/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-2.4.xsd">
+					  https://www.springframework.org/schema/boot/layers/layers-2.5.xsd">
 	<application>
 		<into layer="my-resources">
 			<include>META-INF/resources/**</include>
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/resources/resource-layer-no-filter.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/resources/resource-layer-no-filter.xml
index 983fc8591212..3640b70b6d5f 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/resources/resource-layer-no-filter.xml
+++ b/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-2.4.xsd">
+					  https://www.springframework.org/schema/boot/layers/layers-2.5.xsd">
 	<application>
 		<into layer="my-layer" />
 	</application>