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 2017/02/15 22:11:31 UTC
[2/2] isis git commit: ISIS-1561: minor improvements to release docs
ISIS-1561: minor improvements 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/458d2fd9
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/458d2fd9
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/458d2fd9
Branch: refs/heads/master
Commit: 458d2fd953f9a8922df06e647f64115747b2d349
Parents: 9a3453d
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Feb 15 22:11:13 2017 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Feb 15 22:11:13 2017 +0000
----------------------------------------------------------------------
.../guides/_cgcom_cutting-a-release.adoc | 3 ---
.../guides/_cgcom_release-process-prereqs.adoc | 24 ++++++++++++--------
2 files changed, 14 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/458d2fd9/adocs/documentation/src/main/asciidoc/guides/_cgcom_cutting-a-release.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_cgcom_cutting-a-release.adoc b/adocs/documentation/src/main/asciidoc/guides/_cgcom_cutting-a-release.adoc
index 5fb8797..96e9e4d 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_cgcom_cutting-a-release.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_cgcom_cutting-a-release.adoc
@@ -447,8 +447,6 @@ mvn clean install
[source,bash]
----
mvn -pl webapp jetty:run
-<<<<<<< Updated upstream
-=======
----
* can be packaged and run using the mvn jetty-console plugin:
@@ -457,7 +455,6 @@ mvn -pl webapp jetty:run
----
mvn install -Dmavenmixin-jettyconsole
mvn antrun:run -Dmavenmixin-jettyconsole
->>>>>>> Stashed changes
----
* can be deployed as a WAR
http://git-wip-us.apache.org/repos/asf/isis/blob/458d2fd9/adocs/documentation/src/main/asciidoc/guides/_cgcom_release-process-prereqs.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_cgcom_release-process-prereqs.adoc b/adocs/documentation/src/main/asciidoc/guides/_cgcom_release-process-prereqs.adoc
index 93dfb2c..200f098 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_cgcom_release-process-prereqs.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_cgcom_release-process-prereqs.adoc
@@ -13,23 +13,28 @@ This section (appendix) describes the prerequisites for the xref:cgcom.adoc#_cgc
== Configure toolchains plugin
-Apache Isis releases are built using Java 7, enforced using the maven toolchains plugin. Ensure that Java 7 is
-installed and the toolchains plugin is configured, as described in the
-xref:_dg_building-isis_configure-maven-toolchains-plugin[contributors' guide].
+Apache Isis releases are built using Java 7, enforced using the maven toolchains plugin.
+Ensure that Java 7 is installed and the toolchains plugin is configured, as described in the xref:_dg_building-isis_configure-maven-toolchains-plugin[contributors' guide].
== Public/private key
-The most important configuration you require is to set up public/private key pair. This is used by the `maven-release-plugin` to sign the code artifacts. See the page on xref:cgcom.adoc#_cgcom_key-generation[key generation] for more details.
+The most important configuration you require is to set up public/private key pair.
+This is used by the `maven-release-plugin` to sign the code artifacts.
+See the page on xref:cgcom.adoc#_cgcom_key-generation[key generation] for more details.
In order to prepare the release, you'll (need to) have a `~/.gnupg` directory with the relevant files (`gpg.conf`, `pubring.gpg`, `secring.gpg` etc), and have `gpg` on your operating system PATH.
[NOTE]
====
-If on Windows, the equivalent directory is `c:\users\xxx\appdata\roaming\gnupg`. For `gpg`, use either http://cygwin.com[cygwin.com] or http://www.gpg4win.org[gpg4win.org]. Note also that the mSysGit version of `gpg` (as provided by GitHub's bash client) is not compatible with that provided by cygwin; move it to one side and check that `gpg.exe` being used is that from gpg4win.
+If on Windows, the equivalent directory is `c:\users\xxx\appdata\roaming\gnupg`.
+For `gpg`, use either http://cygwin.com[cygwin.com] or http://www.gpg4win.org[gpg4win.org].
+Note also that the mSysGit version of `gpg.exe` (as provided by GitHub's bash client) is not compatible with that provided by cygwin; move it to one side and check that `gpg.exe` being used is that from gpg4win.
+
+If you use Atlassian's SourceTree, this also bundles a version of `gpg.exe` that is not compatible (in `C:\Users\xxx\AppData\Local\Atlassian\SourceTree\git_local\usr\bin`); again, move it to one side and instead use the one provided by gpg4win.
====
@@ -53,12 +58,14 @@ During the release process the `maven-deploy-plugin` uploads the generated artif
</settings>
----
-where `xxxxxxx` and `yyyyyyy` are your Apache LDAP username and password. For more information, see these http://www.apache.org/dev/publishing-maven-artifacts.html#dev-env[ASF docs].
+where `xxxxxxx` and `yyyyyyy` are your Apache LDAP username and password.
+For more information, see these http://www.apache.org/dev/publishing-maven-artifacts.html#dev-env[ASF docs].
[NOTE]
====
-It is also possible to configure to use `.ssh` secure keys, and thereby avoid hardcoding your Apache LDAP password into your `.m2/settings.xml` file. A description of how to do this can be found, for example, http://bval.apache.org/release-setup.html[here].
+It is also possible to configure to use `.ssh` secure keys, and thereby avoid hardcoding your Apache LDAP password into your `.m2/settings.xml` file.
+A description of how to do this can be found, for example, http://bval.apache.org/release-setup.html[here].
====
@@ -83,6 +90,3 @@ Also, set up keyphrase for `gpg`; this avoids being prompted during release:
</activeProfiles>
----
-
-
-