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 2013/01/31 15:24:57 UTC
svn commit: r1440972 - in /isis/site/trunk/content:
components/security/shiro/release-notes/about.md
contributors/development-environment.md contributors/release-process.md
core/release-notes/about.md doap_isis.rdf documentation.md download.md
Author: danhaywood
Date: Thu Jan 31 14:24:57 2013
New Revision: 1440972
URL: http://svn.apache.org/viewvc?rev=1440972&view=rev
Log:
isis site - updates for 1.1.0 releases
Modified:
isis/site/trunk/content/components/security/shiro/release-notes/about.md
isis/site/trunk/content/contributors/development-environment.md
isis/site/trunk/content/contributors/release-process.md
isis/site/trunk/content/core/release-notes/about.md
isis/site/trunk/content/doap_isis.rdf
isis/site/trunk/content/documentation.md
isis/site/trunk/content/download.md
Modified: isis/site/trunk/content/components/security/shiro/release-notes/about.md
URL: http://svn.apache.org/viewvc/isis/site/trunk/content/components/security/shiro/release-notes/about.md?rev=1440972&r1=1440971&r2=1440972&view=diff
==============================================================================
--- isis/site/trunk/content/components/security/shiro/release-notes/about.md (original)
+++ isis/site/trunk/content/components/security/shiro/release-notes/about.md Thu Jan 31 14:24:57 2013
@@ -1,4 +1,4 @@
Title: Release Notes
-* [isis-security-shiro-1.1.0](isis-security-shiro-1.1.0.html) (RC1)
+* [isis-security-shiro-1.1.0](isis-security-shiro-1.1.0.html)
* [isis-security-shiro-1.0.0](isis-security-shiro-1.0.0.html)
Modified: isis/site/trunk/content/contributors/development-environment.md
URL: http://svn.apache.org/viewvc/isis/site/trunk/content/contributors/development-environment.md?rev=1440972&r1=1440971&r2=1440972&view=diff
==============================================================================
--- isis/site/trunk/content/contributors/development-environment.md (original)
+++ isis/site/trunk/content/contributors/development-environment.md Thu Jan 31 14:24:57 2013
@@ -22,7 +22,7 @@ If using Windows, note that github also
If using Mac, you might also want to check out Atlassian's [Sourcetree](http://www.atlassian.com/software/sourcetree/overview).
-#### Cloning the Isis repo and Configuring
+#### Cloning the Isis repo
First, clone the Isis repo.
@@ -34,14 +34,16 @@ git clone https://git-wip-us.apache.org/
If you are **not a committer**, please see the [contributing](contributing.html) page for details on which repo to clone from.
-You should then configure your user name and password; see also [Apache's git](https://git-wip-us.apache.org/) docs:
+#### Configuring Git
+
+Next up is to configure your user name and password; see also [Apache's git](https://git-wip-us.apache.org/) docs:
<pre>
git config user.name "<i>My Name Here</i>"
git config user.email <i>myusername@apache.org</i>
</pre>
-And, you should also configure the `core.autocrlf` so that line endings are normalized to LF (Unix style) in the rep; again see [Apache's git](https://git-wip-us.apache.org/) page:
+Next, configure the `core.autocrlf` so that line endings are normalized to LF (Unix style) in the rep; again see [Apache's git](https://git-wip-us.apache.org/) page:
- on Windows, use:
<pre>git config core.autocrlf auto
@@ -62,6 +64,17 @@ git config core.safecrlf true
Note that these settings are supplemented in the repo by the `.gitattributes` file and that explicitly specifies line handling treatment for most of the common file types that we have.
+Next, we recommend you setup this a refspec so that you can distinguish remote tags from local ones. To do that, locate the `[remote "origin"]` section in your `.git/config` and add the third entry shown below:
+
+<pre>
+[remote "origin"]
+ url = ... whatever ...
+ fetch = ... whatever ...
+ fetch = +refs/tags/*:refs/tags/origin/*
+</pre>
+
+This will ensure that a `git fetch` or `git pull` places any remote tags under `origin/xxx. For example, the `isis-1.0.0` tag on the origin will appear under `origin/isis-1.0.0`.
+
One final configuration that we recommend is for `git pull` to perform a rebase by default, rather than a merge. This results in a linear log history. If you want to explicitly have branches in the history, then you can always create a topic branch, discussed below:
<pre>
git config branch.autosetuprebase always
Modified: isis/site/trunk/content/contributors/release-process.md
URL: http://svn.apache.org/viewvc/isis/site/trunk/content/contributors/release-process.md?rev=1440972&r1=1440971&r2=1440972&view=diff
==============================================================================
--- isis/site/trunk/content/contributors/release-process.md (original)
+++ isis/site/trunk/content/contributors/release-process.md Thu Jan 31 14:24:57 2013
@@ -726,6 +726,13 @@ If the vote has been successful, then re
git fetch
</pre>
+* delete the `-RCn` local tag, for example:
+
+<pre>
+ git tag -d isis-1.2.3-RC1
+ git fetch
+</pre>
+
Then, continue onto the next section for the steps to promote and announce the release.
### For an unsuccessful vote
@@ -847,6 +854,10 @@ Use JIRA to [generate release notes](htt
If any of the tickets closed are tasks/subtasks, then please edit the contents of the file to associate them back together again.
+### Mark the JIRA versions as released
+
+In JIRA, go to the administration section for the Isis project and update the versions as released.
+
### Update ISIS website
Update the Isis CMS website:
Modified: isis/site/trunk/content/core/release-notes/about.md
URL: http://svn.apache.org/viewvc/isis/site/trunk/content/core/release-notes/about.md?rev=1440972&r1=1440971&r2=1440972&view=diff
==============================================================================
--- isis/site/trunk/content/core/release-notes/about.md (original)
+++ isis/site/trunk/content/core/release-notes/about.md Thu Jan 31 14:24:57 2013
@@ -1,4 +1,4 @@
Title: Release Notes
-- [isis-1.1.0](isis-1.1.0.html) (RC1)
+- [isis-1.1.0](isis-1.1.0.html)
- [isis-1.0.0](isis-1.0.0.html)
Modified: isis/site/trunk/content/doap_isis.rdf
URL: http://svn.apache.org/viewvc/isis/site/trunk/content/doap_isis.rdf?rev=1440972&r1=1440971&r2=1440972&view=diff
==============================================================================
--- isis/site/trunk/content/doap_isis.rdf (original)
+++ isis/site/trunk/content/doap_isis.rdf Thu Jan 31 14:24:57 2013
@@ -37,6 +37,13 @@
<release>
<Version>
<name>isis-core</name>
+ <created>2013-01-31</created>
+ <revision>1.1.0</revision>
+ </Version>
+ </release>
+ <release>
+ <Version>
+ <name>isis-core</name>
<created>2012-12-24</created>
<revision>1.0.0</revision>
</Version>
@@ -58,6 +65,13 @@
<release>
<Version>
<name>isis-viewer-wicket</name>
+ <created>2013-01-13</created>
+ <revision>1.1.0</revision>
+ </Version>
+ </release>
+ <release>
+ <Version>
+ <name>isis-viewer-wicket</name>
<created>2012-12-24</created>
<revision>1.0.0</revision>
</Version>
@@ -72,6 +86,13 @@
<release>
<Version>
<name>isis-security-shiro</name>
+ <created>2013-01-31</created>
+ <revision>1.1.0</revision>
+ </Version>
+ </release>
+ <release>
+ <Version>
+ <name>isis-security-shiro</name>
<created>2013-01-10</created>
<revision>1.0.0</revision>
</Version>
@@ -79,6 +100,13 @@
<release>
<Version>
<name>quickstart_wicket-restful_jdo-archetype</name>
+ <created>2013-01-31</created>
+ <revision>1.0.2</revision>
+ </Version>
+ </release>
+ <release>
+ <Version>
+ <name>quickstart_wicket-restful_jdo-archetype</name>
<created>2013-01-10</created>
<revision>1.0.1</revision>
</Version>
Modified: isis/site/trunk/content/documentation.md
URL: http://svn.apache.org/viewvc/isis/site/trunk/content/documentation.md?rev=1440972&r1=1440971&r2=1440972&view=diff
==============================================================================
--- isis/site/trunk/content/documentation.md (original)
+++ isis/site/trunk/content/documentation.md Thu Jan 31 14:24:57 2013
@@ -9,7 +9,7 @@ Title: Documentation
### Getting started
- [Screencasts](getting-started/screencasts.html)
-- [Wicket/Restful/JDO Archetype](getting-started/quickstart-archetype.html) ([1.0.2](getting-started/release-notes/about.html)) (RC1)
+- [Wicket/Restful/JDO Archetype](getting-started/quickstart-archetype.html) ([1.0.2](getting-started/release-notes/about.html))
- [Editor templates](getting-started/editor-templates.html)
- [Cheat Sheet](getting-started/cheat-sheet.html)
- [Icons](getting-started/icons.html)
@@ -62,7 +62,7 @@ Title: Documentation
{group
-## Core [1.1.0](core/release-notes/about.html) (RC1)
+## Core [1.1.0](core/release-notes/about.html)
{row-even
@@ -110,7 +110,7 @@ Title: Documentation
{span-one-third
-### Wicket [1.1.0](components/viewers/wicket/release-notes/about.html) (RC1)
+### Wicket [1.1.0](components/viewers/wicket/release-notes/about.html)
- [About](components/viewers/wicket/about.html)
@@ -249,7 +249,7 @@ Title: Documentation
{span-one-third
-### Shiro [1.1.0](components/security/shiro/release-notes/about.html) (RC1)
+### Shiro [1.1.0](components/security/shiro/release-notes/about.html)
- [About](components/security/shiro/about.html)
- [Configuring Shiro](components/security/shiro/configuring-shiro.html)
Modified: isis/site/trunk/content/download.md
URL: http://svn.apache.org/viewvc/isis/site/trunk/content/download.md?rev=1440972&r1=1440971&r2=1440972&view=diff
==============================================================================
--- isis/site/trunk/content/download.md (original)
+++ isis/site/trunk/content/download.md Thu Jan 31 14:24:57 2013
@@ -12,19 +12,19 @@ If you want to build Isis from formally
Core:
-* [isis-1.0.0](https://dist.apache.org/repos/dist/release/isis/core/isis-1.0.0-source-release.zip) [asc](https://dist.apache.org/repos/dist/release/isis/core/isis-1.0.0-source-release.zip.asc)
+* [isis-1.1.0](https://dist.apache.org/repos/dist/release/isis/core/isis-1.1.0-source-release.zip) [asc](https://dist.apache.org/repos/dist/release/isis/core/isis-1.1.0-source-release.zip.asc)
Components:
* [isis-security-file-1.0.0](https://dist.apache.org/repos/dist/release/isis/component/security/file/isis-security-file-1.0.0-source-release.zip) [asc](https://dist.apache.org/repos/dist/release/isis/component/security/file/isis-security-file-1.0.0-source-release.zip.asc)
-* [isis-security-shiro-1.0.0](https://dist.apache.org/repos/dist/release/isis/component/security/shiro/isis-security-shiro-1.0.0-source-release.zip) [asc](https://dist.apache.org/repos/dist/release/isis/component/security/shiro/isis-security-shiro-1.0.0-source-release.zip.asc)
+* [isis-security-shiro-1.1.0](https://dist.apache.org/repos/dist/release/isis/component/security/shiro/isis-security-shiro-1.1.0-source-release.zip) [asc](https://dist.apache.org/repos/dist/release/isis/component/security/shiro/isis-security-shiro-1.1.0-source-release.zip.asc)
* [isis-objectstore-jdo-1.0.0](https://dist.apache.org/repos/dist/release/isis/component/objectstore/jdo/isis-objectstore-jdo-1.0.0-source-release.zip) [asc](https://dist.apache.org/repos/dist/release/isis/component/objectstore/jdo/isis-objectstore-jdo-1.0.0-source-release.zip.asc)
-* [isis-viewer-wicket-1.0.0](https://dist.apache.org/repos/dist/release/isis/component/viewer/wicket/isis-viewer-wicket-1.0.0-source-release.zip) [asc](https://dist.apache.org/repos/dist/release/isis/component/viewer/wicket/isis-viewer-wicket-1.0.0-source-release.zip.asc)
+* [isis-viewer-wicket-1.1.0](https://dist.apache.org/repos/dist/release/isis/component/viewer/wicket/isis-viewer-wicket-1.1.0-source-release.zip) [asc](https://dist.apache.org/repos/dist/release/isis/component/viewer/wicket/isis-viewer-wicket-1.1.0-source-release.zip.asc)
* [isis-viewer-restfulobjects-1.0.0](https://dist.apache.org/repos/dist/release/isis/component/viewer/restfulobjects/isis-viewer-restfulobjects-1.0.0-source-release.zip) [asc](https://dist.apache.org/repos/dist/release/isis/component/viewer/restfulobjects/isis-viewer-restfulobjects-1.0.0-source-release.zip.asc)
Archetypes:
-* [quickstart_wicket_restful_jdo-archetype-1.0.1](https://dist.apache.org/repos/dist/release/isis/archetype/quickstart_wicket_restful_jdo-archetype/quickstart_wicket_restful_jdo-archetype-1.0.1-source-release.zip) [asc](https://dist.apache.org/repos/dist/release/isis/archetype/quickstart_wicket_restful_jdo-archetype/quickstart_wicket_restful_jdo-archetype-1.0.1-source-release.zip.asc)
+* [quickstart_wicket_restful_jdo-archetype-1.0.2](https://dist.apache.org/repos/dist/release/isis/archetype/quickstart_wicket_restful_jdo-archetype/quickstart_wicket_restful_jdo-archetype-1.0.2-source-release.zip) [asc](https://dist.apache.org/repos/dist/release/isis/archetype/quickstart_wicket_restful_jdo-archetype/quickstart_wicket_restful_jdo-archetype-1.0.2-source-release.zip.asc)
See the [release matrix](release-matrix.html) for details on the dependencies between core, components and archetypes.
@@ -41,19 +41,19 @@ Then verify the signatures using:
<pre>
pgpk -a KEYS
-pgpv isis-1.0.0-source-release.zip.asc
+pgpv isis-1.1.0-source-release.zip.asc
</pre>
or
<pre>
pgp -ka KEYS
-pgp isis-1.0.0-source-release.zip.asc
+pgp isis-1.1.0-source-release.zip.asc
</pre>
or
<pre>
gpg --import KEYS
-gpg --verify isis-1.0.0-source-release.zip.asc
+gpg --verify isis-1.1.0-source-release.zip.asc
</pre>
Alternatively, you can verify the MD5 signature on the files. A Unix/Linux