Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

updated urls (https, plexus) and license header formatting

This commit is contained in:
Hervé Boutemy 2016-05-28 13:28:23 +02:00
parent bc07e74d3c
commit 84085c0a9c
24 changed files with 174 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -1,11 +1,11 @@
# Maven # 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 Issue Tracker](https://issues.apache.org/jira/browse/MNG)
- [Maven Wiki](https://cwiki.apache.org/confluence/display/MAVEN/Index) - [Maven Wiki](https://cwiki.apache.org/confluence/display/MAVEN/Index)
- [Building Maven](http://maven.apache.org/guides/development/guide-building-maven.html) - [Building Maven](https://maven.apache.org/guides/development/guide-building-maven.html)
- [Running Core ITs](http://maven.apache.org/core-its/core-it-suite/) - [Running Core ITs](https://maven.apache.org/core-its/core-it-suite/)
## Bootstrapping Basics ## Bootstrapping Basics

6
apache-maven/README.txt
View File

@ -11,12 +11,12 @@
Documentation 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 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 System Requirements
------------------- -------------------
@ -59,7 +59,7 @@
5) Run "mvn --version" to verify that it is correctly installed. 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 Licensing
--------- ---------

26
apache-maven/pom.xml
View File

@ -1,18 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
Licensed to the Apache Software Foundation (ASF) under one or more Licensed to the Apache Software Foundation (ASF) under one
contributor license agreements. See the NOTICE file distributed with or more contributor license agreements. See the NOTICE file
this work for additional information regarding copyright ownership. distributed with this work for additional information
The ASF licenses this file to you under the Apache License, Version regarding copyright ownership. The ASF licenses this file
2.0 (the "License"); you may not use this file except in compliance 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 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 http://www.apache.org/licenses/LICENSE-2.0
the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
OR CONDITIONS OF ANY KIND, either express or implied. See the Unless required by applicable law or agreed to in writing,
License for the specific language governing permissions and software distributed under the License is distributed on an
limitations under the License. "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"> <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">

2
apache-maven/src/conf/toolchains.xml
View File

@ -63,7 +63,7 @@ under the License.
| Look for documentation of the toolchains-aware plugin which configuration elements | Look for documentation of the toolchains-aware plugin which configuration elements
| can be used. | 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 | General example

23
maven-artifact/pom.xml
View File

@ -1,13 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE Licensed to the Apache Software Foundation (ASF) under one
file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file or more contributor license agreements. See the NOTICE file
to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with distributed with this work for additional information
the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by regarding copyright ownership. The ASF licenses this file
applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, to you under the Apache License, Version 2.0 (the
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language "License"); you may not use this file except in compliance
governing permissions and limitations under the License. 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"> <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">

23
maven-compat/pom.xml
View File

@ -1,13 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE Licensed to the Apache Software Foundation (ASF) under one
file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file or more contributor license agreements. See the NOTICE file
to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with distributed with this work for additional information
the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by regarding copyright ownership. The ASF licenses this file
applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, to you under the Apache License, Version 2.0 (the
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language "License"); you may not use this file except in compliance
governing permissions and limitations under the License. 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"> <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">

2
maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonManager.java
View File

@ -29,7 +29,7 @@
import org.apache.maven.wagon.proxy.ProxyInfo; 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.maczka@dimatics.com">Michal Maczka </a> * @author <a href="michal.maczka@dimatics.com">Michal Maczka </a>
*/ */

23
maven-core/pom.xml
View File

@ -1,13 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE Licensed to the Apache Software Foundation (ASF) under one
file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file or more contributor license agreements. See the NOTICE file
to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with distributed with this work for additional information
the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by regarding copyright ownership. The ASF licenses this file
applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, to you under the Apache License, Version 2.0 (the
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language "License"); you may not use this file except in compliance
governing permissions and limitations under the License. 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"> <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">

2
maven-core/src/main/java/org/apache/maven/AbstractMavenLifecycleParticipant.java
View File

@ -27,7 +27,7 @@
* All callback methods (will) follow beforeXXX/afterXXX naming pattern to * All callback methods (will) follow beforeXXX/afterXXX naming pattern to
* indicate at what lifecycle point it is being called. * 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> * @see <a href="https://issues.apache.org/jira/browse/MNG-4224">MNG-4224</a>
* @since 3.0-alpha-3 * @since 3.0-alpha-3
*/ */

4
maven-core/src/main/mdo/toolchains.mdo
View File

@ -124,9 +124,9 @@
<description> <description>
<![CDATA[Type of toolchain:<ul> <![CDATA[Type of toolchain:<ul>
<li><code>jdk</code> for <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 <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> </ul>
]]></description> ]]></description>
<type>String</type> <type>String</type>

2
maven-core/src/site/apt/index.apt
View File

@ -51,7 +51,7 @@ Maven Core
({{{./apidocs/org/apache/maven/classrealm/ClassRealmManager.html}javadoc}}), ({{{./apidocs/org/apache/maven/classrealm/ClassRealmManager.html}javadoc}}),
with its <<<DefaultClassRealmManager>>> implementation with its <<<DefaultClassRealmManager>>> implementation
({{{./xref/org/apache/maven/classrealm/DefaultClassRealmManager.html}source}}), using ({{{./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}}, * {{{./extension.html}extension descriptor}},

23
maven-embedder/pom.xml
View File

@ -1,13 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE Licensed to the Apache Software Foundation (ASF) under one
file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file or more contributor license agreements. See the NOTICE file
to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with distributed with this work for additional information
the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by regarding copyright ownership. The ASF licenses this file
applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, to you under the Apache License, Version 2.0 (the
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language "License"); you may not use this file except in compliance
governing permissions and limitations under the License. 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"> <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">

6
maven-embedder/src/site/apt/logging.apt
View File

@ -31,10 +31,10 @@ Maven Logging
* Logging API * Logging API
Maven uses 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 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}} {{{https://codehaus-plexus.github.io/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/Logger.html}Logger}}.
Starting with Maven 3.1.0: Starting with Maven 3.1.0:

23
maven-model-builder/pom.xml
View File

@ -1,13 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE Licensed to the Apache Software Foundation (ASF) under one
file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file or more contributor license agreements. See the NOTICE file
to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with distributed with this work for additional information
the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by regarding copyright ownership. The ASF licenses this file
applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, to you under the Apache License, Version 2.0 (the
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language "License"); you may not use this file except in compliance
governing permissions and limitations under the License. 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"> <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">

6
maven-model/src/main/java/org/apache/maven/model/io/xpp3/package-info.java
View File

@ -2,10 +2,10 @@
/** /**
* XML reader and writer classes for Maven POM, generated from <code>maven.mdo</code> model. * XML reader and writer classes for Maven POM, generated from <code>maven.mdo</code> model.
* These classes use * 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 * 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="https://codehaus-plexus.github.io/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/Xpp3Dom.html">Xpp3Dom</a> for
* DOM content representation (see <code>&lt;configuration&gt;</code> elements). * DOM content representation (see <code>&lt;configuration&gt;</code> elements).
*/ */
package org.apache.maven.model.io.xpp3; package org.apache.maven.model.io.xpp3;

20
maven-model/src/main/mdo/maven.mdo
View File

@ -54,8 +54,8 @@
<p>This is a reference for the Maven project descriptor used in Maven.</p> <p>This is a reference for the Maven project descriptor used in Maven.</p>
<p>An XSD is available at:</p> <p>An XSD is available at:</p>
<ul> <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="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="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-4.0.0.xsd">https://maven.apache.org/xsd/maven-4.0.0.xsd</a> for Maven 2.0.</li>
</ul> </ul>
]]> ]]>
</description> </description>
@ -701,7 +701,7 @@
These dependencies are used to construct a classpath for your These dependencies are used to construct a classpath for your
project during the build process. They are automatically downloaded from the project during the build process. They are automatically downloaded from the
repositories defined in this project. 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. dependency mechanism</a> for more information.
]]> ]]>
</description> </description>
@ -1397,7 +1397,7 @@
calculate the various classpaths used for compilation, testing, and so on. calculate the various classpaths used for compilation, testing, and so on.
It also assists in determining which artifacts to include in a distribution of It also assists in determining which artifacts to include in a distribution of
this project. For more information, see 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>. dependency mechanism</a>.
]]> ]]>
</description> </description>
@ -2095,8 +2095,8 @@
The source control management system URL The source control management system URL
that describes the repository and how to connect to the that describes the repository and how to connect to the
repository. For more information, see the repository. For more information, see the
<a href="http://maven.apache.org/scm/scm-url-format.html">URL format</a> <a href="https://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>. and <a href="https://maven.apache.org/scm/scms-overview.html">list of supported SCMs</a>.
This connection is read-only. This connection is read-only.
]]> ]]>
</description> </description>
@ -2139,8 +2139,8 @@
The source control management system URL The source control management system URL
that describes the repository and how to connect to the that describes the repository and how to connect to the
repository. For more information, see the repository. For more information, see the
<a href="http://maven.apache.org/scm/scm-url-format.html">URL format</a> <a href="https://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>. and <a href="https://maven.apache.org/scm/scms-overview.html">list of supported SCMs</a>.
This connection is read-only. This connection is read-only.
<br /><b>Default value is</b>: parent value [+ path adjustment] + artifactId <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.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> <li><code>combine.self</code>: available values are <code>merge</code> (default) and <code>override</code>.</li>
</ul> </ul>
<p>See <a href="http://maven.apache.org/pom.html#Plugins">POM Reference documentation</a> and <p>See <a href="https://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> <a href="https://codehaus-plexus.github.io/plexus-utils/apidocs/org/codehaus/plexus/util/xml/Xpp3DomUtils.html">Xpp3DomUtils</a>
for more information.</p> for more information.</p>
]]> ]]>
</description> </description>

