Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add missing XSD version for layers configuration
Closes gh-27321
- Loading branch information
Showing
6 changed files
with
105 additions
and
5 deletions.
There are no files selected for viewing
2 changes: 1 addition & 1 deletion
2
...tools/spring-boot-maven-plugin/src/intTest/projects/jar-layered-custom/jar/src/layers.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...tools/spring-boot-maven-plugin/src/intTest/projects/war-layered-custom/war/src/layers.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
100 changes: 100 additions & 0 deletions
100
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/xsd/layers-2.5.xsd
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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> |
2 changes: 1 addition & 1 deletion
2
...g-boot-tools/spring-boot-maven-plugin/src/test/resources/dependencies-layer-no-filter.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/resources/layers.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...pring-boot-tools/spring-boot-maven-plugin/src/test/resources/resource-layer-no-filter.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters