Author: buildbot
Date: Mon Mar 20 20:20:20 2017
New Revision: 1008709

Log:
Staging update by buildbot for maven

Added:
    websites/staging/maven/trunk/content/maven-ci-friendly.html
Modified:
    websites/staging/maven/trunk/content/   (props changed)
    websites/staging/maven/trunk/content/docs/3.5.0-beta-1/release-notes.html
    websites/staging/maven/trunk/content/maven-site-1.0-site.jar

Propchange: websites/staging/maven/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Mon Mar 20 20:20:20 2017
@@ -1 +1 @@
-1787829
+1787841

Modified: 
websites/staging/maven/trunk/content/docs/3.5.0-beta-1/release-notes.html
==============================================================================
--- websites/staging/maven/trunk/content/docs/3.5.0-beta-1/release-notes.html 
(original)
+++ websites/staging/maven/trunk/content/docs/3.5.0-beta-1/release-notes.html 
Mon Mar 20 20:20:20 2017
@@ -240,7 +240,7 @@
 <p>Replaced Eclipse Aether with <a href="/maven.apache.org/resolver/">Maven 
Resolver</a>  [MNG-6110], [MNG-6140].</p></li>
   
 <li>
-<p>Using of CI friendly versions via <tt>${revision}</tt>, <tt>${sha1}</tt> 
and/or <tt>${changelist}</tt>  has been fixed <a class="externalLink" 
href="https://issues.apache.org/jira/browse/MNG-6057";>MNG-6057</a>, <a 
class="externalLink" 
href="https://issues.apache.org/jira/browse/MNG-6090";>MNG-6090</a> and <a 
class="externalLink" 
href="https://issues.apache.org/jira/browse/MNG-5895";>MNG-5895</a>. It is very 
important to  know if you are using the previously named properties for a 
version in your  pom you have to use <a class="externalLink" 
href="http://www.mojohaus.org/flatten-maven-plugin/";>flatten-maven-plugin</a> 
if you like to do an <tt>mvn install</tt>  or <tt>mvn deploy</tt>.</p></li>
+<p>Using of CI friendly versions via <tt>${revision}</tt>, <tt>${sha1}</tt> 
and/or <tt>${changelist}</tt>  has been fixed <a class="externalLink" 
href="https://issues.apache.org/jira/browse/MNG-6057";>MNG-6057</a>, <a 
class="externalLink" 
href="https://issues.apache.org/jira/browse/MNG-6090";>MNG-6090</a> and <a 
class="externalLink" 
href="https://issues.apache.org/jira/browse/MNG-5895";>MNG-5895</a>. It is very 
important to  know if you are using the previously named properties for a 
version in your  pom you have to use <a class="externalLink" 
href="http://www.mojohaus.org/flatten-maven-plugin/";>flatten-maven-plugin</a> 
if you like to do an <tt>mvn install</tt>  or <tt>mvn deploy</tt> more details 
can be found at <a href="/maven-ci-friendly.html">Maven CI 
Friendly</a>.</p></li>
   
 <li>
 <p>The two known issues from 3.5.0-alpha-1 have been fixed <a 
class="externalLink" 
href="https://issues.apache.org/jira/browse/MNG-6177";>MNG-6177</a>, <a 
class="externalLink" 
href="https://issues.apache.org/jira/browse/MNG-6115";>MNG-6115</a></p></li>

