This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-site.git
commit ad8121058de1b82c98abadacfbcbc888ecd65ae2 Author: Sylwester Lachiewicz <slachiew...@apache.org> AuthorDate: Thu Apr 18 22:25:06 2019 +0200 [MNG-6639] XSD for Apache Maven 3.6.1 --- content/resources/xsd/core-extensions-1.0.0.xsd | 2 +- content/resources/xsd/lifecycle-1.0.0.xsd | 2 +- content/resources/xsd/maven-4.0.0.xsd | 69 ++++++++++++++++------ content/resources/xsd/paramdoc-1.0.0.xsd | 2 +- content/resources/xsd/profiles-1.0.0.xsd | 2 +- .../resources/xsd/repository-metadata-1.1.0.xsd | 2 +- content/resources/xsd/settings-1.1.0.xsd | 4 +- content/resources/xsd/toolchains-1.1.0.xsd | 2 +- 8 files changed, 59 insertions(+), 26 deletions(-) diff --git a/content/resources/xsd/core-extensions-1.0.0.xsd b/content/resources/xsd/core-extensions-1.0.0.xsd index 8e9fe06..c5d726a 100644 --- a/content/resources/xsd/core-extensions-1.0.0.xsd +++ b/content/resources/xsd/core-extensions-1.0.0.xsd @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!-- =================== DO NOT EDIT THIS FILE ==================== --> -<!-- Generated by Modello 1.9.1, --> +<!-- Generated by Modello 1.10.0, --> <!-- any modifications will be overwritten. --> <!-- ============================================================== --> <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" xmlns="http://maven.apache.org/EXTENSIONS/1.0.0" targetNamespace="http://maven.apache.org/EXTENSIONS/1.0.0"> diff --git a/content/resources/xsd/lifecycle-1.0.0.xsd b/content/resources/xsd/lifecycle-1.0.0.xsd index d46dc30..e6f406c 100644 --- a/content/resources/xsd/lifecycle-1.0.0.xsd +++ b/content/resources/xsd/lifecycle-1.0.0.xsd @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!-- =================== DO NOT EDIT THIS FILE ==================== --> -<!-- Generated by Modello 1.9.1, --> +<!-- Generated by Modello 1.10.0, --> <!-- any modifications will be overwritten. --> <!-- ============================================================== --> <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" xmlns="http://maven.apache.org/LIFECYCLE/1.0.0" targetNamespace="http://maven.apache.org/LIFECYCLE/1.0.0"> diff --git a/content/resources/xsd/maven-4.0.0.xsd b/content/resources/xsd/maven-4.0.0.xsd index db213e4..b033c38 100644 --- a/content/resources/xsd/maven-4.0.0.xsd +++ b/content/resources/xsd/maven-4.0.0.xsd @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!-- =================== DO NOT EDIT THIS FILE ==================== --> -<!-- Generated by Modello 1.9.1, --> +<!-- Generated by Modello 1.10.0, --> <!-- any modifications will be overwritten. --> <!-- ============================================================== --> <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" xmlns="http://maven.apache.org/POM/4.0.0" targetNamespace="http://maven.apache.org/POM/4.0.0"> @@ -105,8 +105,8 @@ <xs:documentation source="description"> The URL to the project's homepage. - <br><b>Default value is</b>: parent value [+ path adjustment] + (artifactId or <code>project.directory</code> property), or just parent value if - <code>child.urls.inherit.append.path="false"</code> + <br><b>Default value is</b>: parent value [+ path adjustment] + (artifactId or project.directory property), or just parent value if + project's <code>child.project.url.inherit.append.path="false"</code> </xs:documentation> </xs:annotation> @@ -344,15 +344,16 @@ </xs:complexType> </xs:element> </xs:all> - <xs:attribute name="child.inherit.append.path" type="xs:string" use="optional"> + <xs:attribute name="child.project.url.inherit.append.path" type="xs:string" use="optional"> <xs:annotation> <xs:documentation source="version">4.0.0+</xs:documentation> <xs:documentation source="description"> - When childs inherit from urls, append path or not?. Note: While the type + When childs inherit from project's url, append path or not? Note: While the type of this field is <code>String</code> for technical reasons, the semantic type is actually <code>Boolean</code> - <br /><b>Default value is</b>: <code>true</code> + <br><b>Default value is</b>: <code>true</code> + <br><b>Since</b>: Maven 3.6.1 </xs:documentation> </xs:annotation> @@ -526,7 +527,8 @@ <a href="https://maven.apache.org/scm/scm-url-format.html">URL format</a> and <a href="https://maven.apache.org/scm/scms-overview.html">list of supported SCMs</a>. This connection is read-only. - <br><b>Default value is</b>: parent value [+ path adjustment] + (artifactId or <code>project.directory</code> property) + <br><b>Default value is</b>: parent value [+ path adjustment] + (artifactId or project.directory property), or just parent value if + scm's <code>child.scm.connection.inherit.append.path="false"</code> </xs:documentation> </xs:annotation> @@ -538,7 +540,8 @@ Just like <code>connection</code>, but for developers, i.e. this scm connection will not be read only. - <br><b>Default value is</b>: parent value [+ path adjustment] + (artifactId or <code>project.directory</code> property) + <br><b>Default value is</b>: parent value [+ path adjustment] + (artifactId or project.directory property), or just parent value if + scm's <code>child.scm.developerConnection.inherit.append.path="false"</code> </xs:documentation> </xs:annotation> @@ -555,22 +558,51 @@ <xs:documentation source="description"> The URL to the project's browsable SCM repository, such as ViewVC or Fisheye. - <br><b>Default value is</b>: parent value [+ path adjustment] + (artifactId or <code>project.directory</code> property), or just parent value if - <code>child.urls.inherit.append.path="false"</code> + <br><b>Default value is</b>: parent value [+ path adjustment] + (artifactId or project.directory property), or just parent value if + scm's <code>child.scm.url.inherit.append.path="false"</code> </xs:documentation> </xs:annotation> </xs:element> </xs:all> - <xs:attribute name="child.inherit.append.path" type="xs:string" use="optional"> + <xs:attribute name="child.scm.connection.inherit.append.path" type="xs:string" use="optional"> <xs:annotation> <xs:documentation source="version">4.0.0+</xs:documentation> <xs:documentation source="description"> - When childs inherit from urls, append path or not?. Note: While the type + When childs inherit from scm connection, append path or not? Note: While the type of this field is <code>String</code> for technical reasons, the semantic type is actually <code>Boolean</code> - <br /><b>Default value is</b>: <code>true</code> + <br><b>Default value is</b>: <code>true</code> + <br><b>Since</b>: Maven 3.6.1 + + </xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute name="child.scm.developerConnection.inherit.append.path" type="xs:string" use="optional"> + <xs:annotation> + <xs:documentation source="version">4.0.0+</xs:documentation> + <xs:documentation source="description"> + + When childs inherit from scm developer connection, append path or not? Note: While the type + of this field is <code>String</code> for technical reasons, the semantic type is actually + <code>Boolean</code> + <br><b>Default value is</b>: <code>true</code> + <br><b>Since</b>: Maven 3.6.1 + + </xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute name="child.scm.url.inherit.append.path" type="xs:string" use="optional"> + <xs:annotation> + <xs:documentation source="version">4.0.0+</xs:documentation> + <xs:documentation source="description"> + + When childs inherit from scm url, append path or not? Note: While the type + of this field is <code>String</code> for technical reasons, the semantic type is actually + <code>Boolean</code> + <br><b>Default value is</b>: <code>true</code> + <br><b>Since</b>: Maven 3.6.1 </xs:documentation> </xs:annotation> @@ -1346,22 +1378,23 @@ <xs:documentation source="description"> The url of the location where website is deployed, in the form <code>protocol://hostname/path</code>. - <br><b>Default value is</b>: parent value [+ path adjustment] + (artifactId or <code>project.directory</code> property), or just parent value if - <code>child.urls.inherit.append.path="false"</code> + <br><b>Default value is</b>: parent value [+ path adjustment] + (artifactId or project.directory property), or just parent value if + site's <code>child.site.url.inherit.append.path="false"</code> </xs:documentation> </xs:annotation> </xs:element> </xs:all> - <xs:attribute name="child.inherit.append.path" type="xs:string" use="optional"> + <xs:attribute name="child.site.url.inherit.append.path" type="xs:string" use="optional"> <xs:annotation> <xs:documentation source="version">4.0.0+</xs:documentation> <xs:documentation source="description"> - When childs inherit from urls, append path or not?. Note: While the type + When childs inherit from distribution management site url, append path or not? Note: While the type of this field is <code>String</code> for technical reasons, the semantic type is actually <code>Boolean</code> - <br /><b>Default value is</b>: <code>true</code> + <br><b>Default value is</b>: <code>true</code> + <br><b>Since</b>: Maven 3.6.1 </xs:documentation> </xs:annotation> diff --git a/content/resources/xsd/paramdoc-1.0.0.xsd b/content/resources/xsd/paramdoc-1.0.0.xsd index 7acc454..8d3f0bb 100644 --- a/content/resources/xsd/paramdoc-1.0.0.xsd +++ b/content/resources/xsd/paramdoc-1.0.0.xsd @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!-- =================== DO NOT EDIT THIS FILE ==================== --> -<!-- Generated by Modello 1.9.1, --> +<!-- Generated by Modello 1.10.0, --> <!-- any modifications will be overwritten. --> <!-- ============================================================== --> <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" xmlns="http://maven.apache.org/PARAMDOC/1.0.0" targetNamespace="http://maven.apache.org/PARAMDOC/1.0.0"> diff --git a/content/resources/xsd/profiles-1.0.0.xsd b/content/resources/xsd/profiles-1.0.0.xsd index 2e9478d..7db06d0 100644 --- a/content/resources/xsd/profiles-1.0.0.xsd +++ b/content/resources/xsd/profiles-1.0.0.xsd @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!-- =================== DO NOT EDIT THIS FILE ==================== --> -<!-- Generated by Modello 1.9.1, --> +<!-- Generated by Modello 1.10.0, --> <!-- any modifications will be overwritten. --> <!-- ============================================================== --> <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" xmlns="http://maven.apache.org/PROFILES/1.0.0" targetNamespace="http://maven.apache.org/PROFILES/1.0.0"> diff --git a/content/resources/xsd/repository-metadata-1.1.0.xsd b/content/resources/xsd/repository-metadata-1.1.0.xsd index 68813ba..7c0cda2 100644 --- a/content/resources/xsd/repository-metadata-1.1.0.xsd +++ b/content/resources/xsd/repository-metadata-1.1.0.xsd @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!-- =================== DO NOT EDIT THIS FILE ==================== --> -<!-- Generated by Modello 1.9.1, --> +<!-- Generated by Modello 1.10.0, --> <!-- any modifications will be overwritten. --> <!-- ============================================================== --> <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" xmlns="http://maven.apache.org/METADATA/1.1.0" targetNamespace="http://maven.apache.org/METADATA/1.1.0"> diff --git a/content/resources/xsd/settings-1.1.0.xsd b/content/resources/xsd/settings-1.1.0.xsd index d828a1c..d5fbcac 100644 --- a/content/resources/xsd/settings-1.1.0.xsd +++ b/content/resources/xsd/settings-1.1.0.xsd @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!-- =================== DO NOT EDIT THIS FILE ==================== --> -<!-- Generated by Modello 1.9.1, --> +<!-- Generated by Modello 1.10.0, --> <!-- any modifications will be overwritten. --> <!-- ============================================================== --> <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" xmlns="http://maven.apache.org/SETTINGS/1.1.0" targetNamespace="http://maven.apache.org/SETTINGS/1.1.0"> @@ -25,7 +25,7 @@ <xs:documentation source="version">1.0.0+</xs:documentation> <xs:documentation source="description"> - The local repository.<br><b>Default value is:</b> <tt>${user.home}/.m2/repository</tt> + The local repository.<br><b>Default value is:</b> <code>${user.home}/.m2/repository</code> </xs:documentation> </xs:annotation> diff --git a/content/resources/xsd/toolchains-1.1.0.xsd b/content/resources/xsd/toolchains-1.1.0.xsd index 99d74c4..3b2b924 100644 --- a/content/resources/xsd/toolchains-1.1.0.xsd +++ b/content/resources/xsd/toolchains-1.1.0.xsd @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!-- =================== DO NOT EDIT THIS FILE ==================== --> -<!-- Generated by Modello 1.9.1, --> +<!-- Generated by Modello 1.10.0, --> <!-- any modifications will be overwritten. --> <!-- ============================================================== --> <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" xmlns="http://maven.apache.org/TOOLCHAINS/1.1.0" targetNamespace="http://maven.apache.org/TOOLCHAINS/1.1.0">