Skip to content

Commit d213a7b

Browse files
[MNG-8731] Use https for xsi:schemaLocation in generated descriptors
Attribute xml.schemaLocation is used by modello to generate documentations Also update modello descriptor to 2.0.0
1 parent 7cd0802 commit d213a7b

File tree

7 files changed

+18
-18
lines changed

7 files changed

+18
-18
lines changed

maven-core/src/main/mdo/extension.mdo

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ specific language governing permissions and limitations
1717
under the License.
1818
-->
1919

20-
<model xmlns="http://codehaus-plexus.github.io/MODELLO/1.4.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
21-
xsi:schemaLocation="http://codehaus-plexus.github.io/MODELLO/1.4.0 http://codehaus-plexus.github.io/modello/xsd/modello-1.4.0.xsd">
20+
<model xmlns="http://codehaus-plexus.github.io/MODELLO/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
21+
xsi:schemaLocation="http://codehaus-plexus.github.io/MODELLO/2.0.0 https://codehaus-plexus.github.io/modello/xsd/modello-2.0.0.xsd">
2222
<id>extension</id>
2323
<name>ExtensionDescriptor</name>
2424
<description><![CDATA[

maven-core/src/main/mdo/toolchains.mdo

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
under the License.
2020
2121
-->
22-
<model xmlns="http://codehaus-plexus.github.io/MODELLO/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
23-
xsi:schemaLocation="http://codehaus-plexus.github.io/MODELLO/1.0.0 http://codehaus-plexus.github.io/modello/xsd/modello-1.0.0.xsd"
22+
<model xmlns="http://codehaus-plexus.github.io/MODELLO/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
23+
xsi:schemaLocation="http://codehaus-plexus.github.io/MODELLO/2.0.0 https://codehaus-plexus.github.io/modello/xsd/modello-2.0.0.xsd"
2424
xml.namespace="http://maven.apache.org/TOOLCHAINS/${version}"
25-
xml.schemaLocation="http://maven.apache.org/xsd/toolchains-${version}.xsd">
25+
xml.schemaLocation="https://maven.apache.org/xsd/toolchains-${version}.xsd">
2626
<id>toolchains</id>
2727
<name>MavenToolchains</name>
2828
<description><![CDATA[

maven-embedder/src/main/mdo/core-extensions.mdo

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
2121
-->
2222

23-
<model xmlns="http://codehaus-plexus.github.io/MODELLO/1.4.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
24-
xsi:schemaLocation="http://codehaus-plexus.github.io/MODELLO/1.4.0 http://codehaus-plexus.github.io/modello/xsd/modello-1.4.0.xsd"
23+
<model xmlns="http://codehaus-plexus.github.io/MODELLO/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
24+
xsi:schemaLocation="http://codehaus-plexus.github.io/MODELLO/2.0.0 https://codehaus-plexus.github.io/modello/xsd/modello-2.0.0.xsd"
2525
xml.namespace="http://maven.apache.org/EXTENSIONS/${version}"
26-
xml.schemaLocation="http://maven.apache.org/xsd/core-extensions-${version}.xsd">
26+
xml.schemaLocation="https://maven.apache.org/xsd/core-extensions-${version}.xsd">
2727

2828
<id>core-extensions</id>
2929
<name>CoreExtensions</name>

maven-plugin-api/src/main/mdo/lifecycle.mdo

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ specific language governing permissions and limitations
1717
under the License.
1818
-->
1919

20-
<model xmlns="http://codehaus-plexus.github.io/MODELLO/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
21-
xsi:schemaLocation="http://codehaus-plexus.github.io/MODELLO/1.0.0 http://codehaus-plexus.github.io/modello/xsd/modello-1.0.0.xsd"
20+
<model xmlns="http://codehaus-plexus.github.io/MODELLO/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
21+
xsi:schemaLocation="http://codehaus-plexus.github.io/MODELLO/2.0.0 https://codehaus-plexus.github.io/modello/xsd/modello-2.0.0.xsd"
2222
xml.namespace="http://maven.apache.org/LIFECYCLE/${version}"
23-
xml.schemaLocation="http://maven.apache.org/xsd/lifecycle-${version}.xsd">
23+
xml.schemaLocation="https://maven.apache.org/xsd/lifecycle-${version}.xsd">
2424
<id>lifecycle-mappings</id>
2525
<name>LifecycleMappings</name>
2626
<description><![CDATA[

maven-plugin-api/src/main/mdo/plugin.mdo

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ specific language governing permissions and limitations
1717
under the License.
1818
-->
1919

20-
<model xmlns="http://codehaus-plexus.github.io/MODELLO/1.4.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
21-
xsi:schemaLocation="http://codehaus-plexus.github.io/MODELLO/1.4.0 http://codehaus-plexus.github.io/modello/xsd/modello-1.4.0.xsd">
20+
<model xmlns="http://codehaus-plexus.github.io/MODELLO/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
21+
xsi:schemaLocation="http://codehaus-plexus.github.io/MODELLO/2.0.0 https://codehaus-plexus.github.io/modello/xsd/modello-2.0.0.xsd">
2222
<id>plugin</id>
2323
<name>PluginDescriptor</name>
2424
<description><![CDATA[

maven-repository-metadata/src/main/mdo/metadata.mdo

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ specific language governing permissions and limitations
1717
under the License.
1818
-->
1919

20-
<model xmlns="http://codehaus-plexus.github.io/MODELLO/1.4.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
21-
xsi:schemaLocation="http://codehaus-plexus.github.io/MODELLO/1.4.0 http://codehaus-plexus.github.io/modello/xsd/modello-1.4.0.xsd"
20+
<model xmlns="http://codehaus-plexus.github.io/MODELLO/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
21+
xsi:schemaLocation="http://codehaus-plexus.github.io/MODELLO/2.0.0 https://codehaus-plexus.github.io/modello/xsd/modello-2.0.0.xsd"
2222
xsd.namespace="http://maven.apache.org/METADATA/${version}"
2323
xml.schemaLocation="https://maven.apache.org/xsd/repository-metadata-${version}.xsd">
2424
<id>repository-metadata</id>

maven-settings/src/main/mdo/settings.mdo

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
under the License.
2020
-->
2121

22-
<model xmlns="http://codehaus-plexus.github.io/MODELLO/1.4.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
23-
xsi:schemaLocation="http://codehaus-plexus.github.io/MODELLO/1.4.0 http://codehaus-plexus.github.io/modello/xsd/modello-1.4.0.xsd"
22+
<model xmlns="http://codehaus-plexus.github.io/MODELLO/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
23+
xsi:schemaLocation="http://codehaus-plexus.github.io/MODELLO/2.0.0 https://codehaus-plexus.github.io/modello/xsd/modello-2.0.0.xsd"
2424
xml.namespace="http://maven.apache.org/SETTINGS/${version}"
25-
xml.schemaLocation="http://maven.apache.org/xsd/settings-${version}.xsd">
25+
xml.schemaLocation="https://maven.apache.org/xsd/settings-${version}.xsd">
2626
<id>settings</id>
2727
<name>Settings</name>
2828
<description>

0 commit comments

Comments
 (0)