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 2016/04/09 09:03:32 UTC
[6/6] isis git commit: ISIS-1335: minor updates to docs for
generating docs
ISIS-1335: minor updates to docs for generating docs
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/5160d32d
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/5160d32d
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/5160d32d
Branch: refs/heads/master
Commit: 5160d32dd9c53fbf6089e2ff4a8ba23fb110b1ae
Parents: 805dec4
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sat Apr 9 07:51:26 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sat Apr 9 07:51:26 2016 +0100
----------------------------------------------------------------------
.../main/asciidoc/_release-notes_1.12.1.adoc | 30 ++++++++++++++++++++
.../guides/_cgcom_cutting-a-release.adoc | 8 ++++--
.../src/main/asciidoc/guides/_dg_asciidoc.adoc | 18 +++++++++++-
.../src/main/asciidoc/release-notes.adoc | 9 ++++++
4 files changed, 61 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/5160d32d/adocs/documentation/src/main/asciidoc/_release-notes_1.12.1.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/_release-notes_1.12.1.adoc b/adocs/documentation/src/main/asciidoc/_release-notes_1.12.1.adoc
new file mode 100644
index 0000000..221eb68
--- /dev/null
+++ b/adocs/documentation/src/main/asciidoc/_release-notes_1.12.1.adoc
@@ -0,0 +1,30 @@
+[[r1.12.1]]
+= 1.12.1
+:notice: licensed to the apache software foundation (asf) under one or more contributor license agreements. see the notice file distributed with this work for additional information regarding copyright ownership. the asf licenses this file to you under the apache license, version 2.0 (the "license"); you may not use this file except in compliance with the license. you may obtain a copy of the license at. http://www.apache.org/licenses/license-2.0 . unless required by applicable law or agreed to in writing, software distributed under the license is distributed on an "as is" basis, without warranties or conditions of any kind, either express or implied. see the license for the specific language governing permissions and limitations under the license.
+:_basedir: ./
+:_imagesdir: images/
+:toc: right
+
+
+Apache Isis 1.12.1 is a bug fix release for Apache Isis 1.12.0.
+
+[WARNING]
+====
+This release is currently being voted on and has not yet been released to Maven central repo.
+====
+
+
+
+== Bug
+
+* link:https://issues.apache.org/jira/browse/ISIS-1355[ISIS-1355] - concurrency exception after property edit when attempting to render...
+* link:https://issues.apache.org/jira/browse/ISIS-1357[ISIS-1357] - Update dependency from guava-19.0.20150826 to guava-19.0
+* link:https://issues.apache.org/jira/browse/ISIS-1361[ISIS-1361] - View model that changes two domain objects only has one of them updated.
+* link:https://issues.apache.org/jira/browse/ISIS-1363[ISIS-1363] - ConfigurationServiceMenu is defined under the prototyping menu, but is not restricted to prototyping. Suggest place under the tertiary menu instead.
+
+
+== Task
+
+* link:https://issues.apache.org/jira/browse/ISIS-1362[ISIS-1362] - Release activities for v1.12.1
+
+
http://git-wip-us.apache.org/repos/asf/isis/blob/5160d32d/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 2a52740..0586574 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
@@ -46,17 +46,19 @@ We use environment variables to parameterize as many of the steps as possible.
[source,bash]
----
cd core
-export ISISTMP=/c/tmp # <1>
+export ISISTMP=/c/tmp # <1>
export ISISDEV=1.14.0-SNAPSHOT
export ISISREL=1.13.0
export ISISRC=RC1
export ISISBRANCH=release-$ISISREL-$ISISRC
-export ISISJIRA=ISIS-9999 # <2>
+export ISISJIRA=ISIS-9999 # <2>
+export CATALINA_HOME=/c/java/apache-tomcat-8.0.30 # <3>
env | grep ISIS | sort
----
<1> adjust by platform
<2> set to an "umbrella" ticket for all release activities. (One should exist already, xref:cgcom.adoc#_cgcom_post-release-successful_update-jira_create-new-jira[created at] the beginning of the development cycle now completing).
+<3> adjust as required (Tomcat is used to smoke test the simpleapp archetype)
Obviously, alter `$ISISDEV` and `$ISISREL` as required, and bump `$ISISRC` for re-releasing following an xref:cgcom.adoc#_cgcom_post-release-unsuccessful[unsuccessful] releases.
@@ -444,7 +446,7 @@ popd
+
[source,bash]
----
-cp webapps/target/simpleapp.war $CATALINA_HOME/webapps/ROOT.war
+cp webapp/target/simpleapp.war $CATALINA_HOME/webapps/ROOT.war
----
Check the about page and confirm built against non-SNAPSHOT versions of the Apache Isis jars.
http://git-wip-us.apache.org/repos/asf/isis/blob/5160d32d/adocs/documentation/src/main/asciidoc/guides/_dg_asciidoc.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_dg_asciidoc.adoc b/adocs/documentation/src/main/asciidoc/guides/_dg_asciidoc.adoc
index 6c2c0ca..2e4e00d 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_dg_asciidoc.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_dg_asciidoc.adoc
@@ -169,7 +169,7 @@ You also need to know that ASF's publishing script work from the 'asf-site' bran
git checkout asf-site
----
-=== Publishing
+=== Publishing (full build)
Back in the `adocs/documentation` directory of the main `isis-git.repo`, to copy the generated documents to the `isis-site.git` repo, run:
@@ -195,6 +195,8 @@ sh publish.sh "ISIS-nnnn: a custom commit message"
Behind the scenes this just calls `mvn clean install -Dmessage=...`.
+It's also possible to omit the message, in which case `publish.sh` will reuse the most recent commit message from the main `isis.git` repo.
+
Pushing the commits (in the `isis-site.git` directory, of course) will publishing the changes:
[source,bash]
@@ -203,3 +205,17 @@ git push
----
Double check at http://isis.apache.org[isis.apache.org].
+
+
+
+
+=== Publishing (partial build)
+
+If none of the guides have been changed, and if you have run the full rebuild recently, then you can skip the generation of PDFs using:
+
+[source,bash]
+----
+mvn install -Dskip.pdf -D"ISIS-nnnn: a custom commit message"
+----
+
+The `clean` goal *must not* be included though (else all the guides will disappear from the site content).
http://git-wip-us.apache.org/repos/asf/isis/blob/5160d32d/adocs/documentation/src/main/asciidoc/release-notes.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/release-notes.adoc b/adocs/documentation/src/main/asciidoc/release-notes.adoc
index cd01921..3c41983 100644
--- a/adocs/documentation/src/main/asciidoc/release-notes.adoc
+++ b/adocs/documentation/src/main/asciidoc/release-notes.adoc
@@ -21,6 +21,14 @@ This table summarises all releases of Apache Isis to date.
| Improves
| Bugs
+| xref:r1.12.1[1.12.1]
+| apr-2016
+| (currently being voted on)
+| Bug-fix release
+| 0
+| 1
+| 3
+
| xref:r1.12.0[1.12.0]
| 29-mar-2016
| https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12327483[Release notes for v1.12.0]
@@ -226,6 +234,7 @@ This table summarises all releases of Apache Isis to date.
+include::_release-notes_1.12.1.adoc[leveloffset=+1]
include::_release-notes_1.12.0.adoc[leveloffset=+1]
include::_release-notes_1.11.1.adoc[leveloffset=+1]
include::_release-notes_1.11.0.adoc[leveloffset=+1]