35
maven-model/src/site/xdoc/navigation.xml
View File

@ -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>

8
maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractMojo.java
View File

@ -96,7 +96,7 @@
* The execution of either will not affect the current project, but instead make available the * 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: * <code>${executedProject}</code> expression if required. An alternate lifecycle can also be provided:
* for more information see the documentation on the * 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>. * target="_blank">build lifecycle</a>.
* </td> * </td>
* </tr> * </tr>
@ -133,9 +133,9 @@
* </tr> * </tr>
* </table> * </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="https://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="https://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/developers/mojo-api-specification.html" target="_blank">Mojo API Specification</a>
* *
* @author <a href="mailto:brett@apache.org">Brett Porter</a> * @author <a href="mailto:brett@apache.org">Brett Porter</a>
* @author jdcasey * @author jdcasey

4
maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java
View File

@ -33,8 +33,8 @@
* The bean containing the Mojo descriptor. * The bean containing the Mojo descriptor.
* <br/> * <br/>
* For more information about the usage tag, have a look to: * For more information about the usage tag, have a look to:
* <a href="http://maven.apache.org/developers/mojo-api-specification.html"> * <a href="https://maven.apache.org/developers/mojo-api-specification.html">
* http://maven.apache.org/developers/mojo-api-specification.html</a> * https://maven.apache.org/developers/mojo-api-specification.html</a>
* *
* @todo is there a need for the delegation of MavenMojoDescriptor to this? * @todo is there a need for the delegation of MavenMojoDescriptor to this?
* Why not just extend ComponentDescriptor here? * Why not just extend ComponentDescriptor here?

