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/02/22 23:07:10 UTC
[isis] 01/01: Merge branch 'release-1.16.1-RC2' into maint-1.16.1
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch maint-1.16.2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 826726c874875f912f34d088cf53633739d4ff92
Merge: 3e3ad2b d14dc6c
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Feb 22 23:05:03 2018 +0000
Merge branch 'release-1.16.1-RC2' into maint-1.16.1
STATUS | 8 ++
adocs/documentation/pom-pdf.xml | 2 +-
adocs/documentation/pom.xml | 2 +-
.../documentation/src/main/asciidoc/doap_isis.rdf | 24 ++++++
.../documentation/src/main/asciidoc/downloads.adoc | 12 +--
.../guides/cgcom/_cgcom_cutting-a-release.adoc | 2 +-
.../cgcom/_cgcom_post-release-successful.adoc | 41 +++++++---
...cgcom_release-process-for-interim-releases.adoc | 12 ++-
.../guides/cgcom/_cgcom_verifying-releases.adoc | 19 +++--
...ugfun_getting-started_helloworld-archetype.adoc | 2 +-
..._ugfun_getting-started_simpleapp-archetype.adoc | 2 +-
adocs/documentation/src/main/asciidoc/index.html | 71 ++++++++++++-----
.../src/main/asciidoc/pages/tg/tg.adoc | 2 +-
.../release-notes/_release-notes_1.13.0.adoc | 2 +-
.../release-notes/_release-notes_1.16.1.adoc | 80 +++++++++++++++++++
.../main/asciidoc/release-notes/release-notes.adoc | 10 +--
adocs/template/document.html.erb | 2 +-
core/applib/pom.xml | 2 +-
core/integtestsupport/pom.xml | 2 +-
core/log4j/pom.xml | 2 +-
core/maven-plugin/pom.xml | 2 +-
core/mavendeps/intellij/pom.xml | 2 +-
core/mavendeps/testing/pom.xml | 2 +-
core/mavendeps/webapp/pom.xml | 2 +-
core/metamodel/pom.xml | 2 +-
.../cssclassfa/annotprop/MixinInterceptor.java | 4 +-
...onParameterDefaultsAndChoicesPostProcessor.java | 2 +-
.../core/metamodel/spec/feature/ObjectAction.java | 29 ++++---
core/pom.xml | 93 ++++++++++++----------
core/runtime/pom.xml | 2 +-
.../runtime/services/ServiceInstantiatorTest.java | 27 ++++---
core/schema/pom.xml | 2 +-
core/security-shiro/pom.xml | 6 +-
core/security/pom.xml | 2 +-
core/specsupport/pom.xml | 2 +-
core/unittestsupport/pom.xml | 2 +-
core/viewer-restfulobjects-applib/pom.xml | 2 +-
core/viewer-restfulobjects-rendering/pom.xml | 2 +-
core/viewer-restfulobjects-server/pom.xml | 2 +-
core/viewer-wicket-applib/pom.xml | 2 +-
core/viewer-wicket-impl/pom.xml | 2 +-
core/viewer-wicket-model/pom.xml | 2 +-
.../wicket/model/mementos/CollectionMemento.java | 25 ++++--
.../wicket/model/models/EntityCollectionModel.java | 12 ++-
core/viewer-wicket-ui/pom.xml | 2 +-
.../collection/AssociatedWithActionsHelper.java | 8 +-
core/webserver/pom.xml | 2 +-
core/wrapper/pom.xml | 2 +-
example/application/helloworld/pom.xml | 2 +-
example/application/simpleapp/README.adoc | 2 +-
example/application/simpleapp/pom.xml | 2 +-
example/archetype/helloworld/pom.xml | 4 +-
.../src/main/resources/archetype-resources/pom.xml | 3 +-
.../java/domainapp/dom/impl/HelloWorldObject.java | 1 +
.../resources/projects/basic/archetype.properties | 2 +-
example/archetype/simpleapp/pom.xml | 4 +-
.../main/resources/archetype-resources/README.adoc | 2 +-
.../bdd/specglue/BootstrappingGlue.java | 16 +++-
.../{RunBddSpecs.java => RunIntegBddSpecs.java} | 2 +-
.../modules/simple/dom/impl/SimpleObject.java | 3 +-
.../simple/dom/impl/SimpleObject.layout.xml | 6 +-
.../src/main/resources/archetype-resources/pom.xml | 3 +-
.../resources/projects/basic/archetype.properties | 2 +-
63 files changed, 410 insertions(+), 187 deletions(-)
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.