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 2020/01/20 17:59:46 UTC
[isis] 07/09: Merge branch 'ISIS-2267'
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 5eec8735ddfea9226f3c0f03b610141b78f1bf77
Merge: aa9dc70 1769731
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Jan 20 15:19:57 2020 +0000
Merge branch 'ISIS-2267'
.../modules/ROOT/partials/component-nav.adoc | 2 +-
.../refguide/modules/ROOT/partials/module-nav.adoc | 1 +
.../userguide/modules/ROOT/pages/about.adoc | 14 +---
.../modules/ROOT/partials/component-nav.adoc | 8 +++
.../modules/ROOT/partials/module-nav.adoc | 0
antora/components/userguide/modules/btb/nav.adoc | 9 +--
.../btb/{nav.adoc => partials/module-nav.adoc} | 0
antora/components/userguide/modules/fun/nav.adoc | 25 +------
.../fun/{nav.adoc => partials/module-nav.adoc} | 0
antora/playbooks/site-refguide.yml | 1 +
antora/playbooks/site-userguide.yml | 8 ++-
antora/playbooks/site.yml | 2 +-
.../jdo/flywayjdo => core/flyway}/adoc/antora.yml | 2 +-
.../core/flyway/adoc/modules/flyway/nav.adoc | 1 +
.../flyway/adoc/modules/flyway/pages/about.adoc | 84 ++++++++++++++++++++++
.../adoc/modules/flyway/partials/module-nav.adoc | 3 +
.../jdo/flywayjdo => core/flyway}/impl/pom.xml | 34 +++++++--
.../flyway/impl/IsisModuleExtFlywayImpl.java} | 12 +++-
.../jdo/flywayjdo/impl => core/flyway}/pom.xml | 27 ++++---
.../jdo/flywayjdo/adoc/modules/flywayjdo/nav.adoc | 2 -
.../adoc/modules/flywayjdo/pages/about.adoc | 5 --
.../modules/flywayjdo/partials/module-nav.adoc | 3 -
extensions/pom.xml | 7 ++
23 files changed, 171 insertions(+), 79 deletions(-)