2
maven-settings/src/main/mdo/settings.mdo
View File

@ -33,7 +33,7 @@
<p>The default location for the settings file is <i>~/.m2/settings.xml</i></p> <p>The default location for the settings file is <i>~/.m2/settings.xml</i></p>
<p>An XSD is available at:</p> <p>An XSD is available at:</p>
<ul> <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> </ul>
]]> ]]>
</description> </description>

2
maven-settings/src/site/apt/index.apt
View File

@ -33,4 +33,4 @@ Maven Settings Model
* A {{{./settings.html}Descriptor Reference}} * 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}}

32
pom.xml
View File

@ -1,18 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
Licensed to the Apache Software Foundation (ASF) under one or more Licensed to the Apache Software Foundation (ASF) under one
contributor license agreements. See the NOTICE file distributed with or more contributor license agreements. See the NOTICE file
this work for additional information regarding copyright ownership. distributed with this work for additional information
The ASF licenses this file to you under the Apache License, Version regarding copyright ownership. The ASF licenses this file
2.0 (the "License"); you may not use this file except in compliance 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 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 http://www.apache.org/licenses/LICENSE-2.0
the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
OR CONDITIONS OF ANY KIND, either express or implied. See the Unless required by applicable law or agreed to in writing,
License for the specific language governing permissions and software distributed under the License is distributed on an
limitations under the License. "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"> <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 number of other development tools for reporting or the build
process. process.
</description> </description>
<url>http://maven.apache.org/ref/${project.version}/</url> <url>https://maven.apache.org/ref/${project.version}/</url>
<inceptionYear>2001</inceptionYear> <inceptionYear>2001</inceptionYear>
<properties> <properties>
@ -105,7 +109,7 @@
<url>https://builds.apache.org/job/maven-3.x/</url> <url>https://builds.apache.org/job/maven-3.x/</url>
</ciManagement> </ciManagement>
<distributionManagement> <distributionManagement>
<downloadUrl>http://maven.apache.org/download.html</downloadUrl> <downloadUrl>https://maven.apache.org/download.html</downloadUrl>
<site> <site>
<id>apache.website</id> <id>apache.website</id>
<url>scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/components/${maven.site.path}</url> <url>scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/components/${maven.site.path}</url>
@ -635,7 +639,7 @@
<quiet>true</quiet> <quiet>true</quiet>
<links combine.children="append"> <links combine.children="append">
<link>http://download.eclipse.org/aether/aether-core/${aetherVersion}/apidocs/</link> <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> </links>
</configuration> </configuration>
<reportSets> <reportSets>

