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/11/02 19:35:46 UTC
[02/12] isis git commit: ISIS-1195: updating pom.xml for rat check.
ISIS-1195: updating pom.xml for rat check.
Also: minor edits 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/426ef81b
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/426ef81b
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/426ef81b
Branch: refs/heads/master
Commit: 426ef81b2db2c189494c03a3905473766bd6ba72
Parents: b36b923
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Oct 26 10:55:53 2015 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Oct 26 10:55:53 2015 +0000
----------------------------------------------------------------------
.../main/asciidoc/guides/_cg_committers_cutting-a-release.adoc | 4 ++--
core/pom.xml | 5 +----
2 files changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/426ef81b/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 3e76549..774a2e7 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
@@ -217,7 +217,7 @@ Commit any changes from the preceding steps:
[source,bash]
----
-git commit -am "ISIS-nnnn: updates to pom.xml etc for release"
+git commit -am "$ISISJIRA: updates to pom.xml etc for release"
----
@@ -482,7 +482,7 @@ Then, run the script:
[source,bash]
----
-sh ../../../scripts/recreate-archetype.sh ISIS-nnnn
+sh ../../../scripts/recreate-archetype.sh $ISISJIRA
----
The script automatically commits changes; if you wish use `git log` and
http://git-wip-us.apache.org/repos/asf/isis/blob/426ef81b/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 33d03a0..9548411 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -444,7 +444,6 @@
<exclude>**/MANIFEST.MF</exclude>
<exclude>**/*.ucd</exclude>
<exclude>**/*.ucls</exclude>
- <exclude>**/*.iml</exclude>
<exclude>**/xml/objects/**</exclude>
<exclude>**/test.data</exclude>
@@ -453,9 +452,7 @@
<exclude>**/jquery.zclip.js</exclude>
<exclude>**/bootstrap-growl.js</exclude>
<exclude>**/moment.js</exclude>
-
- <exclude>**/wicket-xhtml1.4-strict.dtd</exclude>
-
+
<exclude>**/bootstrap-datetimepicker.min.css</exclude>
<exclude>**/bootstrap-datetimepicker.css</exclude>
<exclude>**/select2-bootstrap.css</exclude>