Modified: websites/staging/maven/trunk/content/guides/mini/guide-maven-evangelism.html ============================================================================== --- websites/staging/maven/trunk/content/guides/mini/guide-maven-evangelism.html (original) +++ websites/staging/maven/trunk/content/guides/mini/guide-maven-evangelism.html Sun May 1 15:34:27 2016 @@ -1,7 +1,7 @@ <!DOCTYPE html> <!-- - | Generated by Apache Maven Doxia at 2016-05-01 - | Rendered using Apache Maven Fluido Skin 1.4 + | Generated by Apache Maven Doxia Site Renderer 1.7.1 at 2016-05-01 + | Rendered using Apache Maven Fluido Skin 1.5 --> <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"> <head> @@ -12,22 +12,19 @@ <meta name="Date-Revision-yyyymmdd" content="20160501" /> <meta http-equiv="Content-Language" content="en" /> <title>Maven – Guide to Maven Evangelism</title> - <link rel="stylesheet" href="../../css/apache-maven-fluido-1.4.min.css" /> + <link rel="stylesheet" href="../../css/apache-maven-fluido-1.5.min.css" /> <link rel="stylesheet" href="../../css/site.css" /> <link rel="stylesheet" href="../../css/print.css" media="print" /> - <script type="text/javascript" src="../../js/apache-maven-fluido-1.4.min.js"></script> + <script type="text/javascript" src="../../js/apache-maven-fluido-1.5.min.js"></script> - - -<script src="https://www.google-analytics.com/urchin.js"; type="text/javascript"></script> - - -<script type="text/javascript">_uacct = "UA-140879-1"; - urchinTracker();</script> - - </head> + <script src="https://www.google-analytics.com/urchin.js"; type="text/javascript"></script> + <script type="text/javascript"> + _uacct = "UA-140879-1"; + urchinTracker(); + </script> + </head> <body class="topBarDisabled"> @@ -37,7 +34,7 @@ <div id="banner"> <div class="pull-left"> <a href="http://www.apache.org/"; id="bannerLeft"> - <img src="../../images/apache-maven-project.png" alt="Apache Maven"/> + <img src="../../images/apache-maven-project.png" alt="Apache Maven Site"/> </a> </div> <div class="pull-right"> <a href="../.././" id="bannerRight"> @@ -49,8 +46,7 @@ <div id="breadcrumbs"> <ul class="breadcrumb"> - - + <li class=""> <a href="http://www.apache.org/"; class="externalLink" title="Apache"> Apache</a> @@ -63,8 +59,7 @@ </li> <li class="active ">Guide to Maven Evangelism</li> - - + <li id="publishDate" class="pull-right">Last Published: 2016-05-01</li> </ul> @@ -74,8 +69,7 @@ <div class="row-fluid"> <div id="leftColumn" class="span2"> <div class="well sidebar-nav"> - - + <ul class="nav nav-list"> <li class="nav-header">Main</li> @@ -412,14 +406,13 @@ Thanks</a> </li> </ul> - - + <form id="search-form" action="https://www.google.com/search"; method="get" > <input value="https://maven.apache.org"; name="sitesearch" type="hidden"/> <input class="search-query" name="q" id="query" type="text" /> </form> -<script type="text/javascript" src="https://www.google.com/coop/cse/brand?form=search-form";></script> +<script type="text/javascript" src="https://cse.google.com/brand?form=search-form";></script> <hr /> @@ -444,7 +437,7 @@ <div id="bodyColumn" class="span10" > - <!-- 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. --><!-- NOTE: For help with the syntax of this file, see: --><!-- http://maven.apache.org/doxia/references/ apt-format.html --><div class="section"> + <div class="section"> <h2><a name="Guide_to_add_improve_or_fix_metadata_in_the_Central_Maven_2_repository"></a>Guide to add, improve or fix metadata in the Central Maven 2 repository</h2> <p>There are artifacts in the repository that don't have POMs. They come from projects with repositories that have been synced into central without extra checks (particularly historical ones that were in Maven 1 format). We know about the problems but can't do anything unless you provide a POM for it or you ask the project in question to add the POM when they add the artifacts.</p> <p>We don't change dependencies in POMs already in the repository anymore as builds need to be reproducible. Same applies to POMs that don't exist. We can only add a POM with no dependencies, because doing any other way would break previous builds that were using that artifact.</p> @@ -464,8 +457,7 @@ <div class="row-fluid"> <p >Copyright © 2002–2016 <a href="http://www.apache.org/";>The Apache Software Foundation</a>. - All rights reserved. - + All rights reserved. </p> </div>
Modified: websites/staging/maven/trunk/content/guides/mini/guide-mirror-settings.html ============================================================================== --- websites/staging/maven/trunk/content/guides/mini/guide-mirror-settings.html (original) +++ websites/staging/maven/trunk/content/guides/mini/guide-mirror-settings.html Sun May 1 15:34:27 2016 @@ -1,7 +1,7 @@ <!DOCTYPE html> <!-- - | Generated by Apache Maven Doxia at 2016-05-01 - | Rendered using Apache Maven Fluido Skin 1.4 + | Generated by Apache Maven Doxia Site Renderer 1.7.1 at 2016-05-01 + | Rendered using Apache Maven Fluido Skin 1.5 --> <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"> <head> @@ -14,22 +14,19 @@ Robert Scholte" /> <meta name="Date-Revision-yyyymmdd" content="20160501" /> <meta http-equiv="Content-Language" content="en" /> <title>Maven – Guide to Mirror Settings</title> - <link rel="stylesheet" href="../../css/apache-maven-fluido-1.4.min.css" /> + <link rel="stylesheet" href="../../css/apache-maven-fluido-1.5.min.css" /> <link rel="stylesheet" href="../../css/site.css" /> <link rel="stylesheet" href="../../css/print.css" media="print" /> - <script type="text/javascript" src="../../js/apache-maven-fluido-1.4.min.js"></script> + <script type="text/javascript" src="../../js/apache-maven-fluido-1.5.min.js"></script> - - -<script src="https://www.google-analytics.com/urchin.js"; type="text/javascript"></script> - - -<script type="text/javascript">_uacct = "UA-140879-1"; - urchinTracker();</script> - - </head> + <script src="https://www.google-analytics.com/urchin.js"; type="text/javascript"></script> + <script type="text/javascript"> + _uacct = "UA-140879-1"; + urchinTracker(); + </script> + </head> <body class="topBarDisabled"> @@ -39,7 +36,7 @@ Robert Scholte" /> <div id="banner"> <div class="pull-left"> <a href="http://www.apache.org/"; id="bannerLeft"> - <img src="../../images/apache-maven-project.png" alt="Apache Maven"/> + <img src="../../images/apache-maven-project.png" alt="Apache Maven Site"/> </a> </div> <div class="pull-right"> <a href="../.././" id="bannerRight"> @@ -51,8 +48,7 @@ Robert Scholte" /> <div id="breadcrumbs"> <ul class="breadcrumb"> - - + <li class=""> <a href="http://www.apache.org/"; class="externalLink" title="Apache"> Apache</a> @@ -65,8 +61,7 @@ Robert Scholte" /> </li> <li class="active ">Guide to Mirror Settings</li> - - + <li id="publishDate" class="pull-right">Last Published: 2016-05-01</li> </ul> @@ -76,8 +71,7 @@ Robert Scholte" /> <div class="row-fluid"> <div id="leftColumn" class="span2"> <div class="well sidebar-nav"> - - + <ul class="nav nav-list"> <li class="nav-header">Main</li> @@ -416,14 +410,13 @@ Robert Scholte" /> Thanks</a> </li> </ul> - - + <form id="search-form" action="https://www.google.com/search"; method="get" > <input value="https://maven.apache.org"; name="sitesearch" type="hidden"/> <input class="search-query" name="q" id="query" type="text" /> </form> -<script type="text/javascript" src="https://www.google.com/coop/cse/brand?form=search-form";></script> +<script type="text/javascript" src="https://cse.google.com/brand?form=search-form";></script> <hr /> @@ -448,7 +441,7 @@ Robert Scholte" /> <div id="bodyColumn" class="span10" > - <!-- 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. --><!-- NOTE: For help with the syntax of this file, see: --><!-- http://maven.apache.org/doxia/references/ apt-format.html --><div class="section"> + <div class="section"> <h2><a name="Using_Mirrors_for_Repositories"></a>Using Mirrors for Repositories</h2> <p>With <a class="externalLink" href="http://maven.apache.org/guides/introduction/introduction-to-repositories.html";>Repositories</a> you specify from which locations you want to <i>download</i> certain artifacts, such as dependencies and maven-plugins. Repositories can be declared inside a project, which means that if you have your own custom repositories, those sharing your project easily get the right settings out of the box. However, you may want to use an alternative mirror for a particular repository without changing the project files.</p> <p>Some reasons to use a mirror are:</p> @@ -541,8 +534,7 @@ Robert Scholte" /> <div class="row-fluid"> <p >Copyright © 2002–2016 <a href="http://www.apache.org/";>The Apache Software Foundation</a>. - All rights reserved. - + All rights reserved. </p> </div> Modified: websites/staging/maven/trunk/content/guides/mini/guide-multiple-modules.html ============================================================================== --- websites/staging/maven/trunk/content/guides/mini/guide-multiple-modules.html (original) +++ websites/staging/maven/trunk/content/guides/mini/guide-multiple-modules.html Sun May 1 15:34:27 2016 @@ -1,7 +1,7 @@ <!DOCTYPE html> <!-- - | Generated by Apache Maven Doxia at 2016-05-01 - | Rendered using Apache Maven Fluido Skin 1.4 + | Generated by Apache Maven Doxia Site Renderer 1.7.1 at 2016-05-01 + | Rendered using Apache Maven Fluido Skin 1.5 --> <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"> <head> @@ -13,22 +13,19 @@ Karl Heinz Marbaise" /> <meta name="Date-Revision-yyyymmdd" content="20160501" /> <meta http-equiv="Content-Language" content="en" /> <title>Maven – Guide to Working with Multiple Modules</title> - <link rel="stylesheet" href="../../css/apache-maven-fluido-1.4.min.css" /> + <link rel="stylesheet" href="../../css/apache-maven-fluido-1.5.min.css" /> <link rel="stylesheet" href="../../css/site.css" /> <link rel="stylesheet" href="../../css/print.css" media="print" /> - <script type="text/javascript" src="../../js/apache-maven-fluido-1.4.min.js"></script> + <script type="text/javascript" src="../../js/apache-maven-fluido-1.5.min.js"></script> - - -<script src="https://www.google-analytics.com/urchin.js"; type="text/javascript"></script> - - -<script type="text/javascript">_uacct = "UA-140879-1"; - urchinTracker();</script> - - </head> + <script src="https://www.google-analytics.com/urchin.js"; type="text/javascript"></script> + <script type="text/javascript"> + _uacct = "UA-140879-1"; + urchinTracker(); + </script> + </head> <body class="topBarDisabled"> @@ -38,7 +35,7 @@ Karl Heinz Marbaise" /> <div id="banner"> <div class="pull-left"> <a href="http://www.apache.org/"; id="bannerLeft"> - <img src="../../images/apache-maven-project.png" alt="Apache Maven"/> + <img src="../../images/apache-maven-project.png" alt="Apache Maven Site"/> </a> </div> <div class="pull-right"> <a href="../.././" id="bannerRight"> @@ -50,8 +47,7 @@ Karl Heinz Marbaise" /> <div id="breadcrumbs"> <ul class="breadcrumb"> - - + <li class=""> <a href="http://www.apache.org/"; class="externalLink" title="Apache"> Apache</a> @@ -64,8 +60,7 @@ Karl Heinz Marbaise" /> </li> <li class="active ">Guide to Working with Multiple Modules</li> - - + <li id="publishDate" class="pull-right">Last Published: 2016-05-01</li> </ul> @@ -75,8 +70,7 @@ Karl Heinz Marbaise" /> <div class="row-fluid"> <div id="leftColumn" class="span2"> <div class="well sidebar-nav"> - - + <ul class="nav nav-list"> <li class="nav-header">Main</li> @@ -415,14 +409,13 @@ Karl Heinz Marbaise" /> Thanks</a> </li> </ul> - - + <form id="search-form" action="https://www.google.com/search"; method="get" > <input value="https://maven.apache.org"; name="sitesearch" type="hidden"/> <input class="search-query" name="q" id="query" type="text" /> </form> -<script type="text/javascript" src="https://www.google.com/coop/cse/brand?form=search-form";></script> +<script type="text/javascript" src="https://cse.google.com/brand?form=search-form";></script> <hr /> @@ -447,7 +440,7 @@ Karl Heinz Marbaise" /> <div id="bodyColumn" class="span10" > - <!-- 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. --><!-- NOTE: For help with the syntax of this file, see: --><!-- http://maven.apache.org/doxia/references/ apt-format.html --><div class="section"> + <div class="section"> <h2><a name="Guide_to_Working_with_Multiple_Modules"></a>Guide to Working with Multiple Modules</h2> <p>As seen in the introduction to the POM, Maven supports project aggregation in addition to project inheritance. This section outlines how Maven processes projects with multiple modules, and how you can work with them more effectively.</p> <div class="section"> @@ -495,8 +488,7 @@ Karl Heinz Marbaise" /> <div class="row-fluid"> <p >Copyright © 2002–2016 <a href="http://www.apache.org/";>The Apache Software Foundation</a>. - All rights reserved. - + All rights reserved. </p> </div> Modified: websites/staging/maven/trunk/content/guides/mini/guide-multiple-repositories.html ============================================================================== --- websites/staging/maven/trunk/content/guides/mini/guide-multiple-repositories.html (original) +++ websites/staging/maven/trunk/content/guides/mini/guide-multiple-repositories.html Sun May 1 15:34:27 2016 @@ -1,7 +1,7 @@ <!DOCTYPE html> <!-- - | Generated by Apache Maven Doxia at 2016-05-01 - | Rendered using Apache Maven Fluido Skin 1.4 + | Generated by Apache Maven Doxia Site Renderer 1.7.1 at 2016-05-01 + | Rendered using Apache Maven Fluido Skin 1.5 --> <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"> <head> @@ -12,22 +12,19 @@ <meta name="Date-Revision-yyyymmdd" content="20160501" /> <meta http-equiv="Content-Language" content="en" /> <title>Maven – Guide to using Multiple Repositories</title> - <link rel="stylesheet" href="../../css/apache-maven-fluido-1.4.min.css" /> + <link rel="stylesheet" href="../../css/apache-maven-fluido-1.5.min.css" /> <link rel="stylesheet" href="../../css/site.css" /> <link rel="stylesheet" href="../../css/print.css" media="print" /> - <script type="text/javascript" src="../../js/apache-maven-fluido-1.4.min.js"></script> + <script type="text/javascript" src="../../js/apache-maven-fluido-1.5.min.js"></script> - - -<script src="https://www.google-analytics.com/urchin.js"; type="text/javascript"></script> - - -<script type="text/javascript">_uacct = "UA-140879-1"; - urchinTracker();</script> - - </head> + <script src="https://www.google-analytics.com/urchin.js"; type="text/javascript"></script> + <script type="text/javascript"> + _uacct = "UA-140879-1"; + urchinTracker(); + </script> + </head> <body class="topBarDisabled"> @@ -37,7 +34,7 @@ <div id="banner"> <div class="pull-left"> <a href="http://www.apache.org/"; id="bannerLeft"> - <img src="../../images/apache-maven-project.png" alt="Apache Maven"/> + <img src="../../images/apache-maven-project.png" alt="Apache Maven Site"/> </a> </div> <div class="pull-right"> <a href="../.././" id="bannerRight"> @@ -49,8 +46,7 @@ <div id="breadcrumbs"> <ul class="breadcrumb"> - - + <li class=""> <a href="http://www.apache.org/"; class="externalLink" title="Apache"> Apache</a> @@ -63,8 +59,7 @@ </li> <li class="active ">Guide to using Multiple Repositories</li> - - + <li id="publishDate" class="pull-right">Last Published: 2016-05-01</li> </ul> @@ -74,8 +69,7 @@ <div class="row-fluid"> <div id="leftColumn" class="span2"> <div class="well sidebar-nav"> - - + <ul class="nav nav-list"> <li class="nav-header">Main</li> @@ -414,14 +408,13 @@ Thanks</a> </li> </ul> - - + <form id="search-form" action="https://www.google.com/search"; method="get" > <input value="https://maven.apache.org"; name="sitesearch" type="hidden"/> <input class="search-query" name="q" id="query" type="text" /> </form> -<script type="text/javascript" src="https://www.google.com/coop/cse/brand?form=search-form";></script> +<script type="text/javascript" src="https://cse.google.com/brand?form=search-form";></script> <hr /> @@ -446,7 +439,7 @@ <div id="bodyColumn" class="span10" > - <!-- 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. --><!-- NOTE: For help with the syntax of this file, see: --><!-- http://maven.apache.org/doxia/references/ apt-format.html --><div class="section"> + <div class="section"> <h2><a name="Setting_up_Multiple_Repositories"></a>Setting up Multiple Repositories</h2> <p>There are two different ways that you can specify the use of multiple repositories. The first way is to specify in a POM which repositories you want to use:</p> <div class="source"><pre class="prettyprint linenums"> @@ -512,8 +505,7 @@ mvn -Pmyprofile ... <div class="row-fluid"> <p >Copyright © 2002–2016 <a href="http://www.apache.org/";>The Apache Software Foundation</a>. - All rights reserved. - + All rights reserved. </p> </div> Modified: websites/staging/maven/trunk/content/guides/mini/guide-naming-conventions.html ============================================================================== --- websites/staging/maven/trunk/content/guides/mini/guide-naming-conventions.html (original) +++ websites/staging/maven/trunk/content/guides/mini/guide-naming-conventions.html Sun May 1 15:34:27 2016 @@ -1,7 +1,7 @@ <!DOCTYPE html> <!-- - | Generated by Apache Maven Doxia at 2016-05-01 - | Rendered using Apache Maven Fluido Skin 1.4 + | Generated by Apache Maven Doxia Site Renderer 1.7.1 at 2016-05-01 + | Rendered using Apache Maven Fluido Skin 1.5 --> <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"> <head> @@ -12,22 +12,19 @@ <meta name="Date-Revision-yyyymmdd" content="20160501" /> <meta http-equiv="Content-Language" content="en" /> <title>Maven – Guide to Naming Conventions</title> - <link rel="stylesheet" href="../../css/apache-maven-fluido-1.4.min.css" /> + <link rel="stylesheet" href="../../css/apache-maven-fluido-1.5.min.css" /> <link rel="stylesheet" href="../../css/site.css" /> <link rel="stylesheet" href="../../css/print.css" media="print" /> - <script type="text/javascript" src="../../js/apache-maven-fluido-1.4.min.js"></script> + <script type="text/javascript" src="../../js/apache-maven-fluido-1.5.min.js"></script> - - -<script src="https://www.google-analytics.com/urchin.js"; type="text/javascript"></script> - - -<script type="text/javascript">_uacct = "UA-140879-1"; - urchinTracker();</script> - - </head> + <script src="https://www.google-analytics.com/urchin.js"; type="text/javascript"></script> + <script type="text/javascript"> + _uacct = "UA-140879-1"; + urchinTracker(); + </script> + </head> <body class="topBarDisabled"> @@ -37,7 +34,7 @@ <div id="banner"> <div class="pull-left"> <a href="http://www.apache.org/"; id="bannerLeft"> - <img src="../../images/apache-maven-project.png" alt="Apache Maven"/> + <img src="../../images/apache-maven-project.png" alt="Apache Maven Site"/> </a> </div> <div class="pull-right"> <a href="../.././" id="bannerRight"> @@ -49,8 +46,7 @@ <div id="breadcrumbs"> <ul class="breadcrumb"> - - + <li class=""> <a href="http://www.apache.org/"; class="externalLink" title="Apache"> Apache</a> @@ -63,8 +59,7 @@ </li> <li class="active ">Guide to Naming Conventions</li> - - + <li id="publishDate" class="pull-right">Last Published: 2016-05-01</li> </ul> @@ -74,8 +69,7 @@ <div class="row-fluid"> <div id="leftColumn" class="span2"> <div class="well sidebar-nav"> - - + <ul class="nav nav-list"> <li class="nav-header">Main</li> @@ -414,14 +408,13 @@ Thanks</a> </li> </ul> - - + <form id="search-form" action="https://www.google.com/search"; method="get" > <input value="https://maven.apache.org"; name="sitesearch" type="hidden"/> <input class="search-query" name="q" id="query" type="text" /> </form> -<script type="text/javascript" src="https://www.google.com/coop/cse/brand?form=search-form";></script> +<script type="text/javascript" src="https://cse.google.com/brand?form=search-form";></script> <hr /> @@ -446,7 +439,7 @@ <div id="bodyColumn" class="span10" > - <!-- 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. --><!-- NOTE: For help with the syntax of this file, see: --><!-- http://maven.apache.org/doxia/references/ apt-format.html --><div class="section"> + <div class="section"> <h2><a name="Guide_to_naming_conventions_on_groupId_artifactId_and_version"></a>Guide to naming conventions on groupId, artifactId and version</h2> <ul> <li><b>groupId</b> will identify your project uniquely across all projects, so we need to enforce a naming schema. It has to follow the package name rules, what means that has to be at least as a domain name you control, and you can create as many subgroups as you want. Look at <a class="externalLink" href="http://java.sun.com/docs/books/jls/third_edition/html/packages.html#7.7";> More information about package names</a>. @@ -468,8 +461,7 @@ <div class="row-fluid"> <p >Copyright © 2002–2016 <a href="http://www.apache.org/";>The Apache Software Foundation</a>. - All rights reserved. - + All rights reserved. </p> </div> Modified: websites/staging/maven/trunk/content/guides/mini/guide-new-committers.html ============================================================================== --- websites/staging/maven/trunk/content/guides/mini/guide-new-committers.html (original) +++ websites/staging/maven/trunk/content/guides/mini/guide-new-committers.html Sun May 1 15:34:27 2016 @@ -1,7 +1,7 @@ <!DOCTYPE html> <!-- - | Generated by Apache Maven Doxia at 2016-05-01 - | Rendered using Apache Maven Fluido Skin 1.4 + | Generated by Apache Maven Doxia Site Renderer 1.7.1 at 2016-05-01 + | Rendered using Apache Maven Fluido Skin 1.5 --> <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"> <head> @@ -12,22 +12,19 @@ <meta name="Date-Revision-yyyymmdd" content="20160501" /> <meta http-equiv="Content-Language" content="en" /> <title>Maven – Guide for new committers</title> - <link rel="stylesheet" href="../../css/apache-maven-fluido-1.4.min.css" /> + <link rel="stylesheet" href="../../css/apache-maven-fluido-1.5.min.css" /> <link rel="stylesheet" href="../../css/site.css" /> <link rel="stylesheet" href="../../css/print.css" media="print" /> - <script type="text/javascript" src="../../js/apache-maven-fluido-1.4.min.js"></script> + <script type="text/javascript" src="../../js/apache-maven-fluido-1.5.min.js"></script> - - -<script src="https://www.google-analytics.com/urchin.js"; type="text/javascript"></script> - - -<script type="text/javascript">_uacct = "UA-140879-1"; - urchinTracker();</script> - - </head> + <script src="https://www.google-analytics.com/urchin.js"; type="text/javascript"></script> + <script type="text/javascript"> + _uacct = "UA-140879-1"; + urchinTracker(); + </script> + </head> <body class="topBarDisabled"> @@ -37,7 +34,7 @@ <div id="banner"> <div class="pull-left"> <a href="http://www.apache.org/"; id="bannerLeft"> - <img src="../../images/apache-maven-project.png" alt="Apache Maven"/> + <img src="../../images/apache-maven-project.png" alt="Apache Maven Site"/> </a> </div> <div class="pull-right"> <a href="../.././" id="bannerRight"> @@ -49,8 +46,7 @@ <div id="breadcrumbs"> <ul class="breadcrumb"> - - + <li class=""> <a href="http://www.apache.org/"; class="externalLink" title="Apache"> Apache</a> @@ -63,8 +59,7 @@ </li> <li class="active ">Guide for new committers</li> - - + <li id="publishDate" class="pull-right">Last Published: 2016-05-01</li> </ul> @@ -74,8 +69,7 @@ <div class="row-fluid"> <div id="leftColumn" class="span2"> <div class="well sidebar-nav"> - - + <ul class="nav nav-list"> <li class="nav-header">Main</li> @@ -414,14 +408,13 @@ Thanks</a> </li> </ul> - - + <form id="search-form" action="https://www.google.com/search"; method="get" > <input value="https://maven.apache.org"; name="sitesearch" type="hidden"/> <input class="search-query" name="q" id="query" type="text" /> </form> -<script type="text/javascript" src="https://www.google.com/coop/cse/brand?form=search-form";></script> +<script type="text/javascript" src="https://cse.google.com/brand?form=search-form";></script> <hr /> @@ -446,7 +439,7 @@ <div id="bodyColumn" class="span10" > - <!-- 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. --><!-- NOTE: For help with the syntax of this file, see: --><!-- http://maven.apache.org/doxia/references/ apt-format.html --><div class="section"> + <div class="section"> <h2><a name="Guide_for_new_commiters"></a>Guide for new commiters</h2> <p>First thing is to sort out some administrative tasks. Before your account is created and commit access granted you must complete and fax back to Apache the <a class="externalLink" href="http://www.apache.org/licenses/#clas";>Committer's License Agreement</a>.</p> <p>While this process is sorting itself out it is recommended that you peruse the various guides provided by Apache. All the guides are located in the <a class="externalLink" href="http://www.apache.org/dev/";>Development Infrastructure Information</a>.</p> @@ -463,8 +456,7 @@ <div class="row-fluid"> <p >Copyright © 2002–2016 <a href="http://www.apache.org/";>The Apache Software Foundation</a>. - All rights reserved. - + All rights reserved. </p> </div> Modified: websites/staging/maven/trunk/content/guides/mini/guide-proxies.html ============================================================================== --- websites/staging/maven/trunk/content/guides/mini/guide-proxies.html (original) +++ websites/staging/maven/trunk/content/guides/mini/guide-proxies.html Sun May 1 15:34:27 2016 @@ -1,7 +1,7 @@ <!DOCTYPE html> <!-- - | Generated by Apache Maven Doxia at 2016-05-01 - | Rendered using Apache Maven Fluido Skin 1.4 + | Generated by Apache Maven Doxia Site Renderer 1.7.1 at 2016-05-01 + | Rendered using Apache Maven Fluido Skin 1.5 --> <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"> <head> @@ -12,22 +12,19 @@ <meta name="Date-Revision-yyyymmdd" content="20160501" /> <meta http-equiv="Content-Language" content="en" /> <title>Maven – Guide to using proxies</title> - <link rel="stylesheet" href="../../css/apache-maven-fluido-1.4.min.css" /> + <link rel="stylesheet" href="../../css/apache-maven-fluido-1.5.min.css" /> <link rel="stylesheet" href="../../css/site.css" /> <link rel="stylesheet" href="../../css/print.css" media="print" /> - <script type="text/javascript" src="../../js/apache-maven-fluido-1.4.min.js"></script> + <script type="text/javascript" src="../../js/apache-maven-fluido-1.5.min.js"></script> - - -<script src="https://www.google-analytics.com/urchin.js"; type="text/javascript"></script> - - -<script type="text/javascript">_uacct = "UA-140879-1"; - urchinTracker();</script> - - </head> + <script src="https://www.google-analytics.com/urchin.js"; type="text/javascript"></script> + <script type="text/javascript"> + _uacct = "UA-140879-1"; + urchinTracker(); + </script> + </head> <body class="topBarDisabled"> @@ -37,7 +34,7 @@ <div id="banner"> <div class="pull-left"> <a href="http://www.apache.org/"; id="bannerLeft"> - <img src="../../images/apache-maven-project.png" alt="Apache Maven"/> + <img src="../../images/apache-maven-project.png" alt="Apache Maven Site"/> </a> </div> <div class="pull-right"> <a href="../.././" id="bannerRight"> @@ -49,8 +46,7 @@ <div id="breadcrumbs"> <ul class="breadcrumb"> - - + <li class=""> <a href="http://www.apache.org/"; class="externalLink" title="Apache"> Apache</a> @@ -63,8 +59,7 @@ </li> <li class="active ">Guide to using proxies</li> - - + <li id="publishDate" class="pull-right">Last Published: 2016-05-01</li> </ul> @@ -74,8 +69,7 @@ <div class="row-fluid"> <div id="leftColumn" class="span2"> <div class="well sidebar-nav"> - - + <ul class="nav nav-list"> <li class="nav-header">Main</li> @@ -414,14 +408,13 @@ Thanks</a> </li> </ul> - - + <form id="search-form" action="https://www.google.com/search"; method="get" > <input value="https://maven.apache.org"; name="sitesearch" type="hidden"/> <input class="search-query" name="q" id="query" type="text" /> </form> -<script type="text/javascript" src="https://www.google.com/coop/cse/brand?form=search-form";></script> +<script type="text/javascript" src="https://cse.google.com/brand?form=search-form";></script> <hr /> @@ -446,7 +439,7 @@ <div id="bodyColumn" class="span10" > - <!-- 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. --><!-- NOTE: For help with the syntax of this file, see: --><!-- http://maven.apache.org/doxia/references/ apt-format.html --><div class="section"> + <div class="section"> <h2><a name="Configuring_a_proxy"></a>Configuring a proxy</h2> <p>You can configure a proxy to use for some or all of your HTTP requests with Maven. The username and password are only required if your proxy requires basic authentication (note that later releases may support storing your passwords in a secured keystore - in the mean time, please ensure your settings.xml file (usually ${user.home}/.m2/settings.xml) is secured with permissions appropriate for your operating system).</p> <p>The <tt>nonProxyHosts</tt> setting accepts wild cards, and each host not to proxy is separated by the | character. This matches the JDK configuration equivalent.</p> @@ -487,8 +480,7 @@ <div class="row-fluid"> <p >Copyright © 2002–2016 <a href="http://www.apache.org/";>The Apache Software Foundation</a>. - All rights reserved. - + All rights reserved. </p> </div> Modified: websites/staging/maven/trunk/content/guides/mini/guide-releasing.html ============================================================================== --- websites/staging/maven/trunk/content/guides/mini/guide-releasing.html (original) +++ websites/staging/maven/trunk/content/guides/mini/guide-releasing.html Sun May 1 15:34:27 2016 @@ -1,7 +1,7 @@ <!DOCTYPE html> <!-- - | Generated by Apache Maven Doxia at 2016-05-01 - | Rendered using Apache Maven Fluido Skin 1.4 + | Generated by Apache Maven Doxia Site Renderer 1.7.1 at 2016-05-01 + | Rendered using Apache Maven Fluido Skin 1.5 --> <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"> <head> @@ -15,22 +15,19 @@ Karl Heinz Marbaise" /> <meta name="Date-Revision-yyyymmdd" content="20160501" /> <meta http-equiv="Content-Language" content="en" /> <title>Maven – Guide to using the release plugin</title> - <link rel="stylesheet" href="../../css/apache-maven-fluido-1.4.min.css" /> + <link rel="stylesheet" href="../../css/apache-maven-fluido-1.5.min.css" /> <link rel="stylesheet" href="../../css/site.css" /> <link rel="stylesheet" href="../../css/print.css" media="print" /> - <script type="text/javascript" src="../../js/apache-maven-fluido-1.4.min.js"></script> + <script type="text/javascript" src="../../js/apache-maven-fluido-1.5.min.js"></script> - - -<script src="https://www.google-analytics.com/urchin.js"; type="text/javascript"></script> - - -<script type="text/javascript">_uacct = "UA-140879-1"; - urchinTracker();</script> - - </head> + <script src="https://www.google-analytics.com/urchin.js"; type="text/javascript"></script> + <script type="text/javascript"> + _uacct = "UA-140879-1"; + urchinTracker(); + </script> + </head> <body class="topBarDisabled"> @@ -40,7 +37,7 @@ Karl Heinz Marbaise" /> <div id="banner"> <div class="pull-left"> <a href="http://www.apache.org/"; id="bannerLeft"> - <img src="../../images/apache-maven-project.png" alt="Apache Maven"/> + <img src="../../images/apache-maven-project.png" alt="Apache Maven Site"/> </a> </div> <div class="pull-right"> <a href="../.././" id="bannerRight"> @@ -52,8 +49,7 @@ Karl Heinz Marbaise" /> <div id="breadcrumbs"> <ul class="breadcrumb"> - - + <li class=""> <a href="http://www.apache.org/"; class="externalLink" title="Apache"> Apache</a> @@ -66,8 +62,7 @@ Karl Heinz Marbaise" /> </li> <li class="active ">Guide to using the release plugin</li> - - + <li id="publishDate" class="pull-right">Last Published: 2016-05-01</li> </ul> @@ -77,8 +72,7 @@ Karl Heinz Marbaise" /> <div class="row-fluid"> <div id="leftColumn" class="span2"> <div class="well sidebar-nav"> - - + <ul class="nav nav-list"> <li class="nav-header">Main</li> @@ -417,14 +411,13 @@ Karl Heinz Marbaise" /> Thanks</a> </li> </ul> - - + <form id="search-form" action="https://www.google.com/search"; method="get" > <input value="https://maven.apache.org"; name="sitesearch" type="hidden"/> <input class="search-query" name="q" id="query" type="text" /> </form> -<script type="text/javascript" src="https://www.google.com/coop/cse/brand?form=search-form";></script> +<script type="text/javascript" src="https://cse.google.com/brand?form=search-form";></script> <hr /> @@ -449,7 +442,7 @@ Karl Heinz Marbaise" /> <div id="bodyColumn" class="span10" > - <!-- 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. --><!-- NOTE: For help with the syntax of this file, see: --><!-- http://maven.apache.org/doxia/references/ apt-format.html --><div class="section"> + <div class="section"> <h2><a name="Releasing"></a>Releasing</h2> <div class="section"> <h3><a name="Introduction"></a>Introduction</h3> @@ -635,8 +628,7 @@ checkpoint.check-in-development-version= <div class="row-fluid"> <p >Copyright © 2002–2016 <a href="http://www.apache.org/";>The Apache Software Foundation</a>. - All rights reserved. - + All rights reserved. </p> </div> Modified: websites/staging/maven/trunk/content/guides/mini/guide-relocation.html ============================================================================== --- websites/staging/maven/trunk/content/guides/mini/guide-relocation.html (original) +++ websites/staging/maven/trunk/content/guides/mini/guide-relocation.html Sun May 1 15:34:27 2016 @@ -1,7 +1,7 @@ <!DOCTYPE html> <!-- - | Generated by Apache Maven Doxia at 2016-05-01 - | Rendered using Apache Maven Fluido Skin 1.4 + | Generated by Apache Maven Doxia Site Renderer 1.7.1 at 2016-05-01 + | Rendered using Apache Maven Fluido Skin 1.5 --> <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"> <head> @@ -12,22 +12,19 @@ <meta name="Date-Revision-yyyymmdd" content="20160501" /> <meta http-equiv="Content-Language" content="en" /> <title>Maven – Guide to relocation</title> - <link rel="stylesheet" href="../../css/apache-maven-fluido-1.4.min.css" /> + <link rel="stylesheet" href="../../css/apache-maven-fluido-1.5.min.css" /> <link rel="stylesheet" href="../../css/site.css" /> <link rel="stylesheet" href="../../css/print.css" media="print" /> - <script type="text/javascript" src="../../js/apache-maven-fluido-1.4.min.js"></script> + <script type="text/javascript" src="../../js/apache-maven-fluido-1.5.min.js"></script> - - -<script src="https://www.google-analytics.com/urchin.js"; type="text/javascript"></script> - - -<script type="text/javascript">_uacct = "UA-140879-1"; - urchinTracker();</script> - - </head> + <script src="https://www.google-analytics.com/urchin.js"; type="text/javascript"></script> + <script type="text/javascript"> + _uacct = "UA-140879-1"; + urchinTracker(); + </script> + </head> <body class="topBarDisabled"> @@ -37,7 +34,7 @@ <div id="banner"> <div class="pull-left"> <a href="http://www.apache.org/"; id="bannerLeft"> - <img src="../../images/apache-maven-project.png" alt="Apache Maven"/> + <img src="../../images/apache-maven-project.png" alt="Apache Maven Site"/> </a> </div> <div class="pull-right"> <a href="../.././" id="bannerRight"> @@ -49,8 +46,7 @@ <div id="breadcrumbs"> <ul class="breadcrumb"> - - + <li class=""> <a href="http://www.apache.org/"; class="externalLink" title="Apache"> Apache</a> @@ -63,8 +59,7 @@ </li> <li class="active ">Guide to relocation</li> - - + <li id="publishDate" class="pull-right">Last Published: 2016-05-01</li> </ul> @@ -74,8 +69,7 @@ <div class="row-fluid"> <div id="leftColumn" class="span2"> <div class="well sidebar-nav"> - - + <ul class="nav nav-list"> <li class="nav-header">Main</li> @@ -414,14 +408,13 @@ Thanks</a> </li> </ul> - - + <form id="search-form" action="https://www.google.com/search"; method="get" > <input value="https://maven.apache.org"; name="sitesearch" type="hidden"/> <input class="search-query" name="q" id="query" type="text" /> </form> -<script type="text/javascript" src="https://www.google.com/coop/cse/brand?form=search-form";></script> +<script type="text/javascript" src="https://cse.google.com/brand?form=search-form";></script> <hr /> @@ -446,7 +439,7 @@ <div id="bodyColumn" class="span10" > - <!-- 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. --><!-- NOTE: For help with the syntax of this file, see: --><!-- http://maven.apache.org/doxia/references/ apt-format.html --><div class="section"> + <div class="section"> <h2><a name="Guide_to_relocation"></a>Guide to relocation</h2> <p>Sometimes it is necessary to relocate artifacts in the repository. One example of that is when a project moves from Maven 1 to Maven 2. Maven 1 projects have traditionally used a flat repository structure, while Maven 2 uses a deep repository structure. As an example the Maven 1 project has a groupId of <tt>maven</tt> while the Maven 2 project has a groupId of <tt>org.apache.maven</tt>.</p> <p>Making changes to the repository can have far reaching consequences. So it is best to get it right the first time, hence this guide. It will go through a couple of different kinds of relocations:</p> @@ -514,8 +507,7 @@ <div class="row-fluid"> <p >Copyright © 2002–2016 <a href="http://www.apache.org/";>The Apache Software Foundation</a>. - All rights reserved. - + All rights reserved. </p> </div> Modified: websites/staging/maven/trunk/content/guides/mini/guide-repository-ssl.html ============================================================================== --- websites/staging/maven/trunk/content/guides/mini/guide-repository-ssl.html (original) +++ websites/staging/maven/trunk/content/guides/mini/guide-repository-ssl.html Sun May 1 15:34:27 2016 @@ -1,7 +1,7 @@ <!DOCTYPE html> <!-- - | Generated by Apache Maven Doxia at 2016-05-01 - | Rendered using Apache Maven Fluido Skin 1.4 + | Generated by Apache Maven Doxia Site Renderer 1.7.1 at 2016-05-01 + | Rendered using Apache Maven Fluido Skin 1.5 --> <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"> <head> @@ -12,22 +12,19 @@ <meta name="Date-Revision-yyyymmdd" content="20160501" /> <meta http-equiv="Content-Language" content="en" /> <title>Maven – Remote repository access through authenticated HTTPS</title> - <link rel="stylesheet" href="../../css/apache-maven-fluido-1.4.min.css" /> + <link rel="stylesheet" href="../../css/apache-maven-fluido-1.5.min.css" /> <link rel="stylesheet" href="../../css/site.css" /> <link rel="stylesheet" href="../../css/print.css" media="print" /> - <script type="text/javascript" src="../../js/apache-maven-fluido-1.4.min.js"></script> + <script type="text/javascript" src="../../js/apache-maven-fluido-1.5.min.js"></script> - - -<script src="https://www.google-analytics.com/urchin.js"; type="text/javascript"></script> - - -<script type="text/javascript">_uacct = "UA-140879-1"; - urchinTracker();</script> - - </head> + <script src="https://www.google-analytics.com/urchin.js"; type="text/javascript"></script> + <script type="text/javascript"> + _uacct = "UA-140879-1"; + urchinTracker(); + </script> + </head> <body class="topBarDisabled"> @@ -37,7 +34,7 @@ <div id="banner"> <div class="pull-left"> <a href="http://www.apache.org/"; id="bannerLeft"> - <img src="../../images/apache-maven-project.png" alt="Apache Maven"/> + <img src="../../images/apache-maven-project.png" alt="Apache Maven Site"/> </a> </div> <div class="pull-right"> <a href="../.././" id="bannerRight"> @@ -49,8 +46,7 @@ <div id="breadcrumbs"> <ul class="breadcrumb"> - - + <li class=""> <a href="http://www.apache.org/"; class="externalLink" title="Apache"> Apache</a> @@ -63,8 +59,7 @@ </li> <li class="active ">Remote repository access through authenticated HTTPS</li> - - + <li id="publishDate" class="pull-right">Last Published: 2016-05-01</li> </ul> @@ -74,8 +69,7 @@ <div class="row-fluid"> <div id="leftColumn" class="span2"> <div class="well sidebar-nav"> - - + <ul class="nav nav-list"> <li class="nav-header">Main</li> @@ -414,14 +408,13 @@ Thanks</a> </li> </ul> - - + <form id="search-form" action="https://www.google.com/search"; method="get" > <input value="https://maven.apache.org"; name="sitesearch" type="hidden"/> <input class="search-query" name="q" id="query" type="text" /> </form> -<script type="text/javascript" src="https://www.google.com/coop/cse/brand?form=search-form";></script> +<script type="text/javascript" src="https://cse.google.com/brand?form=search-form";></script> <hr /> @@ -446,7 +439,7 @@ <div id="bodyColumn" class="span10" > - <!-- 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. --><!-- NOTE: For help with the syntax of this file, see: --><!-- http://maven.apache.org/doxia/references/ apt-format.html --><div class="section"> + <div class="section"> <h2><a name="Guide_to_Remote_repository_access_through_authenticated_HTTPS"></a>Guide to Remote repository access through authenticated HTTPS</h2> <p>This document describes how to configure Maven for accessing a remote repository that sits behind an HTTPS server which requires client authentication with certificates. It is expected that this documentation be valid both for Maven 1.x and Maven 2.0.</p> <div class="section"> @@ -536,8 +529,7 @@ $></pre></div> <div class="row-fluid"> <p >Copyright © 2002–2016 <a href="http://www.apache.org/";>The Apache Software Foundation</a>. - All rights reserved. - + All rights reserved. </p> </div> Modified: websites/staging/maven/trunk/content/guides/mini/guide-site.html ============================================================================== --- websites/staging/maven/trunk/content/guides/mini/guide-site.html (original) +++ websites/staging/maven/trunk/content/guides/mini/guide-site.html Sun May 1 15:34:27 2016 @@ -1,7 +1,7 @@ <!DOCTYPE html> <!-- - | Generated by Apache Maven Doxia at 2016-05-01 - | Rendered using Apache Maven Fluido Skin 1.4 + | Generated by Apache Maven Doxia Site Renderer 1.7.1 at 2016-05-01 + | Rendered using Apache Maven Fluido Skin 1.5 --> <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"> <head> @@ -13,22 +13,19 @@ Jason van Zyl" /> <meta name="Date-Revision-yyyymmdd" content="20160501" /> <meta http-equiv="Content-Language" content="en" /> <title>Maven – Guide to creating a site</title> - <link rel="stylesheet" href="../../css/apache-maven-fluido-1.4.min.css" /> + <link rel="stylesheet" href="../../css/apache-maven-fluido-1.5.min.css" /> <link rel="stylesheet" href="../../css/site.css" /> <link rel="stylesheet" href="../../css/print.css" media="print" /> - <script type="text/javascript" src="../../js/apache-maven-fluido-1.4.min.js"></script> + <script type="text/javascript" src="../../js/apache-maven-fluido-1.5.min.js"></script> - - -<script src="https://www.google-analytics.com/urchin.js"; type="text/javascript"></script> - - -<script type="text/javascript">_uacct = "UA-140879-1"; - urchinTracker();</script> - - </head> + <script src="https://www.google-analytics.com/urchin.js"; type="text/javascript"></script> + <script type="text/javascript"> + _uacct = "UA-140879-1"; + urchinTracker(); + </script> + </head> <body class="topBarDisabled"> @@ -38,7 +35,7 @@ Jason van Zyl" /> <div id="banner"> <div class="pull-left"> <a href="http://www.apache.org/"; id="bannerLeft"> - <img src="../../images/apache-maven-project.png" alt="Apache Maven"/> + <img src="../../images/apache-maven-project.png" alt="Apache Maven Site"/> </a> </div> <div class="pull-right"> <a href="../.././" id="bannerRight"> @@ -50,8 +47,7 @@ Jason van Zyl" /> <div id="breadcrumbs"> <ul class="breadcrumb"> - - + <li class=""> <a href="http://www.apache.org/"; class="externalLink" title="Apache"> Apache</a> @@ -64,8 +60,7 @@ Jason van Zyl" /> </li> <li class="active ">Guide to creating a site</li> - - + <li id="publishDate" class="pull-right">Last Published: 2016-05-01</li> </ul> @@ -75,8 +70,7 @@ Jason van Zyl" /> <div class="row-fluid"> <div id="leftColumn" class="span2"> <div class="well sidebar-nav"> - - + <ul class="nav nav-list"> <li class="nav-header">Main</li> @@ -415,14 +409,13 @@ Jason van Zyl" /> Thanks</a> </li> </ul> - - + <form id="search-form" action="https://www.google.com/search"; method="get" > <input value="https://maven.apache.org"; name="sitesearch" type="hidden"/> <input class="search-query" name="q" id="query" type="text" /> </form> -<script type="text/javascript" src="https://www.google.com/coop/cse/brand?form=search-form";></script> +<script type="text/javascript" src="https://cse.google.com/brand?form=search-form";></script> <hr /> @@ -447,7 +440,7 @@ Jason van Zyl" /> <div id="bodyColumn" class="span10" > - <!-- 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. --><!-- NOTE: For help with the syntax of this file, see: --><!-- http://maven.apache.org/doxia/references/ apt-format.html --><div class="section"> + <div class="section"> <h2><a name="Creating_a_site"></a>Creating a site</h2> <div class="section"> <h3><a name="Creating_Content"></a>Creating Content</h3> @@ -476,7 +469,7 @@ Jason van Zyl" /> <p>Note that all of the above is optional - just one index file is required in one of the input trees. Each of the paths will be merged together to form the root directory of the site.</p></div> <div class="section"> <h3><a name="Customizing_the_Look__Feel"></a>Customizing the Look & Feel</h3> -<p>If you want to tune the way your site looks, you can use a custom skin to provide your own CSS styles. If that is still not enough, you can even tweak the output templates that Maven uses to generate the site documentation. You can visit the <a class="externalLink" href="http://maven.apache.org/skins/";>Skins site</a> to have a look at some of the skins that you can use to change the look of your site.</p><!-- TODO: The following link is currently not available. Restore it when it becomes available again. --><!-- For an in-depth discussion of site customization, please have a look at the --><!-- {{{http://www.sonatype.com/book/site-generation.html} Maven User Guide, Chapter 9, "Site Generation"}}. --></div> +<p>If you want to tune the way your site looks, you can use a custom skin to provide your own CSS styles. If that is still not enough, you can even tweak the output templates that Maven uses to generate the site documentation. You can visit the <a class="externalLink" href="http://maven.apache.org/skins/";>Skins site</a> to have a look at some of the skins that you can use to change the look of your site.</p></div> <div class="section"> <h3><a name="Generating_the_Site"></a>Generating the Site</h3> <p>Generating the site is very simple, and fast!</p> @@ -538,7 +531,7 @@ Jason van Zyl" /> ... </body> -</project></pre></div><!-- TODO: deserves more explanation. --> +</project></pre></div> <p><b>Note:</b> The <tt><menu ref="reports"/></tt> element above. When building the site, this is replaced by a menu with links to all the reports that you have configured.</p> <p>More information about the site descriptor is available at the site for the <a class="externalLink" href="http://maven.apache.org/plugins/maven-site-plugin/examples/sitedescriptor.html";>Maven Site Plugin</a>.</p></div> <div class="section"> @@ -584,7 +577,7 @@ Jason van Zyl" /> ... </project></pre></div> <p>If you have included the appropriate <tt><menu ref="reports"/></tt> tag in your <tt>site.xml</tt> descriptor, then when you regenerate the site those items will appear in the menu.</p> -<p><b>Note:</b> Many report plugins provide a parameter called <tt>outputDirectory</tt> or similar to specify the destination for their report outputs. This parameter is only relevant if the report plugin is run standalone, i.e. by invocation directly from the command line. In constrast, when reports are generated as part of the site, the configuration of the Maven Site Plugin will determine the effective output directory to ensure that all reports end up in a central location.</p><!-- TODO: explain report sets --></div> +<p><b>Note:</b> Many report plugins provide a parameter called <tt>outputDirectory</tt> or similar to specify the destination for their report outputs. This parameter is only relevant if the report plugin is run standalone, i.e. by invocation directly from the command line. In constrast, when reports are generated as part of the site, the configuration of the Maven Site Plugin will determine the effective output directory to ensure that all reports end up in a central location.</p></div> <div class="section"> <h3><a name="Internationalization"></a>Internationalization</h3> <p>Internationalization in Maven is very simple, as long as the reports you are using have that particular locale defined. For an overview of supported languages and instructions on how to add further languages, please see the related article <a href="../../plugins/maven-site-plugin/i18n.html"> Internationalization</a> from the Maven Site Plugin.</p> @@ -632,8 +625,7 @@ Jason van Zyl" /> <div class="row-fluid"> <p >Copyright © 2002–2016 <a href="http://www.apache.org/";>The Apache Software Foundation</a>. - All rights reserved. - + All rights reserved. </p> </div> Modified: websites/staging/maven/trunk/content/guides/mini/guide-snippet-macro.html ============================================================================== --- websites/staging/maven/trunk/content/guides/mini/guide-snippet-macro.html (original) +++ websites/staging/maven/trunk/content/guides/mini/guide-snippet-macro.html Sun May 1 15:34:27 2016 @@ -1,7 +1,7 @@ <!DOCTYPE html> <!-- - | Generated by Apache Maven Doxia at 2016-05-01 - | Rendered using Apache Maven Fluido Skin 1.4 + | Generated by Apache Maven Doxia Site Renderer 1.7.1 at 2016-05-01 + | Rendered using Apache Maven Fluido Skin 1.5 --> <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"> <head> @@ -12,22 +12,19 @@ <meta name="Date-Revision-yyyymmdd" content="20160501" /> <meta http-equiv="Content-Language" content="en" /> <title>Maven – Guide to the Snippet Macro</title> - <link rel="stylesheet" href="../../css/apache-maven-fluido-1.4.min.css" /> + <link rel="stylesheet" href="../../css/apache-maven-fluido-1.5.min.css" /> <link rel="stylesheet" href="../../css/site.css" /> <link rel="stylesheet" href="../../css/print.css" media="print" /> - <script type="text/javascript" src="../../js/apache-maven-fluido-1.4.min.js"></script> + <script type="text/javascript" src="../../js/apache-maven-fluido-1.5.min.js"></script> - - -<script src="https://www.google-analytics.com/urchin.js"; type="text/javascript"></script> - - -<script type="text/javascript">_uacct = "UA-140879-1"; - urchinTracker();</script> - - </head> + <script src="https://www.google-analytics.com/urchin.js"; type="text/javascript"></script> + <script type="text/javascript"> + _uacct = "UA-140879-1"; + urchinTracker(); + </script> + </head> <body class="topBarDisabled"> @@ -37,7 +34,7 @@ <div id="banner"> <div class="pull-left"> <a href="http://www.apache.org/"; id="bannerLeft"> - <img src="../../images/apache-maven-project.png" alt="Apache Maven"/> + <img src="../../images/apache-maven-project.png" alt="Apache Maven Site"/> </a> </div> <div class="pull-right"> <a href="../.././" id="bannerRight"> @@ -49,8 +46,7 @@ <div id="breadcrumbs"> <ul class="breadcrumb"> - - + <li class=""> <a href="http://www.apache.org/"; class="externalLink" title="Apache"> Apache</a> @@ -63,8 +59,7 @@ </li> <li class="active ">Guide to the Snippet Macro</li> - - + <li id="publishDate" class="pull-right">Last Published: 2016-05-01</li> </ul> @@ -74,8 +69,7 @@ <div class="row-fluid"> <div id="leftColumn" class="span2"> <div class="well sidebar-nav"> - - + <ul class="nav nav-list"> <li class="nav-header">Main</li> @@ -414,14 +408,13 @@ Thanks</a> </li> </ul> - - + <form id="search-form" action="https://www.google.com/search"; method="get" > <input value="https://maven.apache.org"; name="sitesearch" type="hidden"/> <input class="search-query" name="q" id="query" type="text" /> </form> -<script type="text/javascript" src="https://www.google.com/coop/cse/brand?form=search-form";></script> +<script type="text/javascript" src="https://cse.google.com/brand?form=search-form";></script> <hr /> @@ -446,7 +439,7 @@ <div id="bodyColumn" class="span10" > - <!-- 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. --><!-- NOTE: For help with the syntax of this file, see: --><!-- http://maven.apache.org/doxia/references/ apt-format.html --><!-- @todo dennisl: We should drop this document and refer to the macros page in the Doxia site --><div class="section"> + <div class="section"> <h2><a name="Guide_to_the_Snippet_Macro"></a>Guide to the Snippet Macro</h2> <p>When generating your project website with Maven, you have the option of dynamically including <i>snippet</i>s of source code in your pages.</p> <p>A <i>snippet</i> is a section of a source code file that is surrounded by specially formatted comments.</p> @@ -512,8 +505,7 @@ <div class="row-fluid"> <p >Copyright © 2002–2016 <a href="http://www.apache.org/";>The Apache Software Foundation</a>. - All rights reserved. - + All rights reserved. </p> </div> Modified: websites/staging/maven/trunk/content/guides/mini/guide-using-ant.html ============================================================================== --- websites/staging/maven/trunk/content/guides/mini/guide-using-ant.html (original) +++ websites/staging/maven/trunk/content/guides/mini/guide-using-ant.html Sun May 1 15:34:27 2016 @@ -1,7 +1,7 @@ <!DOCTYPE html> <!-- - | Generated by Apache Maven Doxia at 2016-05-01 - | Rendered using Apache Maven Fluido Skin 1.4 + | Generated by Apache Maven Doxia Site Renderer 1.7.1 at 2016-05-01 + | Rendered using Apache Maven Fluido Skin 1.5 --> <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"> <head> @@ -12,22 +12,19 @@ <meta name="Date-Revision-yyyymmdd" content="20160501" /> <meta http-equiv="Content-Language" content="en" /> <title>Maven – Guide to using Ant with Maven</title> - <link rel="stylesheet" href="../../css/apache-maven-fluido-1.4.min.css" /> + <link rel="stylesheet" href="../../css/apache-maven-fluido-1.5.min.css" /> <link rel="stylesheet" href="../../css/site.css" /> <link rel="stylesheet" href="../../css/print.css" media="print" /> - <script type="text/javascript" src="../../js/apache-maven-fluido-1.4.min.js"></script> + <script type="text/javascript" src="../../js/apache-maven-fluido-1.5.min.js"></script> - - -<script src="https://www.google-analytics.com/urchin.js"; type="text/javascript"></script> - - -<script type="text/javascript">_uacct = "UA-140879-1"; - urchinTracker();</script> - - </head> + <script src="https://www.google-analytics.com/urchin.js"; type="text/javascript"></script> + <script type="text/javascript"> + _uacct = "UA-140879-1"; + urchinTracker(); + </script> + </head> <body class="topBarDisabled"> @@ -37,7 +34,7 @@ <div id="banner"> <div class="pull-left"> <a href="http://www.apache.org/"; id="bannerLeft"> - <img src="../../images/apache-maven-project.png" alt="Apache Maven"/> + <img src="../../images/apache-maven-project.png" alt="Apache Maven Site"/> </a> </div> <div class="pull-right"> <a href="../.././" id="bannerRight"> @@ -49,8 +46,7 @@ <div id="breadcrumbs"> <ul class="breadcrumb"> - - + <li class=""> <a href="http://www.apache.org/"; class="externalLink" title="Apache"> Apache</a> @@ -63,8 +59,7 @@ </li> <li class="active ">Guide to using Ant with Maven</li> - - + <li id="publishDate" class="pull-right">Last Published: 2016-05-01</li> </ul> @@ -74,8 +69,7 @@ <div class="row-fluid"> <div id="leftColumn" class="span2"> <div class="well sidebar-nav"> - - + <ul class="nav nav-list"> <li class="nav-header">Main</li> @@ -414,14 +408,13 @@ Thanks</a> </li> </ul> - - + <form id="search-form" action="https://www.google.com/search"; method="get" > <input value="https://maven.apache.org"; name="sitesearch" type="hidden"/> <input class="search-query" name="q" id="query" type="text" /> </form> -<script type="text/javascript" src="https://www.google.com/coop/cse/brand?form=search-form";></script> +<script type="text/javascript" src="https://cse.google.com/brand?form=search-form";></script> <hr /> @@ -446,7 +439,7 @@ <div id="bodyColumn" class="span10" > - <!-- 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. --><!-- NOTE: For help with the syntax of this file, see: --><!-- http://maven.apache.org/doxia/references/ apt-format.html --><div class="section"> + <div class="section"> <h2><a name="Guide_to_using_Ant_with_Maven"></a>Guide to using Ant with Maven</h2> <p>The example above illustrates how to bind an ant script to a lifecycle phase. You can add a script to each lifecycle phase, by duplicating the <i>execution/</i> section and specifying a new phase.</p> <div class="source"><pre class="prettyprint linenums"> @@ -530,8 +523,7 @@ <div class="row-fluid"> <p >Copyright © 2002–2016 <a href="http://www.apache.org/";>The Apache Software Foundation</a>. - All rights reserved. - + All rights reserved. </p> </div>