Added: websites/staging/maven/trunk/content/maven-ci-friendly.html
==============================================================================
--- websites/staging/maven/trunk/content/maven-ci-friendly.html (added)
+++ websites/staging/maven/trunk/content/maven-ci-friendly.html Mon Mar 20 
20:20:20 2017
@@ -0,0 +1,292 @@
+<!DOCTYPE html>
+<!--
+ | Generated by Apache Maven Doxia Site Renderer 1.7.4 at 2017-03-20 
+ | Rendered using Apache Maven Fluido Skin 1.6-SNAPSHOT
+-->
+<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="Date-Revision-yyyymmdd" content="20170320" />
+    <meta http-equiv="Content-Language" content="en" />
+    <title>Maven &#x2013; Maven CI Friendly Versions</title>
+    <link rel="stylesheet" 
href="./css/apache-maven-fluido-1.6-SNAPSHOT.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.6-SNAPSHOT.min.js"></script>
+      <!-- Google Analytics -->
+    <script type="text/javascript">
+      var _gaq = _gaq || [];
+      _gaq.push(['_setAccount', 'UA-140879-1']);
+      _gaq.push(['_trackPageview']);
+      (function() {
+        var ga = document.createElement('script'); ga.type = 
'text/javascript'; ga.async = true;
+        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 
'http://www') + '.google-analytics.com/ga.js';
+        var s = document.getElementsByTagName('script')[0]; 
s.parentNode.insertBefore(ga, s);
+      })();
+    </script>
+      </head>
+    <body class="topBarDisabled">
+      <div class="container-fluid">
+      <div id="banner">
+        <div class="pull-left"><a href="https://www.apache.org/"; 
id="bannerLeft"><img src="images/apache-maven-project.png"  alt="Apache Maven 
Site"/></a></div>
+        <div class="pull-right"><a href="./" id="bannerRight"><img 
src="images/maven-logo-black-on-white.png" /></a></div>
+        <div class="clear"><hr/></div>
+      </div>
+
+      <div id="breadcrumbs">
+        <ul class="breadcrumb">
+        <li class=""><a href="https://www.apache.org/"; class="externalLink" 
title="Apache">Apache</a><span class="divider">/</span></li>
+      <li class=""><a href="index.html" title="Maven">Maven</a><span 
class="divider">/</span></li>
+    <li class="active ">Maven CI Friendly Versions</li>
+        <li id="publishDate" class="pull-right">Last Published: 2017-03-20</li>
+        </ul>
+      </div>
+      <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>
+    <li><a href="index.html" title="Welcome"><span 
class="none"></span>Welcome</a>  </li>
+    <li><a href="https://www.apache.org/licenses/"; class="externalLink" 
title="License"><span class="none"></span>License</a>  </li>
+    <li><a href="download.html" title="Download"><span 
class="none"></span>Download</a>  </li>
+    <li><a href="install.html" title="Install"><span 
class="none"></span>Install</a>  </li>
+    <li><a href="configure.html" title="Configure"><span 
class="none"></span>Configure</a>  </li>
+    <li><a href="run.html" title="Run"><span class="none"></span>Run</a>  </li>
+    <li><a href="ide.html" title="IDE Integration"><span 
class="none"></span>IDE Integration</a>  </li>
+          <li class="nav-header">About Maven</li>
+    <li><a href="what-is-maven.html" title="What is Maven?"><span 
class="none"></span>What is Maven?</a>  </li>
+    <li><a href="maven-features.html" title="Features"><span 
class="none"></span>Features</a>  </li>
+    <li><a href="general.html" title="FAQ"><span class="none"></span>FAQ</a>  
</li>
+    <li><a href="support-and-training.html" title="Support and Training"><span 
class="none"></span>Support and Training</a>  </li>
+          <li class="nav-header">Documentation</li>
+    <li><a href="plugins/index.html" title="Maven Plugins"><span 
class="none"></span>Maven Plugins</a>  </li>
+    <li><a href="guides/index.html" title="Index (category)"><span 
class="none"></span>Index (category)</a>  </li>
+    <li><a href="run-maven/index.html" title="Running Maven"><span 
class="none"></span>Running Maven</a>  </li>
+    <li><a href="users/index.html" title="User Centre"><span 
class="icon-chevron-right"></span>User Centre</a>  </li>
+    <li><a href="plugin-developers/index.html" title="Plugin Developer 
Centre"><span class="icon-chevron-right"></span>Plugin Developer Centre</a>  
</li>
+    <li><a href="repository/index.html" title="Maven Repository Centre"><span 
class="none"></span>Maven Repository Centre</a>  </li>
+    <li><a href="developers/index.html" title="Maven Developer Centre"><span 
class="none"></span>Maven Developer Centre</a>  </li>
+    <li><a href="articles.html" title="Books and Resources"><span 
class="none"></span>Books and Resources</a>  </li>
+    <li><a href="security.html" title="Security"><span 
class="none"></span>Security</a>  </li>
+          <li class="nav-header">Community</li>
+    <li><a href="community.html" title="Community Overview"><span 
class="none"></span>Community Overview</a>  </li>
+    <li><a href="guides/development/guide-helping.html" title="How to 
Contribute"><span class="none"></span>How to Contribute</a>  </li>
+    <li><a href="guides/mini/guide-maven-evangelism.html" title="Maven 
Repository"><span class="none"></span>Maven Repository</a>  </li>
+    <li><a href="users/getting-help.html" title="Getting Help"><span 
class="none"></span>Getting Help</a>  </li>
+    <li><a href="issue-tracking.html" title="Issue Tracking"><span 
class="none"></span>Issue Tracking</a>  </li>
+    <li><a href="source-repository.html" title="Source Repository"><span 
class="none"></span>Source Repository</a>  </li>
+    <li><a href="team-list.html" title="The Maven Team"><span 
class="none"></span>The Maven Team</a>  </li>
+          <li class="nav-header">Project Documentation</li>
+    <li><a href="project-info.html" title="Project Information"><span 
class="icon-chevron-right"></span>Project Information</a>  </li>
+          <li class="nav-header">Maven Projects</li>
+    <li><a href="archetype/index.html" title="Archetype"><span 
class="none"></span>Archetype</a>  </li>
+    <li><a href="resolver/index.html" title="Artifact Resolver"><span 
class="none"></span>Artifact Resolver</a>  </li>
+    <li><a href="doxia/index.html" title="Doxia"><span 
class="none"></span>Doxia</a>  </li>
+    <li><a href="jxr/index.html" title="JXR"><span class="none"></span>JXR</a> 
 </li>
