svn commit: r787470 - in /websites/production/aries: ./ content/development/maven-best-practice-in-aries.html content/development/versionpolicy.html

[zo...@apache.org]

Author: zoe
Date: Thu Mar 24 15:18:37 2011
New Revision: 787470

Log:
updated version policy and maven best practice

Modified:
    websites/production/aries/   (props changed)
    websites/production/aries/content/development/maven-best-practice-in-aries.html
    websites/production/aries/content/development/versionpolicy.html

Propchange: websites/production/aries/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 24 15:18:37 2011
@@ -1 +1 @@
-/websites/staging/aries/trunk:782169-787466
+/websites/staging/aries/trunk:782169-787469

Modified: websites/production/aries/content/development/maven-best-practice-in-aries.html
==============================================================================
--- websites/production/aries/content/development/maven-best-practice-in-aries.html (original)
+++ websites/production/aries/content/development/maven-best-practice-in-aries.html Thu Mar 24 15:18:37 2011
@@ -242,32 +242,23 @@
 <h1 id="maven_best_practice_in_aries_development">Maven best practice in Aries development</h1>
 <p><a name="MavenbestpracticeinAries-Overallstructure"></a></p>
 <h3 id="overall_structure">Overall structure</h3>
-<p>The Aries project is a collection of loosely couple modules, therefore
-it must be possible to build each module on its own. This implies:</p>
+<p>The Aries project is a collection of loosely couple bundles, therefore
+it must be possible to build each bundle on its own. This implies:</p>
 <ol>
 <li>A parent pom that isn't at the root of the SVN trunk.</li>
-<li>Each module has enough pom info so that it can be released
+<li>Each bundle has enough pom info so that it can be released
 independently.</li>
 <li>parent/default-parent has dependency management for basic osgi-dependencies that
 all projects are almost certain to use (this includes PAX dependencies for
 testing).</li>
-<li>Each module has legal files in its checkout root.</li>
-<li>Each module has an SCM element in its top level pom and <em>not</em> in any other pom in the module.</li>
-<li>Each module has dependency management for everything included in it. 
-In addition, it has its sub-projects listed in dependency management.  This
-means that</li>
-<li>sub-project poms should not include versions for use of other
-modules</li>
-<li>you can get dependency management for all the modules in a subproject by
-depending on the subproject pom with scope import  (see the samples pom for
-an example).</li>
-<li>As a result of the above, modules don't have any versions in any
-dependency elements</li>
+<li>Each bundle has legal files in its checkout root.</li>
+<li>Each bundle has an SCM element in its top level pom.</li>
+<li>Bundles do not (except samples) have sub-modules.</li>
 </ol>
 <p><a name="MavenbestpracticeinAries-Goodpracticeinthepom"></a></p>
 <h3 id="good_practice_in_the_pom">Good practice in the pom</h3>
 <ol>
-<li>Alphabetic ordering in dependency management</li>
+<li>Alphabetic ordering in dependency management is helpful</li>
 <li>Include a brief description of the project</li>
 <li>Commenting in platform dependencies, see samples assembly projects.</li>
 <li>Use ${project.version} <em>not</em> ${version} for Maven 3 compatibility.</li>

Modified: websites/production/aries/content/development/versionpolicy.html
==============================================================================
--- websites/production/aries/content/development/versionpolicy.html (original)
+++ websites/production/aries/content/development/versionpolicy.html Thu Mar 24 15:18:37 2011
@@ -238,7 +238,7 @@
           </td>
           <td height="100%" width="100%">
             <!-- Content -->
-            <div class="wiki-content"><h1 id="versioning_policy_-_draft">Versioning policy - DRAFT</h1>
+            <div class="wiki-content"><h1 id="aries_versioning_policy">Aries versioning policy</h1>
 <p>The Aries  project aims to implement OSGi semantic versioning as described <a href="http://www.osgi.org/wiki/uploads/Links/SemanticVersioning.pdf">here</a>.</p>
 <p>The implementation of semantic versioning has a number of practical implications for managing a project. These are
 outlined in this section. </p>