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/25 08:31:41 UTC
[2/3] isis git commit: ISIS-1052: fixes to release documentation
ISIS-1052: fixes 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/53e31c16
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/53e31c16
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/53e31c16
Branch: refs/heads/master
Commit: 53e31c16756c55815cea2e93a1154f01b0c6fb78
Parents: 73f7730
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Aug 25 06:42:51 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Aug 25 06:42:51 2015 +0100
----------------------------------------------------------------------
adocs/documentation/src/main/asciidoc/documentation.adoc | 2 +-
.../asciidoc/guides/_cg_committers_cutting-a-release.adoc | 10 +++-------
2 files changed, 4 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/53e31c16/adocs/documentation/src/main/asciidoc/documentation.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/documentation.adoc b/adocs/documentation/src/main/asciidoc/documentation.adoc
index a76f05f..d1c6c41 100644
--- a/adocs/documentation/src/main/asciidoc/documentation.adoc
+++ b/adocs/documentation/src/main/asciidoc/documentation.adoc
@@ -97,7 +97,7 @@ including:
* Setting up link:./guides/cg.html#_cg_ide_intellij[IntelliJ] or link:./guides/cg.html#_cg_ide_eclipse[Eclipse]
* link:./guides/cg.html#_cg_ide-templates[*IDE templates*] (IntelliJ and Eclipse)
* link:./guides/cg.html#_cg_contributing[Contributing patches] (pull requests)
-* link:./guides/cg.html#_cg_committers_release-process[Cutting a release]
+* link:./guides/cg.html#_cg_committers_cutting-a-release[Cutting a release]
* link:./guides/cg.html#_cg_committers_verifying-releases[Verifying a release]
http://git-wip-us.apache.org/repos/asf/isis/blob/53e31c16/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 08be094..73039bc 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
@@ -65,7 +65,7 @@ Also, check that there are no snapshot dependencies:
[source,bash]
----
-grep SNAPSHOT `/bin/find . -name pom.xml | grep -v target | sort`
+grep SNAPSHOT `/bin/find . -name pom.xml | grep -v target | grep -v mothball | sort`
----
The only mention of `SNAPSHOT` should be for the Isis modules about to be released.
@@ -117,7 +117,8 @@ To run the RAT tool, use:
[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
+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
----
where `rat.numUnapprovedLicenses` property is set to a high figure, temporarily overriding the default value of 0. This will allow the command to run over all submodules, rather than failing after the first one. The command writes out a `target\rat.txt` for each submodule. missing license notes are indicated using the key `!???`. The `for` command collates all the errors.
@@ -177,11 +178,6 @@ licenses to remove from supplemental-models.xml (are spurious):
If any missing entries are listed or are spurious, then update `supplemental-models.xml` and try again.
-[NOTE]
-====
-Ignore any missing license warnings for the TCK modules; this is a result of the TCK modules for the viewers (eg `isis-viewer-bdd-concordion-tck`) depending on the TCK dom, fixtures etc.
-====
-
=== Commit changes