+    <li><a href="ref/current" title="Maven"><span 
class="none"></span>Maven</a>  </li>
+    <li><a href="pom/index.html" title="Parent POMs"><span 
class="none"></span>Parent POMs</a>  </li>
+    <li><a href="plugins/index.html" title="Plugins"><span 
class="none"></span>Plugins</a>  </li>
+    <li><a href="plugin-testing/index.html" title="Plugin Testing"><span 
class="none"></span>Plugin Testing</a>  </li>
+    <li><a href="plugin-tools/index.html" title="Plugin Tools"><span 
class="none"></span>Plugin Tools</a>  </li>
+    <li><a href="apache-resource-bundles/index.html" title="Resource 
Bundles"><span class="none"></span>Resource Bundles</a>  </li>
+    <li><a href="scm/index.html" title="SCM"><span class="none"></span>SCM</a> 
 </li>
+    <li><a href="shared/index.html" title="Shared Components"><span 
class="none"></span>Shared Components</a>  </li>
+    <li><a href="skins/index.html" title="Skins"><span 
class="none"></span>Skins</a>  </li>
+    <li><a href="surefire/index.html" title="Surefire"><span 
class="none"></span>Surefire</a>  </li>
+    <li><a href="wagon/index.html" title="Wagon"><span 
class="none"></span>Wagon</a>  </li>
+          <li class="nav-header">ASF</li>
+    <li><a href="https://www.apache.org/foundation/how-it-works.html"; 
class="externalLink" title="How Apache Works"><span class="none"></span>How 
Apache Works</a>  </li>
+    <li><a href="https://www.apache.org/foundation/"; class="externalLink" 
title="Foundation"><span class="none"></span>Foundation</a>  </li>
+    <li><a href="https://www.apache.org/foundation/sponsorship.html"; 
class="externalLink" title="Sponsoring Apache"><span 
class="none"></span>Sponsoring Apache</a>  </li>
+    <li><a href="https://www.apache.org/foundation/thanks.html"; 
class="externalLink" title="Thanks"><span class="none"></span>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">asyncJs( 
'https://cse.google.com/brand?form=search-form' )</script>
+          <hr />
+          <div id="poweredBy">
+          <script type="text/javascript">asyncJs( 
'https://apis.google.com/js/plusone.js' )</script>
+        <div class="g-plusone" data-href="https://maven.apache.org/"; 
data-size="tall" ></div>
+                  <div class="clear"></div>
+              <div class="clear"></div>
+              <div class="clear"></div>
+              <div class="clear"></div>
+  <a href="http://maven.apache.org/"; title="Built by Maven" 
class="poweredBy"><img class="builtBy" alt="Built by Maven" 
src="./images/logos/maven-feather.png" /></a>
+              </div>
+          </div>
+        </div>
+        <div id="bodyColumn"  class="span10" >
+<h1>Maven CI Friendly Versions</h1>
+<p>Starting with Maven 3.5.0-beta-1 you can use the <tt>${revision}</tt>, 
<tt>${sha1}</tt> and/or <tt>${changelist}</tt> as placeholders for the version 
in your pom file. </p>
+<div class="section">
+<h2><a name="Single_Project_Setup"></a>Single Project Setup</h2>
+<p>This can look like this:</p>
+
+<div class="source">
+<div class="source"><pre class="prettyprint linenums">&lt;project&gt;
+  &lt;modelVersion&gt;4.0.0&lt;/modelVersion&gt;
+  &lt;parent&gt;
+    &lt;groupId&gt;org.apache&lt;/groupId&gt;
+    &lt;artifactId&gt;apache&lt;/artifactId&gt;
+    &lt;version&gt;18&lt;/version&gt;
+  &lt;/parent&gt;
+  &lt;groupId&gt;org.apache.maven.ci&lt;/groupId&gt;
+  &lt;artifactId&gt;ci-parent&lt;/artifactId&gt;
+  &lt;name&gt;First CI Friendly&lt;/name&gt;
+  &lt;version&gt;${revision}&lt;/version&gt;
+  ...
+&lt;/project&gt;
+</pre></div></div>
+<p>This is of course a simple situation where we use only <tt>${revision}</tt> 
for brevity  to show the general course.</p>
+<p>Based on the above pom you can build your project using:</p>
+
+<div class="source">
+<div class="source"><pre class="prettyprint linenums">mvn clean package
+</pre></div></div>
+<p>But wait there is a problem? Which version will the artifacts have? So you 
need  to define the version for your artifacts. The first possibility is to use 
the command  line like this:</p>
+
+<div class="source">
+<div class="source"><pre class="prettyprint linenums">mvn 
-Drevision=1.0.0-SNAPSHOT clean package
+</pre></div></div>
+<p>This wil become cumbersome over the time. So the other solution for this is 
 to simply use a property inside the pom file which looks like this:</p>
