This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-site.git
The following commit(s) were added to refs/heads/master by this push:
new 29652477 Update site models
29652477 is described below
commit 29652477e8a4b69019ca9eadb055c0d7b5f2adf9
Author: Michael Osipov <micha...@apache.org>
AuthorDate: Tue Oct 22 22:02:51 2024 +0200
Update site models
---
content/resources/xsd/decoration-1.8.1.xsd | 22 ++-------------------
content/resources/xsd/site-2.0.0.xsd | 31 +++++++++++-------------------
2 files changed, 13 insertions(+), 40 deletions(-)
diff --git a/content/resources/xsd/decoration-1.8.1.xsd
b/content/resources/xsd/decoration-1.8.1.xsd
index 8109a3c3..55434970 100644
--- a/content/resources/xsd/decoration-1.8.1.xsd
+++ b/content/resources/xsd/decoration-1.8.1.xsd
@@ -1,24 +1,6 @@
<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
<!-- =================== DO NOT EDIT THIS FILE ==================== -->
-<!-- Generated by Modello 2.1.2, -->
+<!-- Generated by Modello 2.4.0, -->
<!-- any modifications will be overwritten. -->
<!-- ============================================================== -->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema";
elementFormDefault="qualified" xmlns="http://maven.apache.org/DECORATION/1.8.1";
targetNamespace="http://maven.apache.org/DECORATION/1.8.1";>
@@ -610,4 +592,4 @@
</xs:element>
</xs:all>
</xs:complexType>
-</xs:schema>
+</xs:schema>
\ No newline at end of file
diff --git a/content/resources/xsd/site-2.0.0.xsd
b/content/resources/xsd/site-2.0.0.xsd
index f843b2de..1ce07949 100644
--- a/content/resources/xsd/site-2.0.0.xsd
+++ b/content/resources/xsd/site-2.0.0.xsd
@@ -1,24 +1,6 @@
<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
<!-- =================== DO NOT EDIT THIS FILE ==================== -->
-<!-- Generated by Modello 2.1.2, -->
+<!-- Generated by Modello 2.4.0, -->
<!-- any modifications will be overwritten. -->
<!-- ============================================================== -->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema";
elementFormDefault="qualified" xmlns="http://maven.apache.org/SITE/2.0.0";
targetNamespace="http://maven.apache.org/SITE/2.0.0";>
@@ -125,6 +107,15 @@
</xs:documentation>
</xs:annotation>
</xs:attribute>
+ <xs:attribute name="requireParent" type="xs:boolean" default="false"
use="optional">
+ <xs:annotation>
+ <xs:documentation source="version">2.0.0+</xs:documentation>
+ <xs:documentation source="description">
+ Whether this "site.xml" should inherit from a parent
"site.xml". If set to "true" it fails the build in case a
parent site descriptor cannot be retrieved.
+ It does not necessarily need to be the direct parent but just a
site descriptor anywhere in the parent hierarchy.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
</xs:complexType>
<xs:complexType name="Banner">
<xs:annotation>
@@ -482,4 +473,4 @@
</xs:element>
</xs:all>
</xs:complexType>
-</xs:schema>
+</xs:schema>
\ No newline at end of file
