You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by bu...@apache.org on 2012/12/14 09:24:05 UTC
svn commit: r842269 - in /websites/staging/isis/trunk: cgi-bin/ content/
content/contributors/about.html content/contributors/release-process.html
content/contributors/versioning-policy.html
Author: buildbot
Date: Fri Dec 14 08:24:04 2012
New Revision: 842269
Log:
Staging update by buildbot for isis
Added:
websites/staging/isis/trunk/content/contributors/versioning-policy.html
Modified:
websites/staging/isis/trunk/cgi-bin/ (props changed)
websites/staging/isis/trunk/content/ (props changed)
websites/staging/isis/trunk/content/contributors/about.html
websites/staging/isis/trunk/content/contributors/release-process.html
Propchange: websites/staging/isis/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri Dec 14 08:24:04 2012
@@ -1 +1 @@
-1421710
+1421720
Propchange: websites/staging/isis/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri Dec 14 08:24:04 2012
@@ -1 +1 @@
-1421710
+1421720
Modified: websites/staging/isis/trunk/content/contributors/about.html
==============================================================================
--- websites/staging/isis/trunk/content/contributors/about.html (original)
+++ websites/staging/isis/trunk/content/contributors/about.html Fri Dec 14 08:24:04 2012
@@ -191,6 +191,7 @@
<li><a href="using-git.html">Using Git</a></li>
<li><a href="git-workflow.html">Git Workflow</a></li>
<li><a href="coding-conventions.html">Coding Conventions</a></li>
+<li><a href="versioning-policy.html">Versioning Policy</a></li>
</ul>
<h3>Committers</h3>
@@ -201,7 +202,7 @@
<li><a href="release-process.html">Release process</a></li>
<li><a href="release-branch-and-tag-names.html">Release branch and tag names</a></li>
<li><a href="verifying-releases.html">Verifying releases</a></li>
-<li><a href="key-generation.html">Key Generation</a></li>
+<li><a href="key-generation.html">Key generation</a></li>
</ul>
Modified: websites/staging/isis/trunk/content/contributors/release-process.html
==============================================================================
--- websites/staging/isis/trunk/content/contributors/release-process.html (original)
+++ websites/staging/isis/trunk/content/contributors/release-process.html Fri Dec 14 08:24:04 2012
@@ -282,7 +282,7 @@ git checkout master
git pull --ff-only
</pre>
-<p>Then, determine/confirm the version number of the module being released. This should be in line with our <a href="release-semantic-versioning.html">semantic versioning policy</a>.</p>
+<p>Then, determine/confirm the version number of the module being released. This should be in line with our <a href="versioning-policy.html">semantic versioning policy</a>.</p>
<p>Next, create a release branch in your local Git repo, using the version number determined and as per <a href="release-branch-and-tag-names.html">these standards</a>. For example, to prepare a release 1.0.0 of <code>core</code>, use:</p>
Added: websites/staging/isis/trunk/content/contributors/versioning-policy.html
==============================================================================
--- websites/staging/isis/trunk/content/contributors/versioning-policy.html (added)
+++ websites/staging/isis/trunk/content/contributors/versioning-policy.html Fri Dec 14 08:24:04 2012
@@ -0,0 +1,276 @@
+<!DOCTYPE html>
+<html lang="en">
+ <head>
+
+ <meta charset="utf-8">
+ <title>Versioning Policy
</title>
+ <meta name="description" content="">
+ <meta name="author" content="">
+
+ <!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
+ <!--[if lt IE 9]>
+ <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+ <![endif]-->
+
+ <!-- Le styles -->
+ <link href="./../bootstrap.css" rel="stylesheet">
+ <link href="./../prettify.css" rel="stylesheet">
+ <link href="./../bootstrap-mods.css" rel="stylesheet">
+
+ <style type="text/css">
+ body {
+ padding-top: 60px;
+ }
+ .sprite {
+ display: inline-block;
+ height: 20px;
+ margin: 0 auto 4px;
+ outline: medium none;
+ text-indent: -999em;
+ width: 24px;
+ background-image: url('./../images/sprites.png');
+ background-repeat: no-repeat;
+ overflow: hidden;
+ cursor: pointer;
+ }
+ .edit-page {
+ display: inline-block;
+ height: 20px;
+ margin: 0 auto 4px;
+ outline: medium none;
+ text-indent: -999em;
+ width: 24px;
+ background-image: url('./../images/edit.png');
+ background-repeat: no-repeat;
+ overflow: hidden;
+ cursor: pointer;
+ }
+ .fb-share {
+ background-position: 0px -40px;
+ }
+ .gp-share {
+ background-position: 0px 0px;
+ }
+ .tw-share {
+ background-position: 0px -80px;
+ }
+ .markdown-content {
+ min-height: 500px;
+ }
+ .book-image img {
+ border: 1px;
+ border-style: solid;
+ }
+ .stub,.note {
+ position: relative;
+ padding: 7px 15px;
+ margin-bottom: 18px;
+ color: #404040;
+ background-color: #eedc94;
+ background-repeat: repeat-x;
+ background-image: -khtml-gradient(linear, left top, left bottom, from(#fceec1), to(#eedc94));
+ background-image: -moz-linear-gradient(top, #fceec1, #eedc94);
+ background-image: -ms-linear-gradient(top, #fceec1, #eedc94);
+ background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #fceec1), color-stop(100%, #eedc94));
+ background-image: -webkit-linear-gradient(top, #fceec1, #eedc94);
+ background-image: -o-linear-gradient(top, #fceec1, #eedc94);
+ background-image: linear-gradient(top, #fceec1, #eedc94);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fceec1', endColorstr='#eedc94', GradientType=0);
+ text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+ border-color: #eedc94 #eedc94 #e4c652;
+ border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+ text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+ border-width: 1px;
+ border-style: solid;
+ -webkit-border-radius: 4px;
+ -moz-border-radius: 4px;
+ border-radius: 4px;
+ -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
+ -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
+ box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
+ }
+ </style>
+ <script type="text/javascript">
+ function fbshare () {
+ window.open(
+ "http://www.facebook.com/sharer/sharer.php?u="+document.URL,
+ 'Share on Facebook',
+ 'width=640,height=426');
+ };
+ function gpshare () {
+ window.open(
+ "https://plus.google.com/share?url="+document.URL,
+ 'Share on Google+',
+ 'width=584,height=385');
+ };
+ function twshare () {
+ window.open(
+ "https://twitter.com/intent/tweet?url="+document.URL+"&text=Versioning Policy
",
+ 'Share on Twitter',
+ 'width=800,height=526');
+ };
+ </script>
+
+ <!-- Le fav and touch icons -->
+ <link rel="shortcut icon" href="./../images/favicon.ico">
+ <link rel="apple-touch-icon" href="./../images/apple-touch-icon.png">
+ <link rel="apple-touch-icon" sizes="72x72" href="./../images/apple-touch-icon-72x72.png">
+ <link rel="apple-touch-icon" sizes="114x114" href="./../images/apple-touch-icon-114x114.png">
+
+ <script src="./../javascript/prettify.js" type="text/javascript"></script>
+ <script src="./../javascript/jquery-latest.js"></script>
+ <script src="http://platform.twitter.com/widgets.js" type="text/javascript"></script>
+ <script src="./../javascript/common.js"></script>
+ <script src="./../javascript/prettyprint.js"></script>
+
+ <script type="text/javascript">
+
+ var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-2717626-1']);
+ _gaq.push(['_setDomainName', 'apache.org']);
+ _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>
+
+ <div class="topbar">
+ <div class="fill">
+ <div class="container">
+ <a class="brand" href="./../index.html">Apache Isis</a>
+ <ul class="nav">
+ <li><a href="./../index.html">Home</a></li>
+ <li><a href="./../download.html">Download</a></li>
+ <li><a href="./../documentation.html">Documentation</a></li>
+ <li><a href="./../support.html">Support</a></li>
+ </ul>
+
+ <!-- Google CSE Search Box Begins -->
+ <div style="float: right; position: relative; ">
+ <form action="http://www.google.com/cse" id="cse-search-box" _lpchecked="1">
+ <div>
+ <input type="hidden" name="cx" value="001500763902520246267:purt3m54z98">
+ <input type="hidden" name="ie" value="UTF-8">
+ <input type="text" name="q" size="31" style="border: 1px solid rgb(126, 157, 185); padding: 2px; background-color: rgb(255, 255, 255); background-position: 0% 50%; background-repeat: no-repeat no-repeat;">
+ <input type="submit" name="sa" value="Search">
+ </div>
+ <input name="siteurl" type="hidden" value="incubator.apache.org/isis/">
+ <input name="ref" type="hidden" value="">
+ <input name="ss" type="hidden" value="677j458329j2">
+ </form>
+ </div>
+ <!-- Google CSE Search Box Ends -->
+ </div>
+ </div>
+ </div>
+
+ <div class="container">
+ <div class="markdown-content">
+
+
+<div class="page-header">
+<p><a href="./../documentation.html">Docs</a> » <a href="./../contributors/about.html">Contributors</a></p>
+<h1>Versioning Policy
+
+</h1>
+</div>
+
+<h2>Semantic Versioning</h2>
+
+<p>Starting from v1.0.0, Isis has adopted <a href="http://semver.org">semantic versioning</a>
+for its versioning policy.</p>
+
+<p>Version numbers are in the form <code>x.y.z</code>:</p>
+
+<ul>
+<li>x is bumped up whenever there a breaking API change</li>
+<li>y is bumped up whenever there is a new feature that does not break API</li>
+<li>z is bumped up for minor bug fixes.</li>
+</ul>
+
+<p>This scheme would be adopted for both core and components. </p>
+
+<h2>Version numbers are not synchronized between Core and Components</h2>
+
+<p>Version numbers are NOT kept in sync between core and components. Therefore components should clearly indicate the version of core that they depend upon.</p>
+
+<p>For example, here is a possible flow of how versioning might evolve over a number of releases:</p>
+
+<ul>
+<li><code>core 1.0.0</code> is released</li>
+<li><code>isis-objectstore-jdo 1.0.0 is released, dependent on</code>core 1.0.0`</li>
+<li><code>isis-viewer-wicket 1.0.0</code> is released, dependent on <code>core 1.0.0</code></li>
+<li><code>core 1.0.1</code> is released. This is NOT picked up by either of the above components.</li>
+<li><code>isis-objectstore-jdo 1.0.1</code> is released, dependent on <code>core 1.0.1</code>. This also incorporates a number of its own bug fixes</li>
+<li><code>core 1.1.0</code> is released, providing a new feature</li>
+<li><code>isis-viewer-wicket 1.1.0</code> is released, using the new feature provided by <code>core 1.1.0</code>.</li>
+<li><code>isis-viewer-wicket 1.2.0</code> is released, offering its own new feature. It still depends on core <code>1.1.0</code>.</li>
+<li><code>isis-objectstore-jdo 1.0.2</code> is released. This has some bug fixes and depends on <code>core 1.1.0</code> (even though it does not require the new feature introduced in <code>core 1.1.0</code>, it tracks the latest available version of <code>core</code>)</li>
+<li><code>core 2.0.0</code> is released, making breaking changes to the objectstore API</li>
+<li><code>isis-objectstore-jdo 2.0.0</code> is released, dependent on <code>core 2.0.0</code>.</li>
+<li><code>isis-objectstore-jdo 2.1.0</code> is released, providing a new feature. It depends on <code>core 2.0.0</code>.</li>
+<li><code>isis-viewer-wicket 1.2.1</code> is released. This has some bug fixes, and also updates to run against <code>core 2.0.0</code>.</li>
+</ul>
+
+<p>At the end of this sequence we have:
+- <code>core 2.0.0</code>
+- <code>isis-objectstore-jdo 2.1.0</code>, dependent upon <code>core 2.0.0</code>
+- <code>isis-wicket-viewer 1.2.1</code>, dependent upon <code>core 2.0.0</code></p>
+
+<h2>Version numbers may not be used</h2>
+
+<p>Version ranges may not be used. If necessary, end-users can use <code><dependencyManagement</code> elements to have combine components built against different versions of core.</p>
+
+<p>That said, this can introduce instability and so generally we recommend that end-users configure the <code>maven-enforcer-plugin</code> and its <a href="http://maven.apache.org/enforcer/enforcer-rules/dependencyConvergence.html">DependencyConvergence</a> rule. This will avoid "jar hell" (components having conflicting dependencies of core).</p>
+
+<p>If there is a conflict, we would ask that end-users engage with Isis committers to have an updated version of the component(s) pushed out.</p>
+
+
+
+ </div>
+
+ <div id="edit" class="modal hide fade in" style="display: none; ">
+ <div class="modal-header">
+ <a class="close" data-dismiss="modal">x</a>
+
+ <h3>Thank you for contributing to the documention!</h3>
+ </div>
+ <div class="modal-body">
+ <h4>Any help with the documentation is greatly appreciated.</h4>
+ <p>All edits are reviewed before going live, so feel free to do much more than fix typos or links. If you see a page that could benefit from an entire rewrite, we'd be thrilled to review it. Don't be surprised if we like it so much we ask you for help with other pages :)</p>
+ <small>NOTICE: unless indicated otherwise on the pages in question, all editable content available from apache.org is presumed to be licensed under the Apache License (AL) version 2.0 and hence all submissions to apache.org treated as formal Contributions under the license terms.</small>
+ <!--[if gt IE 6]>
+ <h4>Internet Explorer Users</h4>
+ <p>If you are not an Apache committer, click the Yes link and enter a <i>anonymous</i> for the username and leave the password empty</p>
+ <![endif]-->
+
+ </div>
+ <div class="modal-footer">
+ Do you have an Apache ID?
+ <a href="javascript:void(location.href='https://cms.apache.org/redirect?uri='+escape(location.href))" class="btn">Yes</a>
+ <a href="javascript:void(location.href='https://anonymous:@cms.apache.org/redirect?uri='+escape(location.href))" class="btn">No</a>
+ </div>
+ </div>
+ <script src="./../javascript/bootstrap-modal.js"></script>
+
+ <footer>
+ <p>
+ Copyright © 2012 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
+ <br/>
+ Apache and the Apache feather logo are trademarks of The Apache Software Foundation.
+ </p>
+ </footer>
+
+ </div> <!-- /container -->
+
+ </body>
+</html>