+
+<div class="source">
+<div class="source"><pre class="prettyprint linenums">&lt;project&gt;
+  &lt;modelVersion&gt;4.0.0&lt;/modelVersion&gt;
+  &lt;parent&gt;
+    &lt;groupId&gt;org.apache&lt;/groupId&gt;
+    &lt;artifactId&gt;apache&lt;/artifactId&gt;
+    &lt;version&gt;18&lt;/version&gt;
+  &lt;/parent&gt;
+  &lt;groupId&gt;org.apache.maven.ci&lt;/groupId&gt;
+  &lt;artifactId&gt;ci-parent&lt;/artifactId&gt;
+  &lt;name&gt;First CI Friendly&lt;/name&gt;
+  &lt;version&gt;${revision}&lt;/version&gt;
+  ...
+  &lt;properties&gt;
+    &lt;revision&gt;1.0.0-SNAPSHOT&lt;/revision&gt;
+  &lt;/properties&gt;
+&lt;/project&gt;
+</pre></div></div>
+<p>So now you can simply call Maven as usual like <tt>mvn clean 
package</tt>.</p>
+<p>You can of course change the version via the command line like this:</p>
+
+<div class="source">
+<div class="source"><pre class="prettyprint linenums">mvn 
-Drevision=2.0.0-SNAPSHOT clean package
+</pre></div></div>
+<p>Of cource you can use the <tt>.mvn/maven.config</tt> file for 
this.</p></div>
+<div class="section">
+<h2><a name="Multi_Module_Setup"></a>Multi Module Setup</h2>
+<p>So now let us take a look into a situation where we have a multi module  
build. We have a parent pom and one or more childs.  The parent pom will look 
like this:</p>
+
+<div class="source">
+<div class="source"><pre class="prettyprint linenums">&lt;project&gt;
+  &lt;modelVersion&gt;4.0.0&lt;/modelVersion&gt;
+  &lt;parent&gt;
+    &lt;groupId&gt;org.apache&lt;/groupId&gt;
+    &lt;artifactId&gt;apache&lt;/artifactId&gt;
+    &lt;version&gt;18&lt;/version&gt;
+  &lt;/parent&gt;
+  &lt;groupId&gt;org.apache.maven.ci&lt;/groupId&gt;
+  &lt;artifactId&gt;ci-parent&lt;/artifactId&gt;
+  &lt;name&gt;First CI Friendly&lt;/name&gt;
+  &lt;version&gt;${revision}&lt;/version&gt;
+  ...
+  &lt;properties&gt;
+    &lt;revision&gt;1.0.0-SNAPSHOT&lt;/revision&gt;
+  &lt;/properties&gt;
+  &lt;modules&gt;
+    &lt;module&gt;child1&lt;/module&gt;
+    ..
+  &lt;/modules&gt;
+&lt;/project&gt;
+</pre></div></div>
+<p>The child will look like this:</p>
+
+<div class="source">
+<div class="source"><pre class="prettyprint linenums">&lt;project&gt;
+  &lt;modelVersion&gt;4.0.0&lt;/modelVersion&gt;
+  &lt;parent&gt;
+    &lt;groupId&gt;org.apache.maven.ci&lt;/groupId&gt;
+    &lt;artifactId&gt;ci-parent&lt;/artifactId&gt;
+    &lt;version&gt;${revision}&lt;/version&gt;
+  &lt;/parent&gt;
+  &lt;groupId&gt;org.apache.maven.ci&lt;/groupId&gt;
+  &lt;artifactId&gt;ci-child&lt;/artifactId&gt;
+   ...
+&lt;/project&gt;
+</pre></div></div>
+<p>A multi module build can of course build the same way as the single project 
setup. You should  define the version either via property in the parent or use 
the <tt>.mvn/maven.config</tt> file.</p></div>
+<div class="section">
+<h2><a name="Install__Deploy"></a>Install / Deploy</h2>
+<p>If you like to install or deploy artifacts by using the above setup you 
<b>have to use</b>  the <a class="externalLink" 
href="http://www.mojohaus.org/flatten-maven-plugin/";>flatten-maven-plugin</a> 
otherwise you will install/deploy artifacts  in your repository which will not 
be cosumable by older Maven versions. Such kind of setup  will look like 
this:</p>
+
+<div class="source">
+<div class="source"><pre class="prettyprint linenums">&lt;project&gt;
+  &lt;modelVersion&gt;4.0.0&lt;/modelVersion&gt;
+  &lt;parent&gt;
+    &lt;groupId&gt;org.apache&lt;/groupId&gt;
+    &lt;artifactId&gt;apache&lt;/artifactId&gt;
+    &lt;version&gt;18&lt;/version&gt;
+  &lt;/parent&gt;
+  &lt;groupId&gt;org.apache.maven.ci&lt;/groupId&gt;
+  &lt;artifactId&gt;ci-parent&lt;/artifactId&gt;
+  &lt;name&gt;First CI Friendly&lt;/name&gt;
+  &lt;version&gt;${revision}&lt;/version&gt;
+  ...
+  &lt;properties&gt;
+    &lt;revision&gt;1.0.0-SNAPSHOT&lt;/revision&gt;
+  &lt;/properties&gt;
+
+ &lt;build&gt;
+  &lt;plugins&gt;
+    &lt;plugin&gt;
+      &lt;groupId&gt;org.codehaus.mojo&lt;/groupId&gt;
+      &lt;artifactId&gt;flatten-maven-plugin&lt;/artifactId&gt;
+      &lt;version&gt;1.0.0&lt;/version&gt;
+      &lt;configuration&gt;
+        &lt;updatePomFile&gt;true&lt;/updatePomFile&gt;
+      &lt;/configuration&gt;
+      &lt;executions&gt;
+        &lt;execution&gt;
+          &lt;id&gt;flatten&lt;/id&gt;
+          &lt;phase&gt;process-resources&lt;/phase&gt;
+          &lt;goals&gt;
+            &lt;goal&gt;flatten&lt;/goal&gt;
+          &lt;/goals&gt;
+        &lt;/execution&gt;
+        &lt;execution&gt;
+          &lt;id&gt;flatten.clean&lt;/id&gt;
+          &lt;phase&gt;clean&lt;/phase&gt;
+          &lt;goals&gt;
+            &lt;goal&gt;clean&lt;/goal&gt;
+          &lt;/goals&gt;
+        &lt;/execution&gt;
+      &lt;/executions&gt;
+    &lt;/plugin&gt;
+  &lt;/plugins&gt;
+  &lt;/build&gt;
+  &lt;modules&gt;
+    &lt;module&gt;child1&lt;/module&gt;
+    ..
+  &lt;/modules&gt;
+&lt;/project&gt;
+</pre></div></div></div>
+        </div>
+      </div>
+    </div>
+    <hr/>
+    <footer>
+      <div class="container-fluid">
+        <div class="row-fluid">
+            <p>Copyright &copy;2002&#x2013;2017
+<a href="https://www.apache.org/";>The Apache Software Foundation</a>.
+All rights reserved.</p>
+        </div>
+        </div>
+    </footer>
+    </body>
+</html>

Modified: websites/staging/maven/trunk/content/maven-site-1.0-site.jar
==============================================================================
Binary files - no diff available.


Reply via email to