From 84085c0a9ce4febee8be124fe61f02cd40185d20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Boutemy?= Date: Sat, 28 May 2016 13:28:23 +0200 Subject: [PATCH] updated urls (https, plexus) and license header formatting --- README.md | 6 ++-- apache-maven/README.txt | 6 ++-- apache-maven/pom.xml | 32 +++++++++-------- apache-maven/src/conf/toolchains.xml | 2 +- maven-artifact/pom.xml | 27 +++++++++----- maven-compat/pom.xml | 27 +++++++++----- .../maven/artifact/manager/WagonManager.java | 2 +- maven-core/pom.xml | 27 +++++++++----- .../AbstractMavenLifecycleParticipant.java | 2 +- maven-core/src/main/mdo/toolchains.mdo | 4 +-- maven-core/src/site/apt/index.apt | 2 +- maven-embedder/pom.xml | 27 +++++++++----- maven-embedder/src/site/apt/logging.apt | 6 ++-- maven-model-builder/pom.xml | 27 +++++++++----- .../maven/model/io/xpp3/package-info.java | 6 ++-- maven-model/src/main/mdo/maven.mdo | 20 +++++------ maven-model/src/site/xdoc/navigation.xml | 35 ------------------- .../org/apache/maven/plugin/AbstractMojo.java | 8 ++--- .../plugin/descriptor/MojoDescriptor.java | 4 +-- maven-settings/src/main/mdo/settings.mdo | 2 +- maven-settings/src/site/apt/index.apt | 2 +- pom.xml | 34 ++++++++++-------- src/site/site.xml | 6 ++-- src/site/xdoc/index.xml | 16 ++++----- 24 files changed, 174 insertions(+), 156 deletions(-) delete mode 100644 maven-model/src/site/xdoc/navigation.xml diff --git a/README.md b/README.md index 7a5ed4dfba..33a4be48ce 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ # Maven -Maven is available under the [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) +Maven is available under the [Apache License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt) - [Maven Issue Tracker](https://issues.apache.org/jira/browse/MNG) - [Maven Wiki](https://cwiki.apache.org/confluence/display/MAVEN/Index) -- [Building Maven](http://maven.apache.org/guides/development/guide-building-maven.html) -- [Running Core ITs](http://maven.apache.org/core-its/core-it-suite/) +- [Building Maven](https://maven.apache.org/guides/development/guide-building-maven.html) +- [Running Core ITs](https://maven.apache.org/core-its/core-it-suite/) ## Bootstrapping Basics diff --git a/apache-maven/README.txt b/apache-maven/README.txt index cbaa7d4b73..6a1bafd974 100644 --- a/apache-maven/README.txt +++ b/apache-maven/README.txt @@ -11,12 +11,12 @@ Documentation ------------- - The most up-to-date documentation can be found at http://maven.apache.org/. + The most up-to-date documentation can be found at https://maven.apache.org/. Release Notes ------------- - The full list of changes can be found at http://maven.apache.org/docs/history.html. + The full list of changes can be found at https://maven.apache.org/docs/history.html. System Requirements ------------------- @@ -59,7 +59,7 @@ 5) Run "mvn --version" to verify that it is correctly installed. - For complete documentation, see http://maven.apache.org/download.html#Installation + For complete documentation, see https://maven.apache.org/download.html#Installation Licensing --------- diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml index b2fa989cb4..ba7fda3943 100644 --- a/apache-maven/pom.xml +++ b/apache-maven/pom.xml @@ -1,19 +1,23 @@ - + 4.0.0 diff --git a/apache-maven/src/conf/toolchains.xml b/apache-maven/src/conf/toolchains.xml index b737c179bd..b2630723e7 100644 --- a/apache-maven/src/conf/toolchains.xml +++ b/apache-maven/src/conf/toolchains.xml @@ -63,7 +63,7 @@ under the License. | Look for documentation of the toolchains-aware plugin which configuration elements | can be used. | - | See also http://maven.apache.org/guides/mini/guide-using-toolchains.html + | See also https://maven.apache.org/guides/mini/guide-using-toolchains.html | | General example diff --git a/maven-artifact/pom.xml b/maven-artifact/pom.xml index e024c6580c..e3943c9882 100644 --- a/maven-artifact/pom.xml +++ b/maven-artifact/pom.xml @@ -1,14 +1,23 @@ - + 4.0.0 diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml index 138f013ee6..3a0a45c2bb 100644 --- a/maven-compat/pom.xml +++ b/maven-compat/pom.xml @@ -1,14 +1,23 @@ - + 4.0.0 diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonManager.java b/maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonManager.java index fb7ca8b63d..4337bb6109 100644 --- a/maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonManager.java +++ b/maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonManager.java @@ -29,7 +29,7 @@ import org.apache.maven.wagon.authentication.AuthenticationInfo; import org.apache.maven.wagon.proxy.ProxyInfo; /** - * Manages Wagon related operations in Maven. + * Manages Wagon related operations in Maven. * * @author Michal Maczka */ diff --git a/maven-core/pom.xml b/maven-core/pom.xml index efff5c11da..d147dd88bf 100644 --- a/maven-core/pom.xml +++ b/maven-core/pom.xml @@ -1,14 +1,23 @@ - + 4.0.0 diff --git a/maven-core/src/main/java/org/apache/maven/AbstractMavenLifecycleParticipant.java b/maven-core/src/main/java/org/apache/maven/AbstractMavenLifecycleParticipant.java index 26c4667cfe..01247aec18 100644 --- a/maven-core/src/main/java/org/apache/maven/AbstractMavenLifecycleParticipant.java +++ b/maven-core/src/main/java/org/apache/maven/AbstractMavenLifecycleParticipant.java @@ -27,7 +27,7 @@ import org.apache.maven.execution.MavenSession; * All callback methods (will) follow beforeXXX/afterXXX naming pattern to * indicate at what lifecycle point it is being called. * - * @see example + * @see example * @see MNG-4224 * @since 3.0-alpha-3 */ diff --git a/maven-core/src/main/mdo/toolchains.mdo b/maven-core/src/main/mdo/toolchains.mdo index 9b2aa904db..4740d1b96c 100644 --- a/maven-core/src/main/mdo/toolchains.mdo +++ b/maven-core/src/main/mdo/toolchains.mdo @@ -124,9 +124,9 @@
  • jdk for - JDK Standard Toolchain,
    • + JDK Standard Toolchain,
  • other value for - Custom Toolchain
    • + Custom Toolchain ]]>     String diff --git a/maven-core/src/site/apt/index.apt b/maven-core/src/site/apt/index.apt index f6c26fde55..61d1772708 100644 --- a/maven-core/src/site/apt/index.apt +++ b/maven-core/src/site/apt/index.apt @@ -51,7 +51,7 @@ Maven Core ({{{./apidocs/org/apache/maven/classrealm/ClassRealmManager.html}javadoc}}), with its <<>> implementation ({{{./xref/org/apache/maven/classrealm/DefaultClassRealmManager.html}source}}), using - {{{http://plexus.codehaus.org/plexus-classworlds/}Plexus Classworlds}}, + {{{https://codehaus-plexus.github.io/plexus-classworlds/}Plexus Classworlds}}, * {{{./extension.html}extension descriptor}}, diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml index 04b8da6f29..75b92c9ec5 100644 --- a/maven-embedder/pom.xml +++ b/maven-embedder/pom.xml @@ -1,14 +1,23 @@ - + 4.0.0 diff --git a/maven-embedder/src/site/apt/logging.apt b/maven-embedder/src/site/apt/logging.apt index d1eb53af6b..800857c4f2 100644 --- a/maven-embedder/src/site/apt/logging.apt +++ b/maven-embedder/src/site/apt/logging.apt @@ -31,10 +31,10 @@ Maven Logging * Logging API Maven uses - {{{http://plexus.codehaus.org/plexus-containers/plexus-container-default/apidocs/org/codehaus/plexus/logging/package-summary.html}Plexus + {{{https://codehaus-plexus.github.io/plexus-containers/plexus-container-default/apidocs/org/codehaus/plexus/logging/package-summary.html}Plexus Container logging API}}, like any other Plexus components, ie - {{{http://plexus.codehaus.org/plexus-containers/plexus-container-default/apidocs/org/codehaus/plexus/logging/LoggerManager.html}LoggerManager}} - / {{{http://plexus.codehaus.org/plexus-containers/plexus-container-default/apidocs/org/codehaus/plexus/logging/Logger.html}Logger}}. + {{{https://codehaus-plexus.github.io/plexus-containers/plexus-container-default/apidocs/org/codehaus/plexus/logging/LoggerManager.html}LoggerManager}} + / {{{https://codehaus-plexus.github.io/plexus-containers/plexus-container-default/apidocs/org/codehaus/plexus/logging/Logger.html}Logger}}. Starting with Maven 3.1.0: diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml index 0586648030..fbfd417657 100644 --- a/maven-model-builder/pom.xml +++ b/maven-model-builder/pom.xml @@ -1,14 +1,23 @@ - + 4.0.0 diff --git a/maven-model/src/main/java/org/apache/maven/model/io/xpp3/package-info.java b/maven-model/src/main/java/org/apache/maven/model/io/xpp3/package-info.java index 648607ce0f..299193da8c 100644 --- a/maven-model/src/main/java/org/apache/maven/model/io/xpp3/package-info.java +++ b/maven-model/src/main/java/org/apache/maven/model/io/xpp3/package-info.java @@ -2,10 +2,10 @@ /** * XML reader and writer classes for Maven POM, generated from maven.mdo model. * These classes use - * plexus-utils' + * plexus-utils' * XML Pull Parser API for their internal XML handling and - * Xpp3DomBuilder + - * Xpp3Dom for + * Xpp3DomBuilder + + * Xpp3Dom for * DOM content representation (see <configuration> elements). */ package org.apache.maven.model.io.xpp3; diff --git a/maven-model/src/main/mdo/maven.mdo b/maven-model/src/main/mdo/maven.mdo index 3f6b6d66f8..5eba3eab84 100644 --- a/maven-model/src/main/mdo/maven.mdo +++ b/maven-model/src/main/mdo/maven.mdo @@ -54,8 +54,8 @@

    This is a reference for the Maven project descriptor used in Maven.

    An XSD is available at:

    ]]> @@ -701,7 +701,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 the + See the dependency mechanism for more information. ]]> @@ -1397,7 +1397,7 @@ 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 - the + the dependency mechanism. ]]> @@ -2095,8 +2095,8 @@ The source control management system URL that describes the repository and how to connect to the repository. For more information, see the - URL format - and list of supported SCMs. + URL format + and list of supported SCMs. This connection is read-only. ]]> @@ -2139,8 +2139,8 @@ The source control management system URL that describes the repository and how to connect to the repository. For more information, see the - URL format - and list of supported SCMs. + URL format + and list of supported SCMs. This connection is read-only.
    Default value is: parent value [+ path adjustment] + artifactId ]]> @@ -2642,8 +2642,8 @@
  • combine.children: available values are merge (default) and append,
  • combine.self: available values are merge (default) and override.
    • -

    See POM Reference documentation and - Xpp3DomUtils +

    See POM Reference documentation and + Xpp3DomUtils for more information.

    ]]> diff --git a/maven-model/src/site/xdoc/navigation.xml b/maven-model/src/site/xdoc/navigation.xml deleted file mode 100644 index 110a953d81..0000000000 --- a/maven-model/src/site/xdoc/navigation.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - Project Descriptor - - - - - - - - - - - - - - \ No newline at end of file diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractMojo.java b/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractMojo.java index d33e9bfc3a..43fffb5be2 100644 --- a/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractMojo.java +++ b/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractMojo.java @@ -96,7 +96,7 @@ import org.apache.maven.plugin.logging.SystemStreamLog; * The execution of either will not affect the current project, but instead make available the * ${executedProject} expression if required. An alternate lifecycle can also be provided: * for more information see the documentation on the - * build lifecycle. * * @@ -133,9 +133,9 @@ import org.apache.maven.plugin.logging.SystemStreamLog; * * * - * @see Guide to Developing Java Plugins - * @see Guide to Configuring Plug-ins - * @see Mojo API Specification + * @see Guide to Developing Java Plugins + * @see Guide to Configuring Plug-ins + * @see Mojo API Specification * * @author Brett Porter * @author jdcasey diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java index 697d95a53d..515b1104a0 100644 --- a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java +++ b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java @@ -33,8 +33,8 @@ import org.codehaus.plexus.configuration.xml.XmlPlexusConfiguration; * The bean containing the Mojo descriptor. *
    * For more information about the usage tag, have a look to: - * - * http://maven.apache.org/developers/mojo-api-specification.html + * + * https://maven.apache.org/developers/mojo-api-specification.html * * @todo is there a need for the delegation of MavenMojoDescriptor to this? * Why not just extend ComponentDescriptor here? diff --git a/maven-settings/src/main/mdo/settings.mdo b/maven-settings/src/main/mdo/settings.mdo index 6d560cca59..7fa00de8b8 100644 --- a/maven-settings/src/main/mdo/settings.mdo +++ b/maven-settings/src/main/mdo/settings.mdo @@ -33,7 +33,7 @@

    The default location for the settings file is ~/.m2/settings.xml

    An XSD is available at:

    ]]> diff --git a/maven-settings/src/site/apt/index.apt b/maven-settings/src/site/apt/index.apt index 6e404e8362..17eaf8c8ce 100644 --- a/maven-settings/src/site/apt/index.apt +++ b/maven-settings/src/site/apt/index.apt @@ -33,4 +33,4 @@ Maven Settings Model * A {{{./settings.html}Descriptor Reference}} - * An {{{http://maven.apache.org/xsd/settings-1.0.0.xsd}XSD}} + * An {{{https://maven.apache.org/xsd/settings-1.0.0.xsd}XSD}} diff --git a/pom.xml b/pom.xml index fba262b16d..3f9ce4f57c 100644 --- a/pom.xml +++ b/pom.xml @@ -1,18 +1,22 @@ @@ -38,7 +42,7 @@ number of other development tools for reporting or the build process. - http://maven.apache.org/ref/${project.version}/ + https://maven.apache.org/ref/${project.version}/ 2001 @@ -105,7 +109,7 @@ https://builds.apache.org/job/maven-3.x/ - http://maven.apache.org/download.html + https://maven.apache.org/download.html apache.website scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/components/${maven.site.path} @@ -635,7 +639,7 @@ true http://download.eclipse.org/aether/aether-core/${aetherVersion}/apidocs/ - http://plexus.codehaus.org/plexus-containers/plexus-container-default/apidocs/ + https://codehaus-plexus.github.io/plexus-containers/plexus-container-default/apidocs/ diff --git a/src/site/site.xml b/src/site/site.xml index 86d5ecb422..6dd30a67ca 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -25,11 +25,11 @@ under the License. ${project.name} - http://maven.apache.org/images/apache-maven-project.png - http://maven.apache.org/ + https://maven.apache.org/images/apache-maven-project.png + https://maven.apache.org/ - http://maven.apache.org/images/maventxt_logo_200.gif + https://maven.apache.org/images/maventxt_logo_200.gif diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml index 11fa0dea46..4cd2f66ede 100644 --- a/src/site/xdoc/index.xml +++ b/src/site/xdoc/index.xml @@ -35,7 +35,7 @@ builds, dependency management, documentation creation, site publication, and distribution publication are all controlled from the pom.xml declarative file. Maven can be extended by - plugins to utilise a + plugins to utilise a number of other development tools for reporting or the build process.

    @@ -58,14 +58,14 @@ maven-slf4j-provider slf4j-api commons-cli - wagon-provider-api + wagon-provider-api plexus-sec-dispatcher - plexus-cipher - plexus-interpolation - plexus-component-annotations - plexus-classworlds - plexus-utils - plexus + plexus-cipher + plexus-interpolation + plexus-component-annotations + plexus-classworlds + plexus-utils + plexus aether sisu guice