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 2015/08/27 13:56:47 UTC
[1/6] isis git commit: ISIS-1052: tiny fix to release documentation
Repository: isis
Updated Branches:
refs/heads/master 1cbf4d85f -> 166927cfc
ISIS-1052: tiny fix to release documentation
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/871b1bdd
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/871b1bdd
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/871b1bdd
Branch: refs/heads/master
Commit: 871b1bdd76b2d81f524e65b0b16b5b836b1eac5d
Parents: 1cbf4d8
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Aug 25 07:50:57 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Aug 25 07:50:57 2015 +0100
----------------------------------------------------------------------
.../src/main/asciidoc/guides/_cg_committers_cutting-a-release.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/871b1bdd/adocs/documentation/src/main/asciidoc/guides/_cg_committers_cutting-a-release.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_cg_committers_cutting-a-release.adoc b/adocs/documentation/src/main/asciidoc/guides/_cg_committers_cutting-a-release.adoc
index 73039bc..55c6ebd 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_cg_committers_cutting-a-release.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_cg_committers_cutting-a-release.adoc
@@ -257,7 +257,7 @@ Assuming this completes successfully, re-run the command, but without the `dryRu
[source,bash]
----
-mvn release:prepare -P apache-release -D resume=false -DskipTests=true
+mvn release:prepare -P apache-release -D resume=false -DskipTests=true \
-DreleaseVersion=$ISISREL \
-Dtag=$ISISART-$ISISREL \
-DdevelopmentVersion=$ISISDEV
[5/6] isis git commit: ISIS-1052: minor updates to release docs.
Posted by da...@apache.org.
ISIS-1052: minor updates to release docs.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/dfca75d6
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/dfca75d6
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/dfca75d6
Branch: refs/heads/master
Commit: dfca75d6dc1f1a3c00bb48978e30ed07b08a66c5
Parents: 858d320
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Aug 25 19:33:52 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Aug 25 19:42:00 2015 +0100
----------------------------------------------------------------------
.../_cg_committers_cutting-a-release.adoc | 40 ++++++++++++--------
.../_cg_committers_post-release-successful.adoc | 6 +--
...cg_committers_post-release-unsuccessful.adoc | 8 ++--
.../_cg_committers_verifying-releases.adoc | 6 +--
4 files changed, 35 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/dfca75d6/adocs/documentation/src/main/asciidoc/guides/_cg_committers_cutting-a-release.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_cg_committers_cutting-a-release.adoc b/adocs/documentation/src/main/asciidoc/guides/_cg_committers_cutting-a-release.adoc
index 8773db6..c0f65db 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_cg_committers_cutting-a-release.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_cg_committers_cutting-a-release.adoc
@@ -9,8 +9,8 @@
The release process consists of:
* the release manager cutting the release (documented below)
-* Members of the Apache Isis PMC voting on the release (documented xref:cg.adoc#_cg_committers_verifying-releases[here])
-* the release manager performing post-release tasks (documented xref:cg.adoc#_cg_committers_post-release-successful[here if vote was successful], or xref:cg.adoc#_cg_committers_post-release-unsuccessful[here if unsuccessful]).
+* Members of the Apache Isis PMC xref:cg.adoc#_cg_committers_verifying-releases[verifying] and voting on the release
+* the release manager performing post-release tasks, for either a xref:cg.adoc#_cg_committers_post-release-successful[successful] or an xref:cg.adoc#_cg_committers_post-release-unsuccessful[unsuccessful] vote.
Apache Isis itself consists of two separately releasable modules; relative to the link:https://git-wip-us.apache.org/repos/asf/isis/repo?p=isis.git;a=tree[source code root] there are:
@@ -26,6 +26,7 @@ These release notes using bash command line tools. They should work on Linux an
+[[_cg_committers_cutting-a-release_obtain-consensus]]
== Obtain Consensus
Before releasing `core`, ensure there is consensus on the link:../support.html[dev mailing list] that this is the right time for a release. The discussion should include confirming the version number to be used, and to confirm content.
@@ -36,6 +37,7 @@ These discussions should also confirm the version number of the module being rel
Make sure you have a JIRA ticket open against which to perform all commits. In most cases a JIRA ticket will have been created at the beginning of the previous release cycle.
+[[_cg_committers_cutting-a-release_pull-down-code-to-release]]
== Pull down code to release
Set the HEAD of your local git repo to the commit to be released. This will usually be the tip of the origin's `master` branch. Then, create a release branch for the version number being released; eg:
@@ -77,6 +79,7 @@ Obviously, don't update Apache Isis' `SNAPSHOT` references; these get updated by
+[[_cg_committers_cutting-a-release_releasing-core]]
== Releasing Core
First, we release `core`. Switch to the appropriate directory:
@@ -86,6 +89,7 @@ First, we release `core`. Switch to the appropriate directory:
cd core
----
+[[_cg_committers_cutting-a-release_releasing-core_set-environment-variables]]
=== Set environment variables
@@ -107,7 +111,7 @@ env | grep ISIS | sort
-
+[[_cg_committers_cutting-a-release_releasing-core_license-headers]]
=== License headers
The Apache Release Audit Tool `RAT` (from the http://creadur.apache.org[Apache Creadur] project) checks for missing license header files. The parent `pom.xml` of each releasable module specifies the RAT Maven plugin, with a number of custom exclusions.
@@ -145,6 +149,7 @@ for a in `find . -name rat.txt -print`; do grep '!???' $a; done
----
+[[_cg_committers_cutting-a-release_releasing-core_missing-license-check]]
=== Missing License Check
Although Apache Isis has no dependencies on artifacts with incompatible licenses, the POMs for some of these dependencies (in the Maven central repo) do not necessarily contain the required license information. Without appropriate additional configuration, this would result in the generated `DEPENDENCIES` file and generated Maven site indicating dependencies as having "unknown" licenses.
@@ -180,6 +185,7 @@ If any missing entries are listed or are spurious, then update `supplemental-mod
+[[_cg_committers_cutting-a-release_releasing-core_commit-changes]]
=== Commit changes
Commit any changes from the preceding steps:
@@ -190,6 +196,7 @@ git commit -am "ISIS-nnnn: updates to pom.xml etc for release"
----
+[[_cg_committers_cutting-a-release_releasing-core_sanity-check]]
=== Sanity check
Perform one last sanity check on the codebase. Delete all Isis artifacts from your local Maven repo, then build using the `-o` offline flag:
@@ -201,7 +208,7 @@ mvn clean install -o
----
-
+[[_cg_committers_cutting-a-release_releasing-core_release-prepare-dry-run]]
=== Release prepare "dry run"
Most of the work is done using the `mvn release:prepare` goal. Since this makes a lot of changes, we run it first in "dry run" mode; only if that works do we run the goal for real.
@@ -251,6 +258,7 @@ What is the release version for "Apache Isis Core"? (org.apache.isis.core:isis)
----
+[[_cg_committers_cutting-a-release_releasing-core_release-prepare-proper]]
=== Release prepare "proper"
Assuming this completes successfully, re-run the command, but without the `dryRun` flag and specifying `resume=false` (to ignore the generated `release.properties` file that gets generated as a side-effect of using `git`). You can also set the `skipTests` flag since they would have been run during the previous dry run:
@@ -272,6 +280,7 @@ If there are any snags at this stage, then explicitly delete the generated `rele
+[[_cg_committers_cutting-a-release_releasing-core_post-prepare-sanity-check]]
=== Post-prepare sanity check
You should end up with artifacts in your local repo with the new version (eg `1.9.0`). This is a good time to do some quick sanity checks; nothing has yet been uploaded:
@@ -306,6 +315,7 @@ popd
----
+[[_cg_committers_cutting-a-release_releasing-core_release-perform-upload]]
=== Release perform (Upload)
Once the release has been built locally, it should be uploaded for voting. This is done by deploying the Maven artifacts to a staging directory (this includes the source release ZIP file which will be voted upon).
@@ -354,8 +364,7 @@ You may (again) be prompted for gpg passphrase. All being well this command wil
-
-
+[[_cg_committers_cutting-a-release_releasing-the-archetype]]
== Releasing the Archetype
Apache Isis archetypes are reverse engineered from example applications. Once reverse engineered, the source is checked into git (replacing any earlier version of the archetype) and released.
@@ -367,6 +376,7 @@ Switch to the directory containing the `simpleapp` example:
cd ../example/application/simpleapp
----
+[[_cg_committers_cutting-a-release_releasing-the-archetype_setup-environment-variables]]
=== Setup environment variables
To recreate the `simpleapp` archetype:
@@ -391,7 +401,7 @@ env | grep ISIS | sort
<2> `$ISISPAR` is the version of the Apache Isis core that will act as the archetype's parent. Usually this is the same as `$ISISREL`.
-
+[[_cg_committers_cutting-a-release_releasing-the-archetype_check-the-example-app]]
=== Check the example app
Update the parent `pom.xml` to reference the _released_ version of Apache Isis core, eg:
@@ -437,7 +447,7 @@ mvn jetty:run
Check the about page and confirm built against non-SNAPSHOT versions of the Apache Isis jars.
-
+[[_cg_committers_cutting-a-release_releasing-the-archetype_create-the-archetype]]
=== Create the archetype
Make sure you are in the correct directory and environment variables are correct.
@@ -461,7 +471,7 @@ The script automatically commits changes; if you wish use `git log` and
`git diff` (or a tool such as SourceTree) to review changes made.
-
+[[_cg_committers_cutting-a-release_releasing-the-archetype_release-prepare]]
=== Release prepare
Switch to the *archetype* directory and execute the `release:prepare`:
@@ -478,7 +488,7 @@ mvn release:prepare -P apache-release \
-
+[[_cg_committers_cutting-a-release_releasing-the-archetype_post-prepare-sanity-check]]
=== Post-prepare sanity check
This is a good point to test the archetype; nothing has yet been uploaded.
@@ -521,7 +531,7 @@ mvn jetty:run # runs as mvn jetty plugin
-
+[[_cg_committers_cutting-a-release_releasing-the-archetype_release-perform-upload]]
=== Release Perform (upload)
Back in the original session (in the *archetype* directory, `example/archetype/$ISISCPN`), execute `release:perform`:
@@ -535,7 +545,7 @@ mvn release:perform -P apache-release \
This will upload the artifacts to the ASF Nexus repository.
-
+[[_cg_committers_cutting-a-release_check-close-staging-repo]]
== Check/Close Staging Repo
The `mvn release:perform` commands will have put release artifacts for both `core` and the `simpleapp` archetype into a newly created staging repository on the ASF Nexus repository server.
@@ -583,7 +593,7 @@ Unfortunately, Nexus does not seem to allow subkeys to be used for signing. See
-
+[[_cg_committers_cutting-a-release_push-branches]]
== Push branches
Push the release branch to origin:
@@ -609,14 +619,14 @@ The remote tag isn't visible locally but can be seen https://git-wip-us.apache.o
-
+[[_cg_committers_cutting-a-release_voting]]
== Voting
Once the artifacts have been uploaded, you can call a vote.
In all cases, votes last for 72 hours and require a +3 (binding) vote from members.
-
+[[_cg_committers_cutting-a-release_voting-start-voting-thread]]
=== Start voting thread on link:mailto:dev@isis.apache.org[dev@isis.apache.org]
The following boilerplate is for a release of the Apache Isis Core. Adapt as required:
http://git-wip-us.apache.org/repos/asf/isis/blob/dfca75d6/adocs/documentation/src/main/asciidoc/guides/_cg_committers_post-release-successful.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_cg_committers_post-release-successful.adoc b/adocs/documentation/src/main/asciidoc/guides/_cg_committers_post-release-successful.adoc
index 302fc31..0bb7bce 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_cg_committers_post-release-successful.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_cg_committers_post-release-successful.adoc
@@ -8,9 +8,9 @@
The release process consists of:
-* the release manager cutting the release (documented xref:cg.adoc#_cg_committers_cutting-a-release[here])
-* members of the Apache Isis PMC voting on the release (documented xref:cg.adoc#_cg_committers_verifying-releases[here])
-* the release manager performing post-release tasks (documented below for if vote was successful, else xref:cg.adoc#_cg_committers_post-release-unsuccessful[here if unsuccessful]).
+* the release manager xref:cg.adoc#_cg_committers_cutting-a-release[cutting the release]
+* members of the Apache Isis PMC xref:cg.adoc#_cg_committers_verifying-releases[verifying] and voting on the release
+* the release manager performing post-release tasks, for either a successful or an xref:cg.adoc#_cg_committers_post-release-unsuccessful[unsuccessful] vote (former documented below)
For a vote to succeed, there must be +3 votes from PMC members, and the vote must have been open at least 72 hours. If there are not +3 votes after this time then it is perfectly permissible to keep the vote open longer.
http://git-wip-us.apache.org/repos/asf/isis/blob/dfca75d6/adocs/documentation/src/main/asciidoc/guides/_cg_committers_post-release-unsuccessful.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_cg_committers_post-release-unsuccessful.adoc b/adocs/documentation/src/main/asciidoc/guides/_cg_committers_post-release-unsuccessful.adoc
index d188096..2bd29a4 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_cg_committers_post-release-unsuccessful.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_cg_committers_post-release-unsuccessful.adoc
@@ -8,13 +8,13 @@
The release process consists of:
-* the release manager cutting the release (documented xref:cg.adoc#_cg_committers_cutting-a-release[here])
-* members of the Apache Isis PMC voting on the release (documented xref:cg.adoc#_cg_committers_verifying-releases[here])
-* the release manager performing post-release tasks (documented below for if vote was unsuccessful, else xref:cg.adoc#_cg_committers_post-release-successful[here if successful]).
+* the release manager xref:cg.adoc#_cg_committers_cutting-a-release[cutting the release]
+* members of the Apache Isis PMC xref:cg.adoc#_cg_committers_verifying-releases[verifying] and voting on the release
+* the release manager performing post-release tasks, for either a xref:cg.adoc#_cg_committers_post-release-successful[successful] or an unsuccessful vote (latter documented below).
If the vote did not succeed (did not achieve +3 votes after 72 hours and/or is unlikely to do so), then the vote should be closed and the following steps performed.
-Note that a release manager may also decide to cancel a vote before 72 hours has elapsed (for example if an error is quicly discovered).
+Note that a release manager may also decide to cancel a vote before 72 hours has elapsed (for example if an error is quickly discovered).
== Inform dev ML
http://git-wip-us.apache.org/repos/asf/isis/blob/dfca75d6/adocs/documentation/src/main/asciidoc/guides/_cg_committers_verifying-releases.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_cg_committers_verifying-releases.adoc b/adocs/documentation/src/main/asciidoc/guides/_cg_committers_verifying-releases.adoc
index 990af04..a8d2198 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_cg_committers_verifying-releases.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_cg_committers_verifying-releases.adoc
@@ -8,9 +8,9 @@
The release process consists of:
-* the release manager cutting the release (documented xref:cg.adoc#_cg_committers_cutting-a-release[here])
-* members of the Apache Isis PMC voting on the release (documented below)
-* the release manager performing post-release tasks (documented xref:cg.adoc#_cg_committers_post-release-successful[here if vote was successful], or xref:cg.adoc#_cg_committers_post-release-unsuccessful[here if unsuccessful]).
+* the release manager xref:cg.adoc#_cg_committers_cutting-a-release[cutting the release]
+* members of the Apache Isis PMC verifying and voting on the release (documented below)
+* the release manager performing post-release tasks, for either a xref:cg.adoc#_cg_committers_post-release-successful[successful] or an xref:cg.adoc#_cg_committers_post-release-unsuccessful[unsuccessful] vote.
This section describes some guidance on what a voter (members of the Apache Isis PMC and anyone else who wishes) is expected to do before casting their vote in order to verify a release.
[6/6] isis git commit: ISIS-1052: updating to latest version of
maven-release-plugin
Posted by da...@apache.org.
ISIS-1052: updating to latest version of maven-release-plugin
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/166927cf
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/166927cf
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/166927cf
Branch: refs/heads/master
Commit: 166927cfc9e876d2204425a9e368f00a74bf1d5f
Parents: dfca75d
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Aug 25 21:04:35 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Aug 25 21:05:20 2015 +0100
----------------------------------------------------------------------
core/pom.xml | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/166927cf/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 3d7267a..595cc96 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -872,15 +872,14 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>2.4.2</version>
+ <version>2.5.2</version>
<configuration>
<!-- overriddes the default ('clean verify') as workaround -->
<preparationGoals>clean install</preparationGoals>
<autoVersionSubmodules>true</autoVersionSubmodules>
- <tagBase>https://svn.apache.org/repos/asf/incubator/isis/tags/</tagBase>
<localCheckout>true</localCheckout>
<pushChanges>false</pushChanges>
- <waitBeforeTagging>2</waitBeforeTagging>
+ <waitBeforeTagging>1</waitBeforeTagging>
</configuration>
<!-- goal:clean (for aggregator modules) has no bindings;
cleans up release.properties and any backup POM files -->
[3/6] isis git commit: ISIS-1052: updating simpleapp-app pom.xml name
Posted by da...@apache.org.
ISIS-1052: updating simpleapp-app pom.xml name
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/acb70dd1
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/acb70dd1
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/acb70dd1
Branch: refs/heads/master
Commit: acb70dd17e0e86d48fd2302bf627a78603ee7096
Parents: 127c7fe
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Aug 25 09:02:31 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Aug 25 19:41:33 2015 +0100
----------------------------------------------------------------------
example/application/simpleapp/app/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/acb70dd1/example/application/simpleapp/app/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/app/pom.xml b/example/application/simpleapp/app/pom.xml
index de2a35c..3360a56 100644
--- a/example/application/simpleapp/app/pom.xml
+++ b/example/application/simpleapp/app/pom.xml
@@ -27,7 +27,7 @@
</parent>
<artifactId>simpleapp-app</artifactId>
- <name>Simple App Application Services</name>
+ <name>Simple App Application</name>
<build>
<resources>
[2/6] isis git commit: ISIS-1052: minor update to documentation.
Posted by da...@apache.org.
ISIS-1052: minor update to documentation.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/127c7fea
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/127c7fea
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/127c7fea
Branch: refs/heads/master
Commit: 127c7fead11ec5ca2b4a3138691eb96696a08fe2
Parents: 871b1bd
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Aug 25 08:58:49 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Aug 25 19:41:04 2015 +0100
----------------------------------------------------------------------
.../asciidoc/guides/_cg_committers_cutting-a-release.adoc | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/127c7fea/adocs/documentation/src/main/asciidoc/guides/_cg_committers_cutting-a-release.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_cg_committers_cutting-a-release.adoc b/adocs/documentation/src/main/asciidoc/guides/_cg_committers_cutting-a-release.adoc
index 55c6ebd..81f1ac6 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_cg_committers_cutting-a-release.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_cg_committers_cutting-a-release.adoc
@@ -410,8 +410,9 @@ Check for and fix any missing license header notices:
[source,bash]
----
-mvn org.apache.rat:apache-rat-plugin:check -D rat.numUnapprovedLicenses=50 -o
-for a in `/bin/find . -name rat.txt -print`; do grep '!???' $a; done
+mvn org.apache.rat:apache-rat-plugin:check -D rat.numUnapprovedLicenses=50 -o && \
+for a in `/bin/find . -name rat.txt -print`; do grep '!???' $a; done || \
+for a in `/bin/find . -name rat.txt -print`; do grep '!AL' $a; done
----
@@ -421,11 +422,11 @@ Finally, double check that the app is running satisfactorily:
+
[source,bash]
----
-mvn clean install
+mvn clean install && \
mvn antrun:run -P self-host
----
-* then using mvn jetty plugin (browse to http://localhost:8080/simpleapp-webapp/[http://localhost:8080/simpleapp-webapp/]): +
+* then using mvn jetty plugin (browse to http://localhost:8080[http://localhost:8080]): +
+
[source,bash]
----
[4/6] isis git commit: ISIS-1052: minor updates to release docs
Posted by da...@apache.org.
ISIS-1052: minor updates to release docs
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/858d3204
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/858d3204
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/858d3204
Branch: refs/heads/master
Commit: 858d32046bd21081fdd58633767b6883c199f8ec
Parents: acb70dd
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Aug 25 09:31:09 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Aug 25 19:41:45 2015 +0100
----------------------------------------------------------------------
.../_cg_committers_cutting-a-release.adoc | 28 +++-----------------
1 file changed, 4 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/858d3204/adocs/documentation/src/main/asciidoc/guides/_cg_committers_cutting-a-release.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_cg_committers_cutting-a-release.adoc b/adocs/documentation/src/main/asciidoc/guides/_cg_committers_cutting-a-release.adoc
index 81f1ac6..8773db6 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_cg_committers_cutting-a-release.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_cg_committers_cutting-a-release.adoc
@@ -474,8 +474,6 @@ mvn release:prepare -P apache-release \
-DreleaseVersion=$ISISREL \
-DdevelopmentVersion=$ISISDEV \
-Dtag=$ISISART-$ISISREL
-mvn release:perform -P apache-release \
- -DworkingDirectory=$ISISTMP/checkout
----
@@ -484,20 +482,8 @@ mvn release:perform -P apache-release \
=== Post-prepare sanity check
This is a good point to test the archetype; nothing has yet been uploaded.
-First, build the archetype:
-
-[source,bash]
-----
-cd target/generated-sources/archetype
-mvn clean install
-cd ../../..
-----
-
-Then, _in a different session_, create a new app from the archetype:
-Set up environment variables:
-
-To test the *simpleapp* archetype:
+_In a different session_, create a new app from the archetype. First set up environment variables:
[source,bash]
----
@@ -506,7 +492,7 @@ export ISISCPN=simpleapp
env | grep ISIS | sort
----
-Then recreate:
+Then generate a new app from the archetype:
[source,bash]
----
@@ -538,21 +524,15 @@ mvn jetty:run # runs as mvn jetty plugin
=== Release Perform (upload)
-Still in the *archetype* directory and execute the `release:perform` to upload the artifacts to the ASF Nexus repository:
+Back in the original session (in the *archetype* directory, `example/archetype/$ISISCPN`), execute `release:perform`:
[source]
----
-cd ../../../example/archetype/$ISISCPN
-rm -rf $ISISTMP/checkout
-mvn release:prepare -P apache-release \
- -DreleaseVersion=$ISISREL \
- -DdevelopmentVersion=$ISISDEV \
- -Dtag=$ISISART-$ISISREL
mvn release:perform -P apache-release \
-DworkingDirectory=$ISISTMP/checkout
----
-
+This will upload the artifacts to the ASF Nexus repository.