From f4f2f7540666d8e14edb7419c621cea5b9aae7a9 Mon Sep 17 00:00:00 2001 From: Sylwester Lachiewicz Date: Sat, 16 Jul 2022 17:39:14 +0200 Subject: [PATCH] [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 +- .../multimodule/module-binary-inclusion-simple.apt.vm | 2 +- .../multimodule/module-source-inclusion-simple.apt.vm | 2 +- src/site/apt/examples/sharing-descriptors.apt.vm | 2 +- .../single/filtering-some-distribution-files.apt.vm | 2 +- .../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 +- .../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 4ba873c23..4cea4fdc4 100644 --- a/src/main/mdo/assembly-component.mdo +++ b/src/main/mdo/assembly-component.mdo @@ -22,9 +22,9 @@ --> + xml.schemaLocation="https://maven.apache.org/xsd/assembly-component-${version}.xsd"> assembly-component Component diff --git a/src/main/mdo/assembly.mdo b/src/main/mdo/assembly.mdo index 225f1b1a3..38b0bf66b 100644 --- a/src/main/mdo/assembly.mdo +++ b/src/main/mdo/assembly.mdo @@ -24,9 +24,9 @@ --> + xml.schemaLocation="https://maven.apache.org/xsd/assembly-${version}.xsd"> assembly Assembly diff --git a/src/main/resources/assemblies/bin.xml b/src/main/resources/assemblies/bin.xml index 943cb3208..56d66bf8a 100644 --- a/src/main/resources/assemblies/bin.xml +++ b/src/main/resources/assemblies/bin.xml @@ -21,7 +21,7 @@ + xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/${mdoVersion} https://maven.apache.org/xsd/assembly-${mdoVersion}.xsd"> bin tar.gz diff --git a/src/main/resources/assemblies/jar-with-dependencies.xml b/src/main/resources/assemblies/jar-with-dependencies.xml index dcaaba06a..3387ba9e8 100644 --- a/src/main/resources/assemblies/jar-with-dependencies.xml +++ b/src/main/resources/assemblies/jar-with-dependencies.xml @@ -21,7 +21,7 @@ + xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/${mdoVersion} https://maven.apache.org/xsd/assembly-${mdoVersion}.xsd"> jar-with-dependencies diff --git a/src/main/resources/assemblies/project.xml b/src/main/resources/assemblies/project.xml index 334bec1a3..f8264a9b6 100644 --- a/src/main/resources/assemblies/project.xml +++ b/src/main/resources/assemblies/project.xml @@ -21,7 +21,7 @@ + xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/${mdoVersion} https://maven.apache.org/xsd/assembly-${mdoVersion}.xsd"> project tar.gz diff --git a/src/main/resources/assemblies/src.xml b/src/main/resources/assemblies/src.xml index 4e85d6ad0..172b2d746 100644 --- a/src/main/resources/assemblies/src.xml +++ b/src/main/resources/assemblies/src.xml @@ -20,7 +20,7 @@ + xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/${mdoVersion} https://maven.apache.org/xsd/assembly-${mdoVersion}.xsd"> src tar.gz diff --git a/src/site/apt/advanced-descriptor-topics.apt.vm b/src/site/apt/advanced-descriptor-topics.apt.vm index cca327f4f..9af204e05 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 a57e593cd..8683ce358 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 5cb43e0dc..2da532c0d 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 <<>> 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 <<>> descriptor format: diff --git a/src/site/apt/examples/index.apt b/src/site/apt/examples/index.apt index ac3c9f8ce..a60998c10 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 a552c4d81..4536527c0 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 bafa01710..caa27c298 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 b5a8e243b..14633f8ac 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 e7bda5dc6..d6b1d428d 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 93ce9f21d..de9ec2a99 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 532d9991d..33f9fddc9 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 3d104c18a..eb9366d19 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 5dcc171a9..88c8b466a 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 8bcdcd2ef..801a3998f 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 a8dff5c25..5302a2b15 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 279f57b0b..999705055 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 2c138baa2..0dc3cfbf7 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 <<>>, 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 <<>> configuration, see the {{{./examples/index.html}examples}}. diff --git a/src/site/fml/faq.fml b/src/site/fml/faq.fml index 457d3e56e..7514f18ab 100644 --- a/src/site/fml/faq.fml +++ b/src/site/fml/faq.fml @@ -22,7 +22,7 @@ under the License. @@ -41,7 +41,7 @@ under the License. How do I use the Assembly Plugin to package my project's javadoc files?

The Javadoc Plugin can generate the javadoc files of your projects. Also, the Javadoc Plugin can package them!

-

Please see the Javadoc Plugin Documentation.

+

Please see the Javadoc Plugin Documentation.

 @@ -168,7 +168,7 @@ under the License.
  • all system or maven properties available in your build with the syntax ${myProperty}.
  • all environment variables with ${env.XXX} where XXX is the environment variable.
  • the special ${dashClassifier?} property (see above).
    • -
  • all artifacts attributes ( from the Artifact class) like : +
  • all artifacts attributes ( from the Artifact class) like :
    • ${artifact.groupId} : The artifact groupId.
    • ${artifact.artifactId} : The artifact artifactId.
      • diff --git a/src/site/site.xml b/src/site/site.xml index 72c464e63..fa95d7391 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -22,7 +22,7 @@ under the License. + https://maven.apache.org/xsd/decoration-1.0.0.xsd"> @@ -37,7 +37,7 @@ under the License. - + diff --git a/src/site/xdoc/download.xml.vm b/src/site/xdoc/download.xml.vm index 3f710359a..824fb8219 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.

      In order to guard against corrupted downloads/installations, it is highly recommended to - verify the signature + verify the signature of the release bundles against the public KEYS used by the Apache Maven developers.

      -

      ${project.name} is distributed under the Apache License, version 2.0.

      +

      ${project.name} is distributed under the Apache License, version 2.0.

      We strongly encourage our users to configure a Maven repository mirror closer to their location, please read How to Use Mirrors for Repositories.

      @@ -117,7 +117,7 @@ under the License. -

      Older non-recommended releases can be found on our archive site.

      +

      Older non-recommended releases can be found on our archive site.