You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2022/07/16 15:39:25 UTC
[maven-assembly-plugin] branch master updated: [MASSEMBLY-949] Correct links
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-assembly-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new f4f2f754 [MASSEMBLY-949] Correct links
f4f2f754 is described below
commit f4f2f7540666d8e14edb7419c621cea5b9aae7a9
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sat Jul 16 17:39:14 2022 +0200
[MASSEMBLY-949] Correct links
---
src/main/mdo/assembly-component.mdo | 4 ++--
src/main/mdo/assembly.mdo | 4 ++--
src/main/resources/assemblies/bin.xml | 2 +-
src/main/resources/assemblies/jar-with-dependencies.xml | 2 +-
src/main/resources/assemblies/project.xml | 2 +-
src/main/resources/assemblies/src.xml | 2 +-
src/site/apt/advanced-descriptor-topics.apt.vm | 2 +-
src/site/apt/advanced-module-set-topics.apt.vm | 2 +-
src/site/apt/descriptor-refs.apt.vm | 4 ++--
src/site/apt/examples/index.apt | 2 +-
src/site/apt/examples/multimodule/index.apt | 2 +-
.../apt/examples/multimodule/module-binary-inclusion-simple.apt.vm | 2 +-
.../apt/examples/multimodule/module-source-inclusion-simple.apt.vm | 2 +-
src/site/apt/examples/sharing-descriptors.apt.vm | 2 +-
.../apt/examples/single/filtering-some-distribution-files.apt.vm | 2 +-
src/site/apt/examples/single/including-and-excluding-artifacts.apt | 2 +-
src/site/apt/examples/single/index.apt | 2 +-
src/site/apt/examples/single/using-components.apt.vm | 2 +-
.../apt/examples/single/using-container-descriptor-handlers.apt.vm | 2 +-
src/site/apt/examples/single/using-repositories.apt.vm | 2 +-
src/site/apt/index.apt.vm | 7 +++++--
src/site/apt/usage.apt.vm | 4 ++--
src/site/fml/faq.fml | 6 +++---
src/site/site.xml | 4 ++--
src/site/xdoc/download.xml.vm | 6 +++---
25 files changed, 38 insertions(+), 35 deletions(-)
diff --git a/src/main/mdo/assembly-component.mdo b/src/main/mdo/assembly-component.mdo
index 4ba873c2..4cea4fdc 100644
--- a/src/main/mdo/assembly-component.mdo
+++ b/src/main/mdo/assembly-component.mdo
@@ -22,9 +22,9 @@
-->
<model xmlns="http://codehaus-plexus.github.io/MODELLO/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://codehaus-plexus.github.io/MODELLO/2.0.0 http://codehaus-plexus.github.io/modello/xsd/modello-2.0.0.xsd"
+ xsi:schemaLocation="https://codehaus-plexus.github.io/MODELLO/2.0.0 http://codehaus-plexus.github.io/modello/xsd/modello-2.0.0.xsd"
xml.namespace="http://maven.apache.org/ASSEMBLY-COMPONENT/${version}"
- xml.schemaLocation="http://maven.apache.org/xsd/assembly-component-${version}.xsd">
+ xml.schemaLocation="https://maven.apache.org/xsd/assembly-component-${version}.xsd">
<id>assembly-component</id>
<name>Component</name>
diff --git a/src/main/mdo/assembly.mdo b/src/main/mdo/assembly.mdo
index 225f1b1a..38b0bf66 100644
--- a/src/main/mdo/assembly.mdo
+++ b/src/main/mdo/assembly.mdo
@@ -24,9 +24,9 @@
-->
<model xmlns="http://codehaus-plexus.github.io/MODELLO/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://codehaus-plexus.github.io/MODELLO/2.0.0 http://codehaus-plexus.github.io/modello/xsd/modello-2.0.0.xsd"
+ xsi:schemaLocation="https://codehaus-plexus.github.io/MODELLO/2.0.0 http://codehaus-plexus.github.io/modello/xsd/modello-2.0.0.xsd"
xml.namespace="http://maven.apache.org/ASSEMBLY/${version}"
- xml.schemaLocation="http://maven.apache.org/xsd/assembly-${version}.xsd">
+ xml.schemaLocation="https://maven.apache.org/xsd/assembly-${version}.xsd">
<id>assembly</id>
<name>Assembly</name>
diff --git a/src/main/resources/assemblies/bin.xml b/src/main/resources/assemblies/bin.xml
index 943cb320..56d66bf8 100644
--- a/src/main/resources/assemblies/bin.xml
+++ b/src/main/resources/assemblies/bin.xml
@@ -21,7 +21,7 @@
<!-- START SNIPPET: bin -->
<assembly xmlns="http://maven.apache.org/ASSEMBLY/${mdoVersion}"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/${mdoVersion} http://maven.apache.org/xsd/assembly-${mdoVersion}.xsd">
+ xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/${mdoVersion} https://maven.apache.org/xsd/assembly-${mdoVersion}.xsd">
<id>bin</id>
<formats>
<format>tar.gz</format>
diff --git a/src/main/resources/assemblies/jar-with-dependencies.xml b/src/main/resources/assemblies/jar-with-dependencies.xml
index dcaaba06..3387ba9e 100644
--- a/src/main/resources/assemblies/jar-with-dependencies.xml
+++ b/src/main/resources/assemblies/jar-with-dependencies.xml
@@ -21,7 +21,7 @@
<!-- START SNIPPET: jar-with-dependencies -->
<assembly xmlns="http://maven.apache.org/ASSEMBLY/${mdoVersion}"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/${mdoVersion} http://maven.apache.org/xsd/assembly-${mdoVersion}.xsd">
+ xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/${mdoVersion} https://maven.apache.org/xsd/assembly-${mdoVersion}.xsd">
<!-- TODO: a jarjar format would be better -->
<id>jar-with-dependencies</id>
<formats>
diff --git a/src/main/resources/assemblies/project.xml b/src/main/resources/assemblies/project.xml
index 334bec1a..f8264a9b 100644
--- a/src/main/resources/assemblies/project.xml
+++ b/src/main/resources/assemblies/project.xml
@@ -21,7 +21,7 @@
<!-- START SNIPPET: project -->
<assembly xmlns="http://maven.apache.org/ASSEMBLY/${mdoVersion}"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/${mdoVersion} http://maven.apache.org/xsd/assembly-${mdoVersion}.xsd">
+ xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/${mdoVersion} https://maven.apache.org/xsd/assembly-${mdoVersion}.xsd">
<id>project</id>
<formats>
<format>tar.gz</format>
diff --git a/src/main/resources/assemblies/src.xml b/src/main/resources/assemblies/src.xml
index 4e85d6ad..172b2d74 100644
--- a/src/main/resources/assemblies/src.xml
+++ b/src/main/resources/assemblies/src.xml
@@ -20,7 +20,7 @@
<!-- START SNIPPET: src -->
<assembly xmlns="http://maven.apache.org/ASSEMBLY/${mdoVersion}"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/${mdoVersion} http://maven.apache.org/xsd/assembly-${mdoVersion}.xsd">
+ xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/${mdoVersion} https://maven.apache.org/xsd/assembly-${mdoVersion}.xsd">
<id>src</id>
<formats>
<format>tar.gz</format>
diff --git a/src/site/apt/advanced-descriptor-topics.apt.vm b/src/site/apt/advanced-descriptor-topics.apt.vm
index cca327f4..9af204e0 100644
--- a/src/site/apt/advanced-descriptor-topics.apt.vm
+++ b/src/site/apt/advanced-descriptor-topics.apt.vm
@@ -24,7 +24,7 @@
~~ under the License.
~~ NOTE: For help with the syntax of this file, see:
-~~ http://maven.apache.org/doxia/references/apt-format.html
+~~ https://maven.apache.org/doxia/references/apt-format.html
Advanced Assembly-Descriptor Topics
diff --git a/src/site/apt/advanced-module-set-topics.apt.vm b/src/site/apt/advanced-module-set-topics.apt.vm
index a57e593c..8683ce35 100644
--- a/src/site/apt/advanced-module-set-topics.apt.vm
+++ b/src/site/apt/advanced-module-set-topics.apt.vm
@@ -24,7 +24,7 @@
~~ under the License.
~~ NOTE: For help with the syntax of this file, see:
-~~ http://maven.apache.org/doxia/references/apt-format.html
+~~ https://maven.apache.org/doxia/references/apt-format.html
Advanced Module-Set Topics
diff --git a/src/site/apt/descriptor-refs.apt.vm b/src/site/apt/descriptor-refs.apt.vm
index 5cb43e0d..2da532c0 100644
--- a/src/site/apt/descriptor-refs.apt.vm
+++ b/src/site/apt/descriptor-refs.apt.vm
@@ -26,7 +26,7 @@
~~ under the License.
~~ NOTE: For help with the syntax of this file, see:
-~~ http://maven.apache.org/doxia/references/apt-format.html
+~~ https://maven.apache.org/doxia/references/apt-format.html
Pre-defined Descriptor Files
@@ -60,7 +60,7 @@ Pre-defined Descriptor Files
Note that <<<jar-with-dependencies>>> provides only basic support for uber-jars.
For more control, use the
- {{{http://maven.apache.org/plugins/maven-shade-plugin/} Maven Shade Plugin}}.
+ {{{https://maven.apache.org/plugins/maven-shade-plugin/} Maven Shade Plugin}}.
Below is the <<<jar-with-dependencies>>> descriptor format:
diff --git a/src/site/apt/examples/index.apt b/src/site/apt/examples/index.apt
index ac3c9f8c..a60998c1 100644
--- a/src/site/apt/examples/index.apt
+++ b/src/site/apt/examples/index.apt
@@ -24,7 +24,7 @@
~~ under the License.
~~ NOTE: For help with the syntax of this file, see:
-~~ http://maven.apache.org/doxia/references/apt-format.html
+~~ https://maven.apache.org/doxia/references/apt-format.html
Examples
diff --git a/src/site/apt/examples/multimodule/index.apt b/src/site/apt/examples/multimodule/index.apt
index a552c4d8..4536527c 100644
--- a/src/site/apt/examples/multimodule/index.apt
+++ b/src/site/apt/examples/multimodule/index.apt
@@ -25,7 +25,7 @@
~~ under the License.
~~ NOTE: For help with the syntax of this file, see:
-~~ http://maven.apache.org/doxia/references/apt-format.html
+~~ https://maven.apache.org/doxia/references/apt-format.html
Multi-Module Examples
diff --git a/src/site/apt/examples/multimodule/module-binary-inclusion-simple.apt.vm b/src/site/apt/examples/multimodule/module-binary-inclusion-simple.apt.vm
index bafa0171..caa27c29 100644
--- a/src/site/apt/examples/multimodule/module-binary-inclusion-simple.apt.vm
+++ b/src/site/apt/examples/multimodule/module-binary-inclusion-simple.apt.vm
@@ -24,7 +24,7 @@
~~ under the License.
~~ NOTE: For help with the syntax of this file, see:
-~~ http://maven.apache.org/doxia/references/apt-format.html
+~~ https://maven.apache.org/doxia/references/apt-format.html
Including Module Binaries
diff --git a/src/site/apt/examples/multimodule/module-source-inclusion-simple.apt.vm b/src/site/apt/examples/multimodule/module-source-inclusion-simple.apt.vm
index b5a8e243..14633f8a 100644
--- a/src/site/apt/examples/multimodule/module-source-inclusion-simple.apt.vm
+++ b/src/site/apt/examples/multimodule/module-source-inclusion-simple.apt.vm
@@ -24,7 +24,7 @@
~~ under the License.
~~ NOTE: For help with the syntax of this file, see:
-~~ http://maven.apache.org/doxia/references/apt-format.html
+~~ https://maven.apache.org/doxia/references/apt-format.html
Including Module Sources
diff --git a/src/site/apt/examples/sharing-descriptors.apt.vm b/src/site/apt/examples/sharing-descriptors.apt.vm
index e7bda5dc..d6b1d428 100644
--- a/src/site/apt/examples/sharing-descriptors.apt.vm
+++ b/src/site/apt/examples/sharing-descriptors.apt.vm
@@ -24,7 +24,7 @@
~~ under the License.
~~ NOTE: For help with the syntax of this file, see:
-~~ http://maven.apache.org/doxia/references/apt-format.html
+~~ https://maven.apache.org/doxia/references/apt-format.html
Sharing Assembly Descriptors
diff --git a/src/site/apt/examples/single/filtering-some-distribution-files.apt.vm b/src/site/apt/examples/single/filtering-some-distribution-files.apt.vm
index 93ce9f21..de9ec2a9 100644
--- a/src/site/apt/examples/single/filtering-some-distribution-files.apt.vm
+++ b/src/site/apt/examples/single/filtering-some-distribution-files.apt.vm
@@ -24,7 +24,7 @@
~~ under the License.
~~ NOTE: For help with the syntax of this file, see:
-~~ http://maven.apache.org/doxia/references/apt-format.html
+~~ https://maven.apache.org/doxia/references/apt-format.html
Filtering Some Distribution Files
diff --git a/src/site/apt/examples/single/including-and-excluding-artifacts.apt b/src/site/apt/examples/single/including-and-excluding-artifacts.apt
index 532d9991..33f9fddc 100644
--- a/src/site/apt/examples/single/including-and-excluding-artifacts.apt
+++ b/src/site/apt/examples/single/including-and-excluding-artifacts.apt
@@ -21,7 +21,7 @@
~~ limitations under the License.
~~ NOTE: For help with the syntax of this file, see:
-~~ http://maven.apache.org/doxia/references/apt-format.html
+~~ https://maven.apache.org/doxia/references/apt-format.html
Including and Excluding Artifacts
diff --git a/src/site/apt/examples/single/index.apt b/src/site/apt/examples/single/index.apt
index 3d104c18..eb9366d1 100644
--- a/src/site/apt/examples/single/index.apt
+++ b/src/site/apt/examples/single/index.apt
@@ -24,7 +24,7 @@
~~ under the License.
~~ NOTE: For help with the syntax of this file, see:
-~~ http://maven.apache.org/doxia/references/apt-format.html
+~~ https://maven.apache.org/doxia/references/apt-format.html
Single Project Examples
diff --git a/src/site/apt/examples/single/using-components.apt.vm b/src/site/apt/examples/single/using-components.apt.vm
index 5dcc171a..88c8b466 100644
--- a/src/site/apt/examples/single/using-components.apt.vm
+++ b/src/site/apt/examples/single/using-components.apt.vm
@@ -24,7 +24,7 @@
~~ under the License.
~~ NOTE: For help with the syntax of this file, see:
-~~ http://maven.apache.org/doxia/references/apt-format.html
+~~ https://maven.apache.org/doxia/references/apt-format.html
Using Component Descriptors
diff --git a/src/site/apt/examples/single/using-container-descriptor-handlers.apt.vm b/src/site/apt/examples/single/using-container-descriptor-handlers.apt.vm
index 8bcdcd2e..801a3998 100644
--- a/src/site/apt/examples/single/using-container-descriptor-handlers.apt.vm
+++ b/src/site/apt/examples/single/using-container-descriptor-handlers.apt.vm
@@ -24,7 +24,7 @@
~~ under the License.
~~ NOTE: For help with the syntax of this file, see:
-~~ http://maven.apache.org/doxia/references/apt-format.html
+~~ https://maven.apache.org/doxia/references/apt-format.html
Using Container Descriptor Handlers
diff --git a/src/site/apt/examples/single/using-repositories.apt.vm b/src/site/apt/examples/single/using-repositories.apt.vm
index a8dff5c2..5302a2b1 100644
--- a/src/site/apt/examples/single/using-repositories.apt.vm
+++ b/src/site/apt/examples/single/using-repositories.apt.vm
@@ -24,7 +24,7 @@
~~ under the License.
~~ NOTE: For help with the syntax of this file, see:
-~~ http://maven.apache.org/doxia/references/apt-format.html
+~~ https://maven.apache.org/doxia/references/apt-format.html
Using Repositories
diff --git a/src/site/apt/index.apt.vm b/src/site/apt/index.apt.vm
index 279f57b0..99970505 100644
--- a/src/site/apt/index.apt.vm
+++ b/src/site/apt/index.apt.vm
@@ -25,7 +25,7 @@
~~ under the License.
~~ NOTE: For help with the syntax of this file, see:
-~~ http://maven.apache.org/doxia/references/apt-format.html
+~~ https://maven.apache.org/doxia/references/apt-format.html
${project.name}
@@ -113,7 +113,10 @@ ${project.name}
* Assembly and Component Descriptor Schemas (XSD)
- * {{{/xsd/assembly-2.1.0.xsd}http://maven.apache.org/xsd/assembly-2.1.0.xsd}},
+ * {{{/xsd/assembly-2.1.1.xsd}https://maven.apache.org/xsd/assembly-2.1.1.xsd}},
+ {{{/xsd/assembly-component-2.1.1.xsd}https://maven.apache.org/xsd/assembly-component-2.1.1.xsd}} (for version 3.4.0 and higher)
+
+ * {{{/xsd/assembly-2.1.0.xsd}https://maven.apache.org/xsd/assembly-2.1.0.xsd}},
{{{/xsd/assembly-component-2.1.0.xsd}https://maven.apache.org/xsd/assembly-component-2.1.0.xsd}} (for version 3.2 and higher)
* {{{/xsd/assembly-2.0.0.xsd}https://maven.apache.org/xsd/assembly-2.0.0.xsd}},
diff --git a/src/site/apt/usage.apt.vm b/src/site/apt/usage.apt.vm
index 2c138baa..0dc3cfbf 100644
--- a/src/site/apt/usage.apt.vm
+++ b/src/site/apt/usage.apt.vm
@@ -24,7 +24,7 @@
~~ under the License.
~~ NOTE: For help with the syntax of this file, see:
-~~ http://maven.apache.org/doxia/references/apt-format.html
+~~ https://maven.apache.org/doxia/references/apt-format.html
Usage
@@ -251,7 +251,7 @@ Main-Class: org.sample.App
{{{./assembly.html}Assembly Descriptor}}
[[2]] For more information about <<<maven-archiver>>>, look
- {{{http://maven.apache.org/shared/maven-archiver/index.html}here}}.
+ {{{https://maven.apache.org/shared/maven-archiver/index.html}here}}.
[[3]] For more information on advanced <<<maven-assembly-plugin>>>
configuration, see the {{{./examples/index.html}examples}}.
diff --git a/src/site/fml/faq.fml b/src/site/fml/faq.fml
index 457d3e56..7514f18a 100644
--- a/src/site/fml/faq.fml
+++ b/src/site/fml/faq.fml
@@ -22,7 +22,7 @@ under the License.
<faqs xmlns="http://maven.apache.org/FML/1.0.1"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/FML/1.0.1 http://maven.apache.org/xsd/fml-1.0.1.xsd"
+ xsi:schemaLocation="http://maven.apache.org/FML/1.0.1 https://maven.apache.org/xsd/fml-1.0.1.xsd"
id="FAQ" title="Frequently Asked Questions">
<part id="General">
<faq id="deploy">
@@ -41,7 +41,7 @@ under the License.
<question>How do I use the Assembly Plugin to package my project's javadoc files?</question>
<answer>
<p>The Javadoc Plugin can generate the javadoc files of your projects. Also, the Javadoc Plugin can package them!</p>
- <p>Please see the <a href="http://maven.apache.org/plugins/maven-javadoc-plugin/">Javadoc Plugin Documentation</a>.</p>
+ <p>Please see the <a href="https://maven.apache.org/plugins/maven-javadoc-plugin/">Javadoc Plugin Documentation</a>.</p>
</answer>
</faq>
<faq id="inherit">
@@ -168,7 +168,7 @@ under the License.
<li>all system or maven properties available in your build with the syntax <code>${myProperty}</code>.</li>
<li>all environment variables with <code>${env.XXX}</code> where <code>XXX</code> is the environment variable.</li>
<li>the special <code>${dashClassifier?}</code> property (see above).</li>
- <li>all artifacts attributes (<a href="http://maven.apache.org/ref/3.0.4/maven-artifact/apidocs/org/apache/maven/artifact/Artifact.html"> from the Artifact class</a>) like :
+ <li>all artifacts attributes (<a href="https://maven.apache.org/ref/3.0.4/maven-artifact/apidocs/org/apache/maven/artifact/Artifact.html"> from the Artifact class</a>) like :
<ul>
<li><code>${artifact.groupId}</code> : The artifact groupId.</li>
<li><code>${artifact.artifactId}</code> : The artifact artifactId.</li>
diff --git a/src/site/site.xml b/src/site/site.xml
index 72c464e6..fa95d739 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -22,7 +22,7 @@ under the License.
<project xmlns="http://maven.apache.org/DECORATION/1.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0
- http://maven.apache.org/xsd/decoration-1.0.0.xsd">
+ https://maven.apache.org/xsd/decoration-1.0.0.xsd">
<body>
<menu name="Reference">
@@ -37,7 +37,7 @@ under the License.
<item name="Usage" href="./usage.html"/>
<item name="FAQ" href="./faq.html"/>
<!-- According to https://issues.apache.org/jira/browse/MNGSITE-152 -->
- <item name="License" href="http://www.apache.org/licenses/"/>
+ <item name="License" href="https://www.apache.org/licenses/"/>
<item name="Download" href="download.html"/>
</menu>
diff --git a/src/site/xdoc/download.xml.vm b/src/site/xdoc/download.xml.vm
index 3f710359..824fb821 100644
--- a/src/site/xdoc/download.xml.vm
+++ b/src/site/xdoc/download.xml.vm
@@ -33,11 +33,11 @@ under the License.
hours to reach all mirrors.<p/>
<p>In order to guard against corrupted downloads/installations, it is highly recommended to
- <a href="http://www.apache.org/dev/release-signing#verifying-signature">verify the signature</a>
+ <a href="https://www.apache.org/dev/release-signing#verifying-signature">verify the signature</a>
of the release bundles against the public <a href="https://www.apache.org/dist/maven/KEYS">KEYS</a> used by the Apache Maven
developers.</p>
- <p>${project.name} is distributed under the <a href="http://www.apache.org/licenses/">Apache License, version 2.0</a>.</p>
+ <p>${project.name} is distributed under the <a href="https://www.apache.org/licenses/">Apache License, version 2.0</a>.</p>
<p></p>We <b>strongly</b> encourage our users to configure a Maven repository mirror closer to their location, please read <a href="/guides/mini/guide-mirror-settings.html">How to Use Mirrors for Repositories</a>.</p>
@@ -117,7 +117,7 @@ under the License.
<subsection name="Previous Versions">
- <p>Older non-recommended releases can be found on our <a href="http://archive.apache.org/dist/maven/plugins/">archive site</a>.</p>
+ <p>Older non-recommended releases can be found on our <a href="https://archive.apache.org/dist/maven/plugins/">archive site</a>.</p>
</subsection>
</section>