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 2018/07/31 16:55:51 UTC

[isis] 03/03: Merge branch 'release-2.0.0-M1-RC2'

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git

commit d09fd4158a733c7233d1fe991d162a122fb7f0ae
Merge: 7b1b416 36919bb
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Jul 31 17:52:06 2018 +0100

    Merge branch 'release-2.0.0-M1-RC2'

 .../guides/cgcom/_cgcom_cutting-a-release.adoc     | 156 +++++++++++----------
 .../guides/cgcom/_cgcom_verifying-releases.adoc    |  12 +-
 core/pom.xml                                       |   2 +-
 example/application/helloworld/pom.xml             |   2 +-
 example/application/simpleapp/pom.xml              |   2 +-
 .../META-INF/maven/archetype-metadata.xml          |   6 +
 .../resources/archetype-resources/.m2/settings.xml |   9 +-
 .../src/main/resources/archetype-resources/pom.xml |  64 ++++++++-
 .../resources/projects/basic/archetype.properties  |   2 +-
 .../resources/archetype-resources/.m2/settings.xml |   5 +
 .../application/translations.pot                   |   2 +-
 .../resources/archetype-resources/webapp/pom.xml   |  65 +++++++++
 .../webapp/src/main/resources/docker/Dockerfile    |  30 +++-
 .../resources/projects/basic/archetype.properties  |   2 +-
 14 files changed, 262 insertions(+), 97 deletions(-)