You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2012/12/24 20:28:37 UTC
svn commit: r1425670 - in /isis/site/trunk/content:
contributors/release-process.md contributors/resources/nexus-release-1.png
contributors/verifying-releases.md core/release-notes/isis-1.0.0.md
documentation.md release-matrix.md
Author: danhaywood
Date: Mon Dec 24 19:28:37 2012
New Revision: 1425670
URL: http://svn.apache.org/viewvc?rev=1425670&view=rev
Log:
isis site - updated for 1.0.0
Added:
isis/site/trunk/content/contributors/resources/nexus-release-1.png (with props)
isis/site/trunk/content/release-matrix.md
Modified:
isis/site/trunk/content/contributors/release-process.md
isis/site/trunk/content/contributors/verifying-releases.md
isis/site/trunk/content/core/release-notes/isis-1.0.0.md
isis/site/trunk/content/documentation.md
Modified: isis/site/trunk/content/contributors/release-process.md
URL: http://svn.apache.org/viewvc/isis/site/trunk/content/contributors/release-process.md?rev=1425670&r1=1425669&r2=1425670&view=diff
==============================================================================
--- isis/site/trunk/content/contributors/release-process.md (original)
+++ isis/site/trunk/content/contributors/release-process.md Mon Dec 24 19:28:37 2012
@@ -768,9 +768,7 @@ Address the problems identified in the v
From the Nexus pages, select the staging repository and select 'release' from the top menu.
-<!--
-TODO: adda screenshot
--->
+<img src="resources/nexus-release-1.png" width="600px"/>
This moves the release artifacts into an Apache releases repository; from there they will be automatically moved to the Maven repository.
@@ -912,13 +910,13 @@ Because we release from a branch, the ch
<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>
+If the core was updated, then you'll most likely need to update other POMs to the new `-SNAPSHOT`.
+
Next, do a sanity check that everything builds ok:
<pre>
@@ -943,41 +941,6 @@ git push
</pre>
-
-<!--
-TODO: may need to reinstate something like this
-
-### Manually update versions to snapshot versions
-
-After the release there are a couple of locations where the version must be bumped up manually to the next SNAPSHOT version.
-
-#### Update `<version>` in archetype resources
-
-Open up the `src/main/resources/archetype-resources/pom.xml` in the `oai:quickstart-archetype` module, and update the `<isis.version>` property:
-
-<pre>
-<properties>
- <isis.version>1.2.3-SNAPSHOT</isis.version>
-</properties>
-</pre>
-
-Then commit the `pom.xml` file.
-
-#### Update skin <version>
-
-Open up the `src/site/site.xml` in the `oai:isis` parent module, and update the `<version>`:
-
-<pre>
-<skin>
- ...
- <version>1.2.3-SNAPSHOT</version>
-</skin>
-</pre>
-
-Then commit the `site.xml` file.
--->
-
-
<!--
### Update CMS site with generated Maven site
Added: isis/site/trunk/content/contributors/resources/nexus-release-1.png
URL: http://svn.apache.org/viewvc/isis/site/trunk/content/contributors/resources/nexus-release-1.png?rev=1425670&view=auto
==============================================================================
Binary file - no diff available.
Propchange: isis/site/trunk/content/contributors/resources/nexus-release-1.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: isis/site/trunk/content/contributors/verifying-releases.md
URL: http://svn.apache.org/viewvc/isis/site/trunk/content/contributors/verifying-releases.md?rev=1425670&r1=1425669&r2=1425670&view=diff
==============================================================================
--- isis/site/trunk/content/contributors/verifying-releases.md (original)
+++ isis/site/trunk/content/contributors/verifying-releases.md Mon Dec 24 19:28:37 2012
@@ -6,7 +6,7 @@ This page provides some guidance on what
Per this [ASF documentation](http://www.apache.org/dev/release.html), the legal requirements for an ASF release are:
-* a source zip file + corresponding signature (signed by me, which is in the ASF web of trust and in our KEYS file)
+* a source zip file + corresponding signature (signed by the release manager, which is in the ASF web of trust and in our KEYS file)
* 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)
* all dependencies are appropriately licensed; see the `DEPENDENCIES` file which is automatically generated from the POMs plus the supplemental-models.xml file
@@ -59,4 +59,5 @@ At the time of writing, these additional
## Casting a Vote
-When you have made the above checks (and any other checks you think may be relevant), cast your vote by replying to the email thread on the mailing list. If you are casting `-1`, please provide details of the problem(s) you have found.
\ No newline at end of file
+When you have made the above checks (and any other checks you think may be relevant), cast your vote by replying to the email thread on the mailing list. If you are casting `-1`, please provide details of the problem(s) you have found.
+
Modified: isis/site/trunk/content/core/release-notes/isis-1.0.0.md
URL: http://svn.apache.org/viewvc/isis/site/trunk/content/core/release-notes/isis-1.0.0.md?rev=1425670&r1=1425669&r2=1425670&view=diff
==============================================================================
--- isis/site/trunk/content/core/release-notes/isis-1.0.0.md (original)
+++ isis/site/trunk/content/core/release-notes/isis-1.0.0.md Mon Dec 24 19:28:37 2012
@@ -74,6 +74,8 @@ Title: `isis-1.0.0`
</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
@@ -88,4 +90,4 @@ Title: `isis-1.0.0`
<li>[<a href='https://issues.apache.org/jira/browse/ISIS-266'>ISIS-266</a>] - BoundedFacetAbstract was invalidating using disabledReason()
</li>
</ul>
-
\ No newline at end of file
+
Modified: isis/site/trunk/content/documentation.md
URL: http://svn.apache.org/viewvc/isis/site/trunk/content/documentation.md?rev=1425670&r1=1425669&r2=1425670&view=diff
==============================================================================
--- isis/site/trunk/content/documentation.md (original)
+++ isis/site/trunk/content/documentation.md Mon Dec 24 19:28:37 2012
@@ -16,12 +16,11 @@ Title: Documentation
### Archetypes
-- [Quickstart Archetype](getting-started/quickstart-archetype.html) (`1.0.0-RC1`)
-<!--
-- [Wicket/Restful/JDO Archetype](getting-started/quickstart-archetype-wicket-restful-jdo.html)
-- [Scimpi/NoSQL Archetype](getting-started/quickstart-archetype-scimpi-nosql.html)
-- [DnD/XML Archetype](getting-started/quickstart-archetype-dnd-xml.html)
--->
+- [Wicket/Restful/JDO Archetype](getting-started/quickstart-archetype.html) (`1.0.0`)
+
+### Releases
+
+- [Release Matrix](release-matrix.html)
}
@@ -68,7 +67,7 @@ Title: Documentation
{group
-## Core [1.0.0-RC2](core/release-notes/about.html)
+## Core [1.0.0](core/release-notes/about.html)
{row-even
@@ -116,7 +115,7 @@ Title: Documentation
{span-one-third
-### Wicket [1.0.0-RC2](components/viewers/wicket/release-notes/about.html)
+### Wicket [1.0.0](components/viewers/wicket/release-notes/about.html)
- [About](components/viewers/wicket/about.html)
@@ -124,7 +123,7 @@ Title: Documentation
{span-one-third
-### RestfulObjects [1.0.0-RC2](components/viewers/restfulobjects/release-notes/about.html)
+### RestfulObjects [1.0.0](components/viewers/restfulobjects/release-notes/about.html)
- [About](components/viewers/restfulobjects/about.html)
@@ -196,7 +195,7 @@ Title: Documentation
{span-one-third
-### JDO [1.0.0-RC2](components/objectstores/jdo/release-notes/about.html)
+### JDO [1.0.0](components/objectstores/jdo/release-notes/about.html)
- [About](components/objectstores/jdo/about.html)
- [Maven and Eclipse](components/objectstores/jdo/hints-and-tips.html)
@@ -246,7 +245,7 @@ Title: Documentation
{span-one-third
-### File [1.0.0-RC2](components/security/file/release-notes/about.html)
+### File [1.0.0](components/security/file/release-notes/about.html)
- [About](components/security/file/about.html)
Added: isis/site/trunk/content/release-matrix.md
URL: http://svn.apache.org/viewvc/isis/site/trunk/content/release-matrix.md?rev=1425670&view=auto
==============================================================================
--- isis/site/trunk/content/release-matrix.md (added)
+++ isis/site/trunk/content/release-matrix.md Mon Dec 24 19:28:37 2012
@@ -0,0 +1,84 @@
+Title: Release Matrix
+
+<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>
+