Return-Path: Delivered-To: apmail-aries-commits-archive@www.apache.org Received: (qmail 31429 invoked from network); 15 Mar 2011 10:01:54 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 15 Mar 2011 10:01:54 -0000 Received: (qmail 61206 invoked by uid 500); 15 Mar 2011 10:01:54 -0000 Delivered-To: apmail-aries-commits-archive@aries.apache.org Received: (qmail 61133 invoked by uid 500); 15 Mar 2011 10:01:54 -0000 Mailing-List: contact commits-help@aries.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@aries.apache.org Delivered-To: mailing list commits@aries.apache.org Received: (qmail 61125 invoked by uid 99); 15 Mar 2011 10:01:54 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 Mar 2011 10:01:54 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 Mar 2011 10:01:51 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 346FB2388A5E; Tue, 15 Mar 2011 10:01:28 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r786994 - in /websites/production/aries: ./ content/development/versionpolicy.html Date: Tue, 15 Mar 2011 10:01:28 -0000 To: commits@aries.apache.org From: zoe@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110315100128.346FB2388A5E@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: zoe Date: Tue Mar 15 10:01:27 2011 New Revision: 786994 Log: fixing bullet points Modified: websites/production/aries/ (props changed) websites/production/aries/content/development/versionpolicy.html Propchange: websites/production/aries/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Mar 15 10:01:27 2011 @@ -1 +1 @@ -/websites/staging/aries/trunk:782169-786990 +/websites/staging/aries/trunk:782169-786993 Modified: websites/production/aries/content/development/versionpolicy.html ============================================================================== --- websites/production/aries/content/development/versionpolicy.html (original) +++ websites/production/aries/content/development/versionpolicy.html Tue Mar 15 10:01:27 2011 @@ -266,22 +266,18 @@ the section which specifies where packag

Developers must increment the versions in packageinfo files in strict accordance with OSGi semantic versioning when they make changes to a package. The version should relate to the most recent release of the package and not to the version found in trunk. For example:

+

Scenario 1, making changes to a package with released version a.b.c

    -
  • Scenario 1, making changes to a package with released version a.b.c
  • Developer A fixes a bug in the package and increments it's version to a.b.c+1
  • -
  • -

    Developer B fixes another bug in the package but leaves the version at a.b.c+1

    -
  • -
  • -

    Scenario 2, making changes to a package with released version a.b.c

    -
  • +
  • Developer B fixes another bug in the package but leaves the version at a.b.c+1
  • +
+

Scenario 2, making changes to a package with released version a.b.c

+
  • Developer A adds a method to an interface in the package and increments it's version to a.b+1.0
  • -
  • -

    Developer B fixes a bug in the package, leaves its version at a.b+1.0

    -
  • -
  • -

    Scenario 3, making changes to a package with released version a.b.c

    -
  • +
  • Developer B fixes a bug in the package, leaves its version at a.b+1.0
  • +
+

Scenario 3, making changes to a package with released version a.b.c

+
  • Developer A fixes a bug in the package, and increments its version to a.b.c+1
  • Developer B deletes a method from an interface and increases the package version to a+1.0.0