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/24 20:28:44 UTC
svn commit: r843730 - in /websites/staging/isis/trunk: cgi-bin/ content/
content/contributors/ content/contributors/resources/
content/core/release-notes/
Author: buildbot
Date: Mon Dec 24 19:28:44 2012
New Revision: 843730
Log:
Staging update by buildbot for isis
Added:
websites/staging/isis/trunk/content/contributors/resources/nexus-release-1.png (with props)
websites/staging/isis/trunk/content/release-matrix.html
Modified:
websites/staging/isis/trunk/cgi-bin/ (props changed)
websites/staging/isis/trunk/content/ (props changed)
websites/staging/isis/trunk/content/contributors/release-process.html
websites/staging/isis/trunk/content/contributors/verifying-releases.html
websites/staging/isis/trunk/content/core/release-notes/isis-1.0.0.html
websites/staging/isis/trunk/content/documentation.html
Propchange: websites/staging/isis/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Mon Dec 24 19:28:44 2012
@@ -1 +1 @@
-1425007
+1425670
Propchange: websites/staging/isis/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Mon Dec 24 19:28:44 2012
@@ -1 +1 @@
-1425007
+1425670
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 Mon Dec 24 19:28:44 2012
@@ -981,9 +981,7 @@ The vote is (UN)SUCCESSFUL.
<p>From the Nexus pages, select the staging repository and select 'release' from the top menu.</p>
-<!--
-TODO: adda screenshot
--->
+<p><img src="resources/nexus-release-1.png" width="600px"/></p>
<p>This moves the release artifacts into an Apache releases repository; from there they will be automatically moved to the Maven repository.</p>
@@ -1120,13 +1118,13 @@ Enjoy!
<pre>
git checkout master # update master with latest
git pull
-git checkout prepare/isis-1.2.3 # apply branch commits onto master
-git rebase master
-git checkout master
-git branch -D prepare/isis-1.2.3 # branch no longer needed
+git merge prepare/isis-1.2.3 # merge branch onto master
+git branch -d prepare/isis-1.2.3 # branch no longer needed
git push origin --delete prepare/isis-1.2.3 # remote branch no longer needed
</pre>
+<p>If the core was updated, then you'll most likely need to update other POMs to the new <code>-SNAPSHOT</code>.</p>
+
<p>Next, do a sanity check that everything builds ok:</p>
<pre>
@@ -1150,50 +1148,6 @@ git push
</pre>
<!--
-TODO: may need to reinstate something like this
-
-
-
-5157b21f613c5fc790fc01a3eee007a0
-
-
-
-After the release there are a couple of locations where the version must be bumped up manually to the next SNAPSHOT version.
-
-
-
-b5800400234f963bcc8493ac1e27e7e3
-
-
-
-Open up the `src/main/resources/archetype-resources/pom.xml` in the `oai:quickstart-archetype` module, and update the `<isis.version>` property:
-
-
-
-44c246a3238abd7ddbd50f80f550ce43
-
-
-
-Then commit the `pom.xml` file.
-
-
-
-027500d9d2332e08b1d2095ff2676505
-
-
-
-Open up the `src/site/site.xml` in the `oai:isis` parent module, and update the `<version>`:
-
-
-
-9a8948374f63be93d5be86ef21843ee8
-
-
-
-Then commit the `site.xml` file.
--->
-
-<!--
1974efeb3c28e0c118cbc388807db0fe
Added: websites/staging/isis/trunk/content/contributors/resources/nexus-release-1.png
==============================================================================
Binary file - no diff available.
Propchange: websites/staging/isis/trunk/content/contributors/resources/nexus-release-1.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Modified: websites/staging/isis/trunk/content/contributors/verifying-releases.html
==============================================================================
--- websites/staging/isis/trunk/content/contributors/verifying-releases.html (original)
+++ websites/staging/isis/trunk/content/contributors/verifying-releases.html Mon Dec 24 19:28:44 2012
@@ -191,7 +191,7 @@
<p>Per this <a href="http://www.apache.org/dev/release.html">ASF documentation</a>, the legal requirements for an ASF release are:</p>
<ul>
-<li>a source zip file + corresponding signature (signed by me, which is in the ASF web of trust and in our KEYS file)</li>
+<li>a source zip file + corresponding signature (signed by the release manager, which is in the ASF web of trust and in our KEYS file)</li>
<li>all source files have the Apache license (this is ensured by the running of the rat plugin prior to release; you could run it on the unzipped source)</li>
<li>all dependencies are appropriately licensed; see the <code>DEPENDENCIES</code> file which is automatically generated from the POMs plus the supplemental-models.xml file</li>
</ul>
Modified: websites/staging/isis/trunk/content/core/release-notes/isis-1.0.0.html
==============================================================================
--- websites/staging/isis/trunk/content/core/release-notes/isis-1.0.0.html (original)
+++ websites/staging/isis/trunk/content/core/release-notes/isis-1.0.0.html Mon Dec 24 19:28:44 2012
@@ -259,6 +259,8 @@
</li>
<li>[<a href='https://issues.apache.org/jira/browse/ISIS-286'>ISIS-286</a>] - Make sure pending changes are stored before issuing a query
</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-288'>ISIS-288</a>] - During start up the configuration files are read in repeatedly making it confusing to track down configuration issues
+</li>
</ul>
<h2> Bug
Modified: websites/staging/isis/trunk/content/documentation.html
==============================================================================
--- websites/staging/isis/trunk/content/documentation.html (original)
+++ websites/staging/isis/trunk/content/documentation.html Mon Dec 24 19:28:44 2012
@@ -201,12 +201,13 @@
<h3>Archetypes</h3>
<ul>
-<li><a href="getting-started/quickstart-archetype.html">Quickstart Archetype</a> (<code>1.0.0-RC1</code>)
-<!--</li>
-<li><a href="getting-started/quickstart-archetype-wicket-restful-jdo.html">Wicket/Restful/JDO Archetype</a></li>
-<li><a href="getting-started/quickstart-archetype-scimpi-nosql.html">Scimpi/NoSQL Archetype</a></li>
-<li><a href="getting-started/quickstart-archetype-dnd-xml.html">DnD/XML Archetype</a>
--->
+<li><a href="getting-started/quickstart-archetype.html">Wicket/Restful/JDO Archetype</a> (<code>1.0.0</code>)</li>
+</ul>
+
+<h3>Releases</h3>
+
+<ul>
+<li><a href="release-matrix.html">Release Matrix</a>
</div>
<div class="span-one-third"></li>
</ul>
@@ -253,7 +254,7 @@
<div class="group"></li>
</ul>
-<h2>Core <a href="core/release-notes/about.html">1.0.0-RC2</a></h2>
+<h2>Core <a href="core/release-notes/about.html">1.0.0</a></h2>
<p><div class="row-even">
<div class="span-one-third"></p>
@@ -297,7 +298,7 @@
<p><div class="row-odd">
<div class="span-one-third"></p>
-<h3>Wicket <a href="components/viewers/wicket/release-notes/about.html">1.0.0-RC2</a></h3>
+<h3>Wicket <a href="components/viewers/wicket/release-notes/about.html">1.0.0</a></h3>
<ul>
<li><a href="components/viewers/wicket/about.html">About</a>
@@ -305,7 +306,7 @@
<div class="span-one-third"></li>
</ul>
-<h3>RestfulObjects <a href="components/viewers/restfulobjects/release-notes/about.html">1.0.0-RC2</a></h3>
+<h3>RestfulObjects <a href="components/viewers/restfulobjects/release-notes/about.html">1.0.0</a></h3>
<ul>
<li><a href="components/viewers/restfulobjects/about.html">About</a>
@@ -366,7 +367,7 @@
<p><div class="row-even">
<div class="span-one-third"></p>
-<h3>JDO <a href="components/objectstores/jdo/release-notes/about.html">1.0.0-RC2</a></h3>
+<h3>JDO <a href="components/objectstores/jdo/release-notes/about.html">1.0.0</a></h3>
<ul>
<li><a href="components/objectstores/jdo/about.html">About</a></li>
@@ -401,7 +402,7 @@
<p><div class="row-even">
<div class="span-one-third"></p>
-<h3>File <a href="components/security/file/release-notes/about.html">1.0.0-RC2</a></h3>
+<h3>File <a href="components/security/file/release-notes/about.html">1.0.0</a></h3>
<ul>
<li><a href="components/security/file/about.html">About</a>
Added: websites/staging/isis/trunk/content/release-matrix.html
==============================================================================
--- websites/staging/isis/trunk/content/release-matrix.html (added)
+++ websites/staging/isis/trunk/content/release-matrix.html Mon Dec 24 19:28:44 2012
@@ -0,0 +1,308 @@
+<!DOCTYPE html>
+<html lang="en">
+ <head>
+
+ <meta charset="utf-8">
+ <title>Release Matrix
</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=Release Matrix
",
+ '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></p>
+<h1>Release Matrix
+
+</h1>
+</div>
+
+<table>
+<tr>
+ <th> </th>
+ <th> </th>
+ <th> </th>
+ <th> </th>
+ <th span="1">Security</th>
+ <th span="1">Objectstores</th>
+ <th span="2">Viewers</th>
+</tr>
+<tr>
+ <th> </th>
+ <th> </th>
+ <th> </th>
+ <th>Core</th>
+ <th>File</th>
+ <th>JDO</th>
+ <th>Wicket</th>
+ <th>Restful</th>
+</tr>
+<tr>
+ <td>Core</td>
+ <td> </td>
+ <td>1.0.0</td>
+ <td>-</td>
+ <td>-</td>
+ <td>-</td>
+ <td>-</td>
+ <td>-</td>
+</tr>
+<tr>
+ <td>Security</td>
+ <td>File</td>
+ <td>1.0.0</td>
+ <td>1.0.0</td>
+ <td>-</td>
+ <td>-</td>
+ <td>-</td>
+ <td>-</td>
+</tr>
+<tr>
+ <td>Objectstore</td>
+ <td>JDO</td>
+ <td>1.0.0</td>
+ <td>1.0.0</td>
+ <td>-</td>
+ <td>-</td>
+ <td>-</td>
+ <td>-</td>
+</tr>
+<tr>
+ <td>Viewer</td>
+ <td>Wicket</td>
+ <td>1.0.0</td>
+ <td>1.0.0</td>
+ <td>-</td>
+ <td>-</td>
+ <td>-</td>
+ <td>-</td>
+</tr>
+<tr>
+ <td>Viewer</td>
+ <td>Restful</td>
+ <td>1.0.0</td>
+ <td>1.0.0</td>
+ <td>-</td>
+ <td>-</td>
+ <td>-</td>
+ <td>-</td>
+</tr>
+<tr>
+ <td>Archetype</td>
+ <td>WRJ</td>
+ <td>1.0.0</td>
+ <td>-</td>
+ <td>1.0.0</td>
+ <td>1.0.0</td>
+ <td>1.0.0</td>
+ <td>1.0.0</td>
+</tr>
+</table>
+
+
+
+ </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>