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 efbcc4cb16c0f9b6e1c315ee104f91c6e1294b70 Author: Sylwester Lachiewicz <slachiew...@apache.org> AuthorDate: Thu Apr 18 21:51:23 2019 +0200 [MNG-6639] XSD for Apache Maven 3.5.x --- content/resources/xsd/core-extensions-1.0.0.xsd | 4 +- content/resources/xsd/lifecycle-1.0.0.xsd | 4 +- content/resources/xsd/maven-4.0.0.xsd | 56 +++++++++++----------- content/resources/xsd/paramdoc-1.0.0.xsd | 2 +- content/resources/xsd/profiles-1.0.0.xsd | 4 +- .../resources/xsd/repository-metadata-1.1.0.xsd | 4 +- content/resources/xsd/settings-1.1.0.xsd | 6 +-- content/resources/xsd/toolchains-1.1.0.xsd | 10 ++-- 8 files changed, 45 insertions(+), 45 deletions(-) diff --git a/content/resources/xsd/core-extensions-1.0.0.xsd b/content/resources/xsd/core-extensions-1.0.0.xsd index 6598c75..8e9fe06 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"?> +<?xml version="1.0"?> <!-- =================== DO NOT EDIT THIS FILE ==================== --> -<!-- Generated by Modello 1.8.3, --> +<!-- Generated by Modello 1.9.1, --> <!-- 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 fc775e8..d46dc30 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.8.3, --> +<!-- Generated by Modello 1.9.1, --> <!-- 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"> @@ -59,7 +59,7 @@ <xs:element minOccurs="0" name="id" type="xs:string"> <xs:annotation> <xs:documentation source="version">1.0.0</xs:documentation> - <xs:documentation source="description">The ID of this phase, eg <code>generate-sources</code>.</xs:documentation> + <xs:documentation source="description">The ID of this phase, e.g., <code>generate-sources</code>.</xs:documentation> </xs:annotation> </xs:element> <xs:element minOccurs="0" name="executions"> diff --git a/content/resources/xsd/maven-4.0.0.xsd b/content/resources/xsd/maven-4.0.0.xsd index 75f2283..20dfb94 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.8.3, --> +<!-- Generated by Modello 1.9.1, --> <!-- 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,7 +105,7 @@ <xs:documentation source="description"> The URL to the project's homepage. - <br /><b>Default value is</b>: parent value [+ path adjustment] + artifactId + <br><b>Default value is</b>: parent value [+ path adjustment] + (artifactId or <code>project.directory</code> property) </xs:documentation> </xs:annotation> @@ -261,7 +261,7 @@ These dependencies are used to construct a classpath for your project during the build process. They are automatically downloaded from the repositories defined in this project. - See <a href="http://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html">the + See <a href="https://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html">the dependency mechanism</a> for more information. </xs:documentation> @@ -509,10 +509,10 @@ The source control management system URL that describes the repository and how to connect to the repository. For more information, see the - <a href="http://maven.apache.org/scm/scm-url-format.html">URL format</a> - and <a href="http://maven.apache.org/scm/scms-overview.html">list of supported SCMs</a>. + <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 + <br><b>Default value is</b>: parent value [+ path adjustment] + (artifactId or <code>project.directory</code> property) </xs:documentation> </xs:annotation> @@ -524,7 +524,7 @@ 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 + <br><b>Default value is</b>: parent value [+ path adjustment] + (artifactId or <code>project.directory</code> property) </xs:documentation> </xs:annotation> @@ -541,7 +541,7 @@ <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 + <br><b>Default value is</b>: parent value [+ path adjustment] + (artifactId or <code>project.directory</code> property) </xs:documentation> </xs:annotation> @@ -663,7 +663,7 @@ The classifier of the dependency. It is appended to the filename after the version. This allows: <ul> - <li>refering to attached artifact, for example <code>sources</code> and <code>javadoc</code>: + <li>referring to attached artifact, for example <code>sources</code> and <code>javadoc</code>: see <a href="../maven-core/artifact-handlers.html">default artifact handlers</a> for a list,</li> <li>distinguishing two artifacts that belong to the same POM but were built differently. @@ -683,8 +683,8 @@ calculate the various classpaths used for compilation, testing, and so on. It also assists in determining which artifacts to include in a distribution of this project. For more information, see - <a href="http://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html">the - dependency mechanism</a>. + <a href="https://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html">the + dependency mechanism</a>. The default scope is <code>compile</code>. </xs:documentation> </xs:annotation> @@ -1318,7 +1318,7 @@ <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 + <br><b>Default value is</b>: parent value [+ path adjustment] + (artifactId or <code>project.directory</code> property) </xs:documentation> </xs:annotation> @@ -1438,8 +1438,8 @@ <li><code>combine.children</code>: available values are <code>merge</code> (default) and <code>append</code>,</li> <li><code>combine.self</code>: available values are <code>merge</code> (default) and <code>override</code>.</li> </ul> - <p>See <a href="http://maven.apache.org/pom.html#Plugins">POM Reference documentation</a> and - <a href="http://plexus.codehaus.org/plexus-utils/apidocs/org/codehaus/plexus/util/xml/Xpp3DomUtils.html">Xpp3DomUtils</a> + <p>See <a href="https://maven.apache.org/pom.html#Plugins">POM Reference documentation</a> and + <a href="https://codehaus-plexus.github.io/plexus-utils/apidocs/org/codehaus/plexus/util/xml/Xpp3DomUtils.html">Xpp3DomUtils</a> for more information.</p> </xs:documentation> @@ -1503,8 +1503,8 @@ <li><code>combine.children</code>: available values are <code>merge</code> (default) and <code>append</code>,</li> <li><code>combine.self</code>: available values are <code>merge</code> (default) and <code>override</code>.</li> </ul> - <p>See <a href="http://maven.apache.org/pom.html#Plugins">POM Reference documentation</a> and - <a href="http://plexus.codehaus.org/plexus-utils/apidocs/org/codehaus/plexus/util/xml/Xpp3DomUtils.html">Xpp3DomUtils</a> + <p>See <a href="https://maven.apache.org/pom.html#Plugins">POM Reference documentation</a> and + <a href="https://codehaus-plexus.github.io/plexus-utils/apidocs/org/codehaus/plexus/util/xml/Xpp3DomUtils.html">Xpp3DomUtils</a> for more information.</p> </xs:documentation> @@ -1603,7 +1603,7 @@ These dependencies are used to construct a classpath for your project during the build process. They are automatically downloaded from the repositories defined in this project. - See <a href="http://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html">the + See <a href="https://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html">the dependency mechanism</a> for more information. </xs:documentation> @@ -1748,7 +1748,7 @@ <xs:documentation source="description">This is the file specification used to activate the profile. The <code>missing</code> value is the location of a file that needs to exist, and if it doesn't, the profile will be activated. On the other hand, <code>exists</code> will test for the existence of the file and if it is - there, the profile will be activated.<br/> + there, the profile will be activated.<br> Variable interpolation for these file specifications is limited to <code>${basedir}</code>, System properties and request properties.</xs:documentation> </xs:annotation> @@ -2079,8 +2079,8 @@ <li><code>combine.children</code>: available values are <code>merge</code> (default) and <code>append</code>,</li> <li><code>combine.self</code>: available values are <code>merge</code> (default) and <code>override</code>.</li> </ul> - <p>See <a href="http://maven.apache.org/pom.html#Plugins">POM Reference documentation</a> and - <a href="http://plexus.codehaus.org/plexus-utils/apidocs/org/codehaus/plexus/util/xml/Xpp3DomUtils.html">Xpp3DomUtils</a> + <p>See <a href="https://maven.apache.org/pom.html#Plugins">POM Reference documentation</a> and + <a href="https://codehaus-plexus.github.io/plexus-utils/apidocs/org/codehaus/plexus/util/xml/Xpp3DomUtils.html">Xpp3DomUtils</a> for more information.</p> </xs:documentation> @@ -2155,8 +2155,8 @@ <li><code>combine.children</code>: available values are <code>merge</code> (default) and <code>append</code>,</li> <li><code>combine.self</code>: available values are <code>merge</code> (default) and <code>override</code>.</li> </ul> - <p>See <a href="http://maven.apache.org/pom.html#Plugins">POM Reference documentation</a> and - <a href="http://plexus.codehaus.org/plexus-utils/apidocs/org/codehaus/plexus/util/xml/Xpp3DomUtils.html">Xpp3DomUtils</a> + <p>See <a href="https://maven.apache.org/pom.html#Plugins">POM Reference documentation</a> and + <a href="https://codehaus-plexus.github.io/plexus-utils/apidocs/org/codehaus/plexus/util/xml/Xpp3DomUtils.html">Xpp3DomUtils</a> for more information.</p> </xs:documentation> @@ -2275,12 +2275,12 @@ <xs:annotation> <xs:documentation source="version">4.0.0+</xs:documentation> <xs:documentation source="description"> - For a plugin project, the minimum version of Maven required to use - the resulting plugin.<br /> - For specifying the minimum version of Maven required to build a - project, this element is <b>deprecated</b>. Use the Maven Enforcer - Plugin's <a href="https://maven.apache.org/enforcer/enforcer-rules/requireMavenVersion.html"><code>requireMavenVersion</code></a> - rule instead. + For a plugin project (packaging is <code>maven-plugin</code>), the minimum version of + Maven required to use the resulting plugin.<br> + In Maven 2, this was also specifying the minimum version of Maven required to build a + project, but this usage is <b>deprecated</b> in Maven 3 and not checked any more: use + the <a href="https://maven.apache.org/enforcer/enforcer-rules/requireMavenVersion.html">Maven Enforcer Plugin's + <code>requireMavenVersion</code> rule</a> instead. </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 b6600e1..7acc454 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.8.3, --> +<!-- Generated by Modello 1.9.1, --> <!-- 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 1cf2b27..2e9478d 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.8.3, --> +<!-- Generated by Modello 1.9.1, --> <!-- 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"> @@ -244,7 +244,7 @@ <xs:annotation> <xs:documentation source="version">1.0.0</xs:documentation> <xs:documentation source="description"> - Repository contains the information needed for establishing connections with remote repoistory + Repository contains the information needed for establishing connections with remote repository </xs:documentation> </xs:annotation> <xs:all> diff --git a/content/resources/xsd/repository-metadata-1.1.0.xsd b/content/resources/xsd/repository-metadata-1.1.0.xsd index 16779b3..68813ba 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.8.3, --> +<!-- Generated by Modello 1.9.1, --> <!-- 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"> @@ -50,7 +50,7 @@ </xs:complexType> </xs:element> </xs:all> - <xs:attribute name="modelVersion" type="xs:string"> + <xs:attribute name="modelVersion" type="xs:string" use="optional"> <xs:annotation> <xs:documentation source="version">1.1.0+</xs:documentation> <xs:documentation source="description">The version of the underlying metadata model.</xs:documentation> diff --git a/content/resources/xsd/settings-1.1.0.xsd b/content/resources/xsd/settings-1.1.0.xsd index 8fd1edd..d828a1c 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.8.3, --> +<!-- Generated by Modello 1.9.1, --> <!-- 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> <tt>${user.home}/.m2/repository</tt> </xs:documentation> </xs:annotation> @@ -346,7 +346,7 @@ <xs:annotation> <xs:documentation source="version">1.0.0+</xs:documentation> <xs:documentation source="description"> - The server ID of the repository being mirrored, eg + The server ID of the repository being mirrored, e.g., "central". This MUST NOT match the mirror id. </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 f590867..99d74c4 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"?> +<?xml version="1.0"?> <!-- =================== DO NOT EDIT THIS FILE ==================== --> -<!-- Generated by Modello 1.8.3, --> +<!-- Generated by Modello 1.9.1, --> <!-- 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"> @@ -42,9 +42,9 @@ <xs:documentation source="description"> Type of toolchain:<ul> <li><code>jdk</code> for - <a href="http://maven.apache.org/plugins/maven-toolchains-plugin/toolchains/jdk.html">JDK Standard Toolchain</a>,</li> + <a href="https://maven.apache.org/plugins/maven-toolchains-plugin/toolchains/jdk.html">JDK Standard Toolchain</a>,</li> <li>other value for - <a href="http://maven.apache.org/plugins/maven-toolchains-plugin/toolchains/custom.html">Custom Toolchain</a></li> + <a href="https://maven.apache.org/plugins/maven-toolchains-plugin/toolchains/custom.html">Custom Toolchain</a></li> </ul> </xs:documentation> </xs:annotation> @@ -73,7 +73,7 @@ <xs:documentation source="description"> <p>Toolchain configuration information, like location or any information that is to be retrieved.</p> - <p>Actual content structure is completely open: each toochain type will define its own format and semantics.</p> + <p>Actual content structure is completely open: each toolchain type will define its own format and semantics.</p> <p>In general, this is a properties format: <code>&lt;name&gt;value&lt;/name&gt;</code> with per-toolchain defined properties names.</p> </xs:documentation>