Repository: maven Updated Branches: refs/heads/master cfaee84ad -> c7a4079de
updated urls (https, plexus) and license header formatting Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/c7a4079d Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/c7a4079d Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/c7a4079d Branch: refs/heads/master Commit: c7a4079de6f99307c559e6ab67cd2c4d51209638 Parents: cfaee84 Author: Hervé Boutemy <hbout...@apache.org> Authored: Sat May 28 13:28:23 2016 +0200 Committer: Hervé Boutemy <hbout...@apache.org> Committed: Sat May 28 13:28:23 2016 +0200 ---------------------------------------------------------------------- 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 ++--- .../maven/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(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/c7a4079d/README.md ---------------------------------------------------------------------- diff --git a/README.md b/README.md index 5f25a99..de283a2 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 http://git-wip-us.apache.org/repos/asf/maven/blob/c7a4079d/apache-maven/README.txt ---------------------------------------------------------------------- diff --git a/apache-maven/README.txt b/apache-maven/README.txt index 5d3a30a..827fdb7 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 --------- http://git-wip-us.apache.org/repos/asf/maven/blob/c7a4079d/apache-maven/pom.xml ---------------------------------------------------------------------- diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml index 2d00468..9405df8 100644 --- a/apache-maven/pom.xml +++ b/apache-maven/pom.xml @@ -1,19 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> - <!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to you under the Apache License, Version - 2.0 (the "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 Unless required by - applicable law or agreed to in writing, software distributed under - the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES - OR CONDITIONS OF ANY KIND, either express or implied. See the - License for the specific language governing permissions and - limitations under the License. - --> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/maven/blob/c7a4079d/apache-maven/src/conf/toolchains.xml ---------------------------------------------------------------------- diff --git a/apache-maven/src/conf/toolchains.xml b/apache-maven/src/conf/toolchains.xml index aefddd8..14ef3fe 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 http://git-wip-us.apache.org/repos/asf/maven/blob/c7a4079d/maven-artifact/pom.xml ---------------------------------------------------------------------- diff --git a/maven-artifact/pom.xml b/maven-artifact/pom.xml index c8a63b7..503e097 100644 --- a/maven-artifact/pom.xml +++ b/maven-artifact/pom.xml @@ -1,14 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> - <!-- - Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE - file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by - applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language - governing permissions and limitations under the License. - --> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/maven/blob/c7a4079d/maven-compat/pom.xml ---------------------------------------------------------------------- diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml index 0c219c1..f828d6e 100644 --- a/maven-compat/pom.xml +++ b/maven-compat/pom.xml @@ -1,14 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> - <!-- - Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE - file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by - applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language - governing permissions and limitations under the License. - --> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/maven/blob/c7a4079d/maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonManager.java ---------------------------------------------------------------------- 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 fb7ca8b..4337bb6 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 <a href="http://maven.apache.org/wagon";>Wagon</a> related operations in Maven. + * Manages <a href="https://maven.apache.org/wagon";>Wagon</a> related operations in Maven. * * @author <a href="michal.mac...@dimatics.com">Michal Maczka </a> */ http://git-wip-us.apache.org/repos/asf/maven/blob/c7a4079d/maven-core/pom.xml ---------------------------------------------------------------------- diff --git a/maven-core/pom.xml b/maven-core/pom.xml index f439651..30d91f0 100644 --- a/maven-core/pom.xml +++ b/maven-core/pom.xml @@ -1,14 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> - <!-- - Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE - file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by - applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language - governing permissions and limitations under the License. - --> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/maven/blob/c7a4079d/maven-core/src/main/java/org/apache/maven/AbstractMavenLifecycleParticipant.java ---------------------------------------------------------------------- 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 26c4667..01247ae 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 <a href="http://maven.apache.org/examples/maven-3-lifecycle-extensions.html";>example</a> + * @see <a href="https://maven.apache.org/examples/maven-3-lifecycle-extensions.html";>example</a> * @see <a href="https://issues.apache.org/jira/browse/MNG-4224";>MNG-4224</a> * @since 3.0-alpha-3 */ http://git-wip-us.apache.org/repos/asf/maven/blob/c7a4079d/maven-core/src/main/mdo/toolchains.mdo ---------------------------------------------------------------------- diff --git a/maven-core/src/main/mdo/toolchains.mdo b/maven-core/src/main/mdo/toolchains.mdo index 9b2aa90..4740d1b 100644 --- a/maven-core/src/main/mdo/toolchains.mdo +++ b/maven-core/src/main/mdo/toolchains.mdo @@ -124,9 +124,9 @@ <description> <![CDATA[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> ]]></description> <type>String</type> http://git-wip-us.apache.org/repos/asf/maven/blob/c7a4079d/maven-core/src/site/apt/index.apt ---------------------------------------------------------------------- diff --git a/maven-core/src/site/apt/index.apt b/maven-core/src/site/apt/index.apt index f6c26fd..61d1772 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 <<<DefaultClassRealmManager>>> 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}}, http://git-wip-us.apache.org/repos/asf/maven/blob/c7a4079d/maven-embedder/pom.xml ---------------------------------------------------------------------- diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml index 2cfa670..71dcf90 100644 --- a/maven-embedder/pom.xml +++ b/maven-embedder/pom.xml @@ -1,14 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> - <!-- - Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE - file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by - applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language - governing permissions and limitations under the License. - --> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/maven/blob/c7a4079d/maven-embedder/src/site/apt/logging.apt ---------------------------------------------------------------------- diff --git a/maven-embedder/src/site/apt/logging.apt b/maven-embedder/src/site/apt/logging.apt index cc9257d..477f4dc 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: http://git-wip-us.apache.org/repos/asf/maven/blob/c7a4079d/maven-model-builder/pom.xml ---------------------------------------------------------------------- diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml index d88ff78..b6ea3cd 100644 --- a/maven-model-builder/pom.xml +++ b/maven-model-builder/pom.xml @@ -1,14 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> - <!-- - Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE - file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by - applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language - governing permissions and limitations under the License. - --> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/maven/blob/c7a4079d/maven-model/src/main/java/org/apache/maven/model/io/xpp3/package-info.java ---------------------------------------------------------------------- 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 648607c..299193d 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 <code>maven.mdo</code> model. * These classes use - * <a href="http://plexus.codehaus.org/plexus-utils/apidocs/org/codehaus/plexus/util/xml/pull/package-summary.html";>plexus-utils' + * <a href="https://codehaus-plexus.github.io/plexus-utils/apidocs/org/codehaus/plexus/util/xml/pull/package-summary.html";>plexus-utils' * XML Pull Parser API</a> for their internal XML handling and - * <a href="http://plexus.codehaus.org/plexus-utils/apidocs/org/codehaus/plexus/util/xml/Xpp3DomBuilder.html";>Xpp3DomBuilder</a> + - * <a href="http://plexus.codehaus.org/plexus-utils/apidocs/org/codehaus/plexus/util/xml/Xpp3Dom.html";>Xpp3Dom</a> for + * <a href="https://codehaus-plexus.github.io/plexus-utils/apidocs/org/codehaus/plexus/util/xml/Xpp3DomBuilder.html";>Xpp3DomBuilder</a> + + * <a href="https://codehaus-plexus.github.io/plexus-utils/apidocs/org/codehaus/plexus/util/xml/Xpp3Dom.html";>Xpp3Dom</a> for * DOM content representation (see <code><configuration></code> elements). */ package org.apache.maven.model.io.xpp3; http://git-wip-us.apache.org/repos/asf/maven/blob/c7a4079d/maven-model/src/main/mdo/maven.mdo ---------------------------------------------------------------------- diff --git a/maven-model/src/main/mdo/maven.mdo b/maven-model/src/main/mdo/maven.mdo index 3f6b6d6..5eba3ea 100644 --- a/maven-model/src/main/mdo/maven.mdo +++ b/maven-model/src/main/mdo/maven.mdo @@ -54,8 +54,8 @@ <p>This is a reference for the Maven project descriptor used in Maven.</p> <p>An XSD is available at:</p> <ul> - <li><a href="http://maven.apache.org/xsd/maven-v3_0_0.xsd";>http://maven.apache.org/xsd/maven-v3_0_0.xsd</a> for Maven 1.1.</li> - <li><a href="http://maven.apache.org/xsd/maven-4.0.0.xsd";>http://maven.apache.org/xsd/maven-4.0.0.xsd</a> for Maven 2.0.</li> + <li><a href="https://maven.apache.org/xsd/maven-v3_0_0.xsd";>https://maven.apache.org/xsd/maven-v3_0_0.xsd</a> for Maven 1.1.</li> + <li><a href="https://maven.apache.org/xsd/maven-4.0.0.xsd";>https://maven.apache.org/xsd/maven-4.0.0.xsd</a> for Maven 2.0.</li> </ul> ]]> </description> @@ -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 <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. ]]> </description> @@ -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 - <a href="http://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html";>the + <a href="https://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html";>the dependency mechanism</a>. ]]> </description> @@ -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 - <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. ]]> </description> @@ -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 - <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 ]]> @@ -2642,8 +2642,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> ]]> </description> http://git-wip-us.apache.org/repos/asf/maven/blob/c7a4079d/maven-model/src/site/xdoc/navigation.xml ---------------------------------------------------------------------- diff --git a/maven-model/src/site/xdoc/navigation.xml b/maven-model/src/site/xdoc/navigation.xml deleted file mode 100644 index 110a953..0000000 --- a/maven-model/src/site/xdoc/navigation.xml +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> -<project name="Project Descriptor"> - <title>Project Descriptor</title> - <body> - <breadcrumbs> - <item name="Apache" href="http://www.apache.org"; /> - <item name="Maven" href="http://maven.apache.org/"; /> - <item name="Maven 1.x" href="http://maven.apache.org/maven-1.x/"; /> - <item name="Reference" href="http://maven.apache.org/maven-1.x/reference/index.html"; /> - </breadcrumbs> - <menu name="Maven Project Descriptor"> - <item name="About" href="/index.html" /> - <item name="Model Documentation" href="/maven.html" /> - <item name="API Docs" href="/apidocs/" target="_blank" /> - </menu> - </body> -</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/maven/blob/c7a4079d/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractMojo.java ---------------------------------------------------------------------- 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 d33e9bf..43fffb5 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 * <code>${executedProject}</code> expression if required. An alternate lifecycle can also be provided: * for more information see the documentation on the - * <a href="http://maven.apache.org/guides/introduction/introduction-to-the-lifecycle.html"; + * <a href="https://maven.apache.org/guides/introduction/introduction-to-the-lifecycle.html"; * target="_blank">build lifecycle</a>. * </td> * </tr> @@ -133,9 +133,9 @@ import org.apache.maven.plugin.logging.SystemStreamLog; * </tr> * </table> * - * @see <a href="http://maven.apache.org/guides/plugin/guide-java-plugin-development.html"; target="_blank">Guide to Developing Java Plugins</a> - * @see <a href="http://maven.apache.org/guides/mini/guide-configuring-plugins.html"; target="_blank">Guide to Configuring Plug-ins</a> - * @see <a href="http://maven.apache.org/developers/mojo-api-specification.html"; target="_blank">Mojo API Specification</a> + * @see <a href="https://maven.apache.org/guides/plugin/guide-java-plugin-development.html"; target="_blank">Guide to Developing Java Plugins</a> + * @see <a href="https://maven.apache.org/guides/mini/guide-configuring-plugins.html"; target="_blank">Guide to Configuring Plug-ins</a> + * @see <a href="https://maven.apache.org/developers/mojo-api-specification.html"; target="_blank">Mojo API Specification</a> * * @author <a href="mailto:br...@apache.org";>Brett Porter</a> * @author jdcasey http://git-wip-us.apache.org/repos/asf/maven/blob/c7a4079d/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java ---------------------------------------------------------------------- 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 697d95a..515b110 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. * <br/> * For more information about the usage tag, have a look to: - * <a href="http://maven.apache.org/developers/mojo-api-specification.html";> - * http://maven.apache.org/developers/mojo-api-specification.html</a> + * <a href="https://maven.apache.org/developers/mojo-api-specification.html";> + * https://maven.apache.org/developers/mojo-api-specification.html</a> * * @todo is there a need for the delegation of MavenMojoDescriptor to this? * Why not just extend ComponentDescriptor here? http://git-wip-us.apache.org/repos/asf/maven/blob/c7a4079d/maven-settings/src/main/mdo/settings.mdo ---------------------------------------------------------------------- diff --git a/maven-settings/src/main/mdo/settings.mdo b/maven-settings/src/main/mdo/settings.mdo index 6fbc92b..ba2b97e 100644 --- a/maven-settings/src/main/mdo/settings.mdo +++ b/maven-settings/src/main/mdo/settings.mdo @@ -33,7 +33,7 @@ <p>The default location for the settings file is <i>~/.m2/settings.xml</i></p> <p>An XSD is available at:</p> <ul> - <li><a href="http://maven.apache.org/xsd/settings-1.0.0.xsd";>http://maven.apache.org/xsd/settings-1.0.0.xsd</a>.</li> + <li><a href="https://maven.apache.org/xsd/settings-1.0.0.xsd";>https://maven.apache.org/xsd/settings-1.0.0.xsd</a>.</li> </ul> ]]> </description> http://git-wip-us.apache.org/repos/asf/maven/blob/c7a4079d/maven-settings/src/site/apt/index.apt ---------------------------------------------------------------------- diff --git a/maven-settings/src/site/apt/index.apt b/maven-settings/src/site/apt/index.apt index 6e404e8..17eaf8c 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}} http://git-wip-us.apache.org/repos/asf/maven/blob/c7a4079d/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index cb5223c..316d00c 100644 --- a/pom.xml +++ b/pom.xml @@ -1,18 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to you under the Apache License, Version - 2.0 (the "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 Unless required by - applicable law or agreed to in writing, software distributed under - the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES - OR CONDITIONS OF ANY KIND, either express or implied. See the - License for the specific language governing permissions and - limitations under the License. +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> @@ -38,7 +42,7 @@ number of other development tools for reporting or the build process. </description> - <url>http://maven.apache.org/ref/${project.version}/</url> + <url>https://maven.apache.org/ref/${project.version}/</url> <inceptionYear>2001</inceptionYear> <properties> @@ -103,7 +107,7 @@ <url>https://builds.apache.org/job/maven-3.x/</url> </ciManagement> <distributionManagement> - <downloadUrl>http://maven.apache.org/download.html</downloadUrl> + <downloadUrl>https://maven.apache.org/download.html</downloadUrl> <site> <id>apache.website</id> <url>scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/components/${maven.site.path}</url> @@ -618,7 +622,7 @@ <quiet>true</quiet> <links combine.children="append"> <link>http://download.eclipse.org/aether/aether-core/${aetherVersion}/apidocs/</link> - <link>http://plexus.codehaus.org/plexus-containers/plexus-container-default/apidocs/</link> + <link>https://codehaus-plexus.github.io/plexus-containers/plexus-container-default/apidocs/</link> </links> </configuration> <reportSets> http://git-wip-us.apache.org/repos/asf/maven/blob/c7a4079d/src/site/site.xml ---------------------------------------------------------------------- diff --git a/src/site/site.xml b/src/site/site.xml index bcc6103..321eef3 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -25,11 +25,11 @@ under the License. <bannerLeft> <name>${project.name}</name> - <src>http://maven.apache.org/images/apache-maven-project.png</src> - <href>http://maven.apache.org/</href> + <src>https://maven.apache.org/images/apache-maven-project.png</src> + <href>https://maven.apache.org/</href> </bannerLeft> <bannerRight> - <src>http://maven.apache.org/images/maventxt_logo_200.gif</src> + <src>https://maven.apache.org/images/maventxt_logo_200.gif</src> </bannerRight> <skin> http://git-wip-us.apache.org/repos/asf/maven/blob/c7a4079d/src/site/xdoc/index.xml ---------------------------------------------------------------------- diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml index 201fd4c..fb4b40f 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 <a href="./maven-model/maven.html">the <code>pom.xml</code> declarative file</a>. Maven can be extended by - <a href="http://maven.apache.org/plugins/";>plugins</a> to utilise a + <a href="https://maven.apache.org/plugins/";>plugins</a> to utilise a number of other development tools for reporting or the build process.</p> @@ -56,14 +56,14 @@ <area shape="rect" coords="388,284,521,319" alt="maven-model-builder" href="maven-model-builder/" /> <area shape="rect" coords="409,342,500,378" alt="maven-model" href="maven-model/" /> <area shape="rect" coords="551,58,707,94" alt="commons-cli" href="http://commons.apache.org/cli/"; /> - <area shape="rect" coords="551,116,739,152" alt="wagon-provider-api" href="http://maven.apache.org/wagon/wagon-provider-api/"; /> + <area shape="rect" coords="551,116,739,152" alt="wagon-provider-api" href="https://maven.apache.org/wagon/wagon-provider-api/"; /> <area shape="rect" coords="550,175,690,211" alt="plexus-sec-dispatcher" href="https://github.com/codehaus-plexus/plexus-sec-dispatcher"; /> - <area shape="rect" coords="581,230,660,265" alt="plexus-cipher" href="hhttps://github.com/codehaus-plexus/plexus-cipher"; /> - <area shape="rect" coords="551,284,707,320" alt="plexus-interpolation" href="https://github.com/codehaus-plexus/plexus-interpolation"; /> - <area shape="rect" coords="551,359,776,395" alt="plexus-component-annotations" href="https://github.com/codehaus-plexus/plexus-containers"; /> - <area shape="rect" coords="550,401,682,437" alt="plexus-classworlds" href="https://github.com/codehaus-plexus/plexus-classworlds"; /> - <area shape="rect" coords="685,455,775,491" alt="plexus-utils" href="https://github.com/codehaus-plexus/plexus-utils"; /> - <area shape="rect" coords="542,167,783,502" alt="plexus" href="https://github.com/codehaus-plexus"; /> + <area shape="rect" coords="581,230,660,265" alt="plexus-cipher" href="https://github.com/codehaus-plexus/plexus-cipher"; /> + <area shape="rect" coords="551,284,707,320" alt="plexus-interpolation" href="https://codehaus-plexus.github.io/plexus-interpolation"; /> + <area shape="rect" coords="551,359,776,395" alt="plexus-component-annotations" href="https://codehaus-plexus.github.io/plexus-containers"; /> + <area shape="rect" coords="550,401,682,437" alt="plexus-classworlds" href="https://codehaus-plexus.github.io/plexus-classworlds"; /> + <area shape="rect" coords="685,455,775,491" alt="plexus-utils" href="https://codehaus-plexus.github.io/plexus-utils"; /> + <area shape="rect" coords="542,167,783,502" alt="plexus" href="https://codehaus-plexus.github.io/"; /> <area shape="rect" coords="68,338,240,482" alt="aether" href="http://www.eclipse.org/projects/project_summary.php?projectid=technology.aether"; /> <area shape="rect" coords="401,393,509,524" alt="sisu" href="http://www.eclipse.org/projects/project_summary.php?projectid=technology.sisu"; /> <area shape="rect" coords="416,543,493,577" alt="guice" href="http://code.google.com/p/google-guice/"; />