6
src/site/site.xml
View File

@ -25,11 +25,11 @@ under the License.
<bannerLeft> <bannerLeft>
<name>${project.name}</name> <name>${project.name}</name>
<src>http://maven.apache.org/images/apache-maven-project.png</src> <src>https://maven.apache.org/images/apache-maven-project.png</src>
<href>http://maven.apache.org/</href> <href>https://maven.apache.org/</href>
</bannerLeft> </bannerLeft>
<bannerRight> <bannerRight>
<src>http://maven.apache.org/images/maventxt_logo_200.gif</src> <src>https://maven.apache.org/images/maventxt_logo_200.gif</src>
</bannerRight> </bannerRight>
<skin> <skin>

16
src/site/xdoc/index.xml
View File

@ -35,7 +35,7 @@
builds, dependency management, documentation creation, site builds, dependency management, documentation creation, site
publication, and distribution publication are all controlled from 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="./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 number of other development tools for reporting or the build
process.</p> process.</p>
@ -58,14 +58,14 @@
<area shape="rect" coords="TODO" alt="maven-slf4j-provider" href="maven-slf4j-provider/" /> <area shape="rect" coords="TODO" alt="maven-slf4j-provider" href="maven-slf4j-provider/" />
<area shape="rect" coords="88,59,192,94" alt="slf4j-api" href="http://www.slf4j.org/manual.html" /> <area shape="rect" coords="88,59,192,94" alt="slf4j-api" href="http://www.slf4j.org/manual.html" />
<area shape="rect" coords="551,58,707,94" alt="commons-cli" href="http://commons.apache.org/cli/" /> <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="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="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://github.com/codehaus-plexus/plexus-interpolation" /> <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://github.com/codehaus-plexus/plexus-containers" /> <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://github.com/codehaus-plexus/plexus-classworlds" /> <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://github.com/codehaus-plexus/plexus-utils" /> <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://github.com/codehaus-plexus" /> <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="68,338,240,482" alt="aether" href="http://www.eclipse.org/projects/project_summary.php?projectid=technology.aether" />
<area shape="rect" coords="388,393,520,594" alt="sisu" href="http://www.eclipse.org/projects/project_summary.php?projectid=technology.sisu" /> <area shape="rect" coords="388,393,520,594" alt="sisu" href="http://www.eclipse.org/projects/project_summary.php?projectid=technology.sisu" />
<area shape="rect" coords="519,518,621,554" alt="guice" href="http://code.google.com/p/google-guice/" /> <area shape="rect" coords="519,518,621,554" alt="guice" href="http://code.google.com/p/google-guice/" />