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/03/29 16:24:46 UTC
[isis] branch 2.0.0-M3 updated (6fd5e2b -> dceb0b7)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch 2.0.0-M3
in repository https://gitbox.apache.org/repos/asf/isis.git.
discard 6fd5e2b ISIS-2336: bumps antora.yml and index.html to 2.0.0-M3
discard 3075b06 ISIS-2336: release procedures, again.
new f9f379a ISIS-2336: release procedures, again.
new dceb0b7 ISIS-2336: bumps antora.yml : latest -> 2.0.0-M3
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (6fd5e2b)
\
N -- N -- N refs/heads/2.0.0-M3 (dceb0b7)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../ROOT/pages/post-release-successful.adoc | 33 ++++++++++++----------
antora/supplemental-ui/index.html | 30 ++++++++++----------
2 files changed, 33 insertions(+), 30 deletions(-)
[isis] 02/02: ISIS-2336: bumps antora.yml : latest -> 2.0.0-M3
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch 2.0.0-M3
in repository https://gitbox.apache.org/repos/asf/isis.git
commit dceb0b7c014d5b0c46cc84eee7ad90c5e9c99a27
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Mar 29 17:24:04 2020 +0100
ISIS-2336: bumps antora.yml : latest -> 2.0.0-M3
---
antora/components/comguide/antora.yml | 2 +-
antora/components/conguide/antora.yml | 2 +-
antora/components/docs/antora.yml | 2 +-
antora/components/relnotes/antora.yml | 2 +-
antora/components/setupguide/antora.yml | 2 +-
api/adoc/refguide/antora.yml | 2 +-
api/adoc/userguide/antora.yml | 2 +-
api/applib/src/main/adoc/antora.yml | 2 +-
api/schema/src/main/adoc/antora.yml | 2 +-
core/adoc/antora.yml | 2 +-
core/codegen-bytebuddy/src/main/adoc/antora.yml | 2 +-
core/commons/src/main/adoc/antora.yml | 2 +-
core/config/src/main/adoc/antora.yml | 2 +-
core/internaltestsupport/src/main/adoc/antora.yml | 2 +-
core/metamodel/src/main/adoc/antora.yml | 2 +-
core/runtime/src/main/adoc/antora.yml | 2 +-
core/runtimeservices/src/main/adoc/antora.yml | 2 +-
core/security/src/main/adoc/antora.yml | 2 +-
core/webapp/src/main/adoc/antora.yml | 2 +-
examples/demo/src/main/adoc/antora.yml | 2 +-
examples/smoketests/src/main/adoc/antora.yml | 2 +-
extensions/adoc/antora.yml | 2 +-
extensions/core/command-log/adoc/antora.yml | 2 +-
extensions/core/flyway/adoc/antora.yml | 2 +-
extensions/security/audit-trail/adoc/antora.yml | 2 +-
extensions/security/secman/adoc/antora.yml | 2 +-
extensions/security/session-log/adoc/antora.yml | 2 +-
extensions/security/shiro-realm-ldap/adoc/antora.yml | 2 +-
extensions/vro/cors/adoc/antora.yml | 2 +-
extensions/vw/exceldownload/adoc/antora.yml | 2 +-
extensions/vw/fullcalendar/adoc/antora.yml | 2 +-
extensions/vw/gmap3/adoc/antora.yml | 2 +-
extensions/vw/pdfjs/adoc/antora.yml | 2 +-
incubator/adoc/antora.yml | 2 +-
incubator/core/model/src/main/adoc/antora.yml | 2 +-
incubator/mappings/microprofile/src/main/adoc/antora.yml | 2 +-
legacy/adoc/antora.yml | 2 +-
legacy/extensions/core/applib/src/main/adoc/antora.yml | 2 +-
legacy/extensions/core/commons/src/main/adoc/antora.yml | 2 +-
legacy/extensions/core/metamodel/src/main/adoc/antora.yml | 2 +-
legacy/extensions/core/runtime/src/main/adoc/antora.yml | 2 +-
legacy/mappings/restclient/src/main/adoc/antora.yml | 2 +-
legacy/subdomains/servletapi/src/main/adoc/antora.yml | 2 +-
mappings/adoc/antora.yml | 2 +-
mappings/jaxrsclient/adoc/antora.yml | 2 +-
mappings/minio/adoc/antora.yml | 2 +-
mappings/publisher/adoc/antora.yml | 2 +-
mappings/restclient/adoc/antora.yml | 2 +-
mappings/slack/adoc/antora.yml | 2 +-
mavendeps/adoc/antora.yml | 2 +-
persistence/jdo/adoc/antora.yml | 2 +-
security/adoc/antora.yml | 2 +-
security/bypass/src/main/adoc/antora.yml | 2 +-
security/keycloak/src/main/adoc/antora.yml | 2 +-
security/shiro/src/main/adoc/antora.yml | 2 +-
starters/adoc/antora.yml | 2 +-
subdomains/adoc/antora.yml | 2 +-
subdomains/base/adoc/antora.yml | 2 +-
subdomains/docx/adoc/antora.yml | 2 +-
subdomains/excel/adoc/antora.yml | 2 +-
subdomains/freemarker/adoc/antora.yml | 2 +-
subdomains/ognl/adoc/antora.yml | 2 +-
subdomains/pdfbox/adoc/antora.yml | 2 +-
subdomains/settings/adoc/antora.yml | 2 +-
subdomains/spring/adoc/antora.yml | 2 +-
subdomains/xdocreport/adoc/antora.yml | 2 +-
subdomains/zip/adoc/antora.yml | 2 +-
testing/adoc/antora.yml | 2 +-
testing/fakedata/adoc/antora.yml | 2 +-
testing/fixtures/adoc/antora.yml | 2 +-
testing/h2console/adoc/antora.yml | 2 +-
testing/hsqldbmgr/adoc/antora.yml | 2 +-
testing/integtestsupport/adoc/antora.yml | 2 +-
testing/specsupport/adoc/antora.yml | 2 +-
testing/unittestsupport/adoc/antora.yml | 2 +-
valuetypes/adoc/antora.yml | 2 +-
valuetypes/asciidoc/adoc/antora.yml | 2 +-
valuetypes/markdown/adoc/antora.yml | 2 +-
valuetypes/sse/adoc/antora.yml | 2 +-
viewers/restfulobjects/adoc/antora.yml | 2 +-
viewers/wicket/adoc/antora.yml | 2 +-
81 files changed, 81 insertions(+), 81 deletions(-)
diff --git a/antora/components/comguide/antora.yml b/antora/components/comguide/antora.yml
index 9551f2a..9d10ce2 100644
--- a/antora/components/comguide/antora.yml
+++ b/antora/components/comguide/antora.yml
@@ -17,7 +17,7 @@
name: comguide
title: "Committers' Guide"
-version: latest
+version: 2.0.0-M3
start_page: ROOT:about.adoc
nav:
- modules/ROOT/nav.adoc
diff --git a/antora/components/conguide/antora.yml b/antora/components/conguide/antora.yml
index 19139bf..8e54ba9 100644
--- a/antora/components/conguide/antora.yml
+++ b/antora/components/conguide/antora.yml
@@ -17,7 +17,7 @@
name: conguide
title: "Contributors' Guide"
-version: latest
+version: 2.0.0-M3
start_page: ROOT:about.adoc
nav:
- modules/ROOT/nav.adoc
diff --git a/antora/components/docs/antora.yml b/antora/components/docs/antora.yml
index b8b03a3..85e6bca 100644
--- a/antora/components/docs/antora.yml
+++ b/antora/components/docs/antora.yml
@@ -17,7 +17,7 @@
name: docs
title: " "
-version: latest
+version: 2.0.0-M3
start_page: ROOT:about.adoc
nav:
- modules/ROOT/nav.adoc
diff --git a/antora/components/relnotes/antora.yml b/antora/components/relnotes/antora.yml
index eb0cb20..cdc3ef3 100644
--- a/antora/components/relnotes/antora.yml
+++ b/antora/components/relnotes/antora.yml
@@ -17,7 +17,7 @@
name: relnotes
title: "Release Notes"
-version: latest
+version: 2.0.0-M3
start_page: ROOT:about.adoc
nav:
- modules/ROOT/nav.adoc
diff --git a/antora/components/setupguide/antora.yml b/antora/components/setupguide/antora.yml
index 18768b2..d154e39 100644
--- a/antora/components/setupguide/antora.yml
+++ b/antora/components/setupguide/antora.yml
@@ -17,7 +17,7 @@
name: setupguide
title: "Setup Guide"
-version: latest
+version: 2.0.0-M3
start_page: ROOT:about.adoc
nav:
- modules/ROOT/nav.adoc
diff --git a/api/adoc/refguide/antora.yml b/api/adoc/refguide/antora.yml
index 86ade94..1079d43 100644
--- a/api/adoc/refguide/antora.yml
+++ b/api/adoc/refguide/antora.yml
@@ -17,7 +17,7 @@
name: refguide
title: "Reference Guide"
-version: latest
+version: 2.0.0-M3
start_page: ROOT:about.adoc
nav:
- modules/ROOT/nav.adoc
diff --git a/api/adoc/userguide/antora.yml b/api/adoc/userguide/antora.yml
index 70880f4..2aadfef 100644
--- a/api/adoc/userguide/antora.yml
+++ b/api/adoc/userguide/antora.yml
@@ -17,7 +17,7 @@
name: userguide
title: "User Guide"
-version: latest
+version: 2.0.0-M3
start_page: ROOT:about.adoc
nav:
- modules/ROOT/nav.adoc
diff --git a/api/applib/src/main/adoc/antora.yml b/api/applib/src/main/adoc/antora.yml
index 847bc30..92e7178 100644
--- a/api/applib/src/main/adoc/antora.yml
+++ b/api/applib/src/main/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: refguide
-version: latest
+version: 2.0.0-M3
diff --git a/api/schema/src/main/adoc/antora.yml b/api/schema/src/main/adoc/antora.yml
index 847bc30..92e7178 100644
--- a/api/schema/src/main/adoc/antora.yml
+++ b/api/schema/src/main/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: refguide
-version: latest
+version: 2.0.0-M3
diff --git a/core/adoc/antora.yml b/core/adoc/antora.yml
index c900da2..50d8282 100644
--- a/core/adoc/antora.yml
+++ b/core/adoc/antora.yml
@@ -17,7 +17,7 @@
name: core
title: "Core Framework"
-version: latest
+version: 2.0.0-M3
start_page: ROOT:about.adoc
nav:
- modules/ROOT/nav.adoc
diff --git a/core/codegen-bytebuddy/src/main/adoc/antora.yml b/core/codegen-bytebuddy/src/main/adoc/antora.yml
index 1a59920..7ddc947 100644
--- a/core/codegen-bytebuddy/src/main/adoc/antora.yml
+++ b/core/codegen-bytebuddy/src/main/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: core
-version: latest
+version: 2.0.0-M3
diff --git a/core/commons/src/main/adoc/antora.yml b/core/commons/src/main/adoc/antora.yml
index 1a59920..7ddc947 100644
--- a/core/commons/src/main/adoc/antora.yml
+++ b/core/commons/src/main/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: core
-version: latest
+version: 2.0.0-M3
diff --git a/core/config/src/main/adoc/antora.yml b/core/config/src/main/adoc/antora.yml
index 847bc30..92e7178 100644
--- a/core/config/src/main/adoc/antora.yml
+++ b/core/config/src/main/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: refguide
-version: latest
+version: 2.0.0-M3
diff --git a/core/internaltestsupport/src/main/adoc/antora.yml b/core/internaltestsupport/src/main/adoc/antora.yml
index 1a59920..7ddc947 100644
--- a/core/internaltestsupport/src/main/adoc/antora.yml
+++ b/core/internaltestsupport/src/main/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: core
-version: latest
+version: 2.0.0-M3
diff --git a/core/metamodel/src/main/adoc/antora.yml b/core/metamodel/src/main/adoc/antora.yml
index 1a59920..7ddc947 100644
--- a/core/metamodel/src/main/adoc/antora.yml
+++ b/core/metamodel/src/main/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: core
-version: latest
+version: 2.0.0-M3
diff --git a/core/runtime/src/main/adoc/antora.yml b/core/runtime/src/main/adoc/antora.yml
index 1a59920..7ddc947 100644
--- a/core/runtime/src/main/adoc/antora.yml
+++ b/core/runtime/src/main/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: core
-version: latest
+version: 2.0.0-M3
diff --git a/core/runtimeservices/src/main/adoc/antora.yml b/core/runtimeservices/src/main/adoc/antora.yml
index 1a59920..7ddc947 100644
--- a/core/runtimeservices/src/main/adoc/antora.yml
+++ b/core/runtimeservices/src/main/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: core
-version: latest
+version: 2.0.0-M3
diff --git a/core/security/src/main/adoc/antora.yml b/core/security/src/main/adoc/antora.yml
index 2be1151..30aa573 100644
--- a/core/security/src/main/adoc/antora.yml
+++ b/core/security/src/main/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: security
-version: latest
+version: 2.0.0-M3
diff --git a/core/webapp/src/main/adoc/antora.yml b/core/webapp/src/main/adoc/antora.yml
index 1a59920..7ddc947 100644
--- a/core/webapp/src/main/adoc/antora.yml
+++ b/core/webapp/src/main/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: core
-version: latest
+version: 2.0.0-M3
diff --git a/examples/demo/src/main/adoc/antora.yml b/examples/demo/src/main/adoc/antora.yml
index 072c382..7cf43f1 100644
--- a/examples/demo/src/main/adoc/antora.yml
+++ b/examples/demo/src/main/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: docs
-version: latest
+version: 2.0.0-M3
diff --git a/examples/smoketests/src/main/adoc/antora.yml b/examples/smoketests/src/main/adoc/antora.yml
index 1a59920..7ddc947 100644
--- a/examples/smoketests/src/main/adoc/antora.yml
+++ b/examples/smoketests/src/main/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: core
-version: latest
+version: 2.0.0-M3
diff --git a/extensions/adoc/antora.yml b/extensions/adoc/antora.yml
index 2dde8c1..5f2370f 100644
--- a/extensions/adoc/antora.yml
+++ b/extensions/adoc/antora.yml
@@ -17,7 +17,7 @@
name: extensions
title: "Extensions Catalog"
-version: latest
+version: 2.0.0-M3
start_page: ROOT:about.adoc
nav:
- modules/ROOT/nav.adoc
diff --git a/extensions/core/command-log/adoc/antora.yml b/extensions/core/command-log/adoc/antora.yml
index f59b33f..6a01e19 100644
--- a/extensions/core/command-log/adoc/antora.yml
+++ b/extensions/core/command-log/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: extensions
-version: latest
+version: 2.0.0-M3
diff --git a/extensions/core/flyway/adoc/antora.yml b/extensions/core/flyway/adoc/antora.yml
index 448d819..d11cfc0 100644
--- a/extensions/core/flyway/adoc/antora.yml
+++ b/extensions/core/flyway/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: userguide
-version: latest
+version: 2.0.0-M3
diff --git a/extensions/security/audit-trail/adoc/antora.yml b/extensions/security/audit-trail/adoc/antora.yml
index 2be1151..30aa573 100644
--- a/extensions/security/audit-trail/adoc/antora.yml
+++ b/extensions/security/audit-trail/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: security
-version: latest
+version: 2.0.0-M3
diff --git a/extensions/security/secman/adoc/antora.yml b/extensions/security/secman/adoc/antora.yml
index 2be1151..30aa573 100644
--- a/extensions/security/secman/adoc/antora.yml
+++ b/extensions/security/secman/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: security
-version: latest
+version: 2.0.0-M3
diff --git a/extensions/security/session-log/adoc/antora.yml b/extensions/security/session-log/adoc/antora.yml
index 2be1151..30aa573 100644
--- a/extensions/security/session-log/adoc/antora.yml
+++ b/extensions/security/session-log/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: security
-version: latest
+version: 2.0.0-M3
diff --git a/extensions/security/shiro-realm-ldap/adoc/antora.yml b/extensions/security/shiro-realm-ldap/adoc/antora.yml
index 2be1151..30aa573 100644
--- a/extensions/security/shiro-realm-ldap/adoc/antora.yml
+++ b/extensions/security/shiro-realm-ldap/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: security
-version: latest
+version: 2.0.0-M3
diff --git a/extensions/vro/cors/adoc/antora.yml b/extensions/vro/cors/adoc/antora.yml
index c83b9c2..35f2c26 100644
--- a/extensions/vro/cors/adoc/antora.yml
+++ b/extensions/vro/cors/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: vro
-version: latest
+version: 2.0.0-M3
diff --git a/extensions/vw/exceldownload/adoc/antora.yml b/extensions/vw/exceldownload/adoc/antora.yml
index c1675fe..c62e692 100644
--- a/extensions/vw/exceldownload/adoc/antora.yml
+++ b/extensions/vw/exceldownload/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: vw
-version: latest
+version: 2.0.0-M3
diff --git a/extensions/vw/fullcalendar/adoc/antora.yml b/extensions/vw/fullcalendar/adoc/antora.yml
index c1675fe..c62e692 100644
--- a/extensions/vw/fullcalendar/adoc/antora.yml
+++ b/extensions/vw/fullcalendar/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: vw
-version: latest
+version: 2.0.0-M3
diff --git a/extensions/vw/gmap3/adoc/antora.yml b/extensions/vw/gmap3/adoc/antora.yml
index c1675fe..c62e692 100644
--- a/extensions/vw/gmap3/adoc/antora.yml
+++ b/extensions/vw/gmap3/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: vw
-version: latest
+version: 2.0.0-M3
diff --git a/extensions/vw/pdfjs/adoc/antora.yml b/extensions/vw/pdfjs/adoc/antora.yml
index c1675fe..c62e692 100644
--- a/extensions/vw/pdfjs/adoc/antora.yml
+++ b/extensions/vw/pdfjs/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: vw
-version: latest
+version: 2.0.0-M3
diff --git a/incubator/adoc/antora.yml b/incubator/adoc/antora.yml
index 7df66bf..d8d95a6 100644
--- a/incubator/adoc/antora.yml
+++ b/incubator/adoc/antora.yml
@@ -17,7 +17,7 @@
name: incubator
title: "Incubator Catalog"
-version: latest
+version: 2.0.0-M3
start_page: ROOT:about.adoc
nav:
- modules/ROOT/nav.adoc
diff --git a/incubator/core/model/src/main/adoc/antora.yml b/incubator/core/model/src/main/adoc/antora.yml
index bc87cdc..7464a1d 100644
--- a/incubator/core/model/src/main/adoc/antora.yml
+++ b/incubator/core/model/src/main/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: incubator
-version: latest
+version: 2.0.0-M3
diff --git a/incubator/mappings/microprofile/src/main/adoc/antora.yml b/incubator/mappings/microprofile/src/main/adoc/antora.yml
index bc87cdc..7464a1d 100644
--- a/incubator/mappings/microprofile/src/main/adoc/antora.yml
+++ b/incubator/mappings/microprofile/src/main/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: incubator
-version: latest
+version: 2.0.0-M3
diff --git a/legacy/adoc/antora.yml b/legacy/adoc/antora.yml
index 61f1510..085b668 100644
--- a/legacy/adoc/antora.yml
+++ b/legacy/adoc/antora.yml
@@ -17,7 +17,7 @@
name: legacy
title: "Legacy Catalog"
-version: latest
+version: 2.0.0-M3
start_page: ROOT:about.adoc
nav:
- modules/ROOT/nav.adoc
diff --git a/legacy/extensions/core/applib/src/main/adoc/antora.yml b/legacy/extensions/core/applib/src/main/adoc/antora.yml
index 3938f85..cec21c8 100644
--- a/legacy/extensions/core/applib/src/main/adoc/antora.yml
+++ b/legacy/extensions/core/applib/src/main/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: legacy
-version: latest
+version: 2.0.0-M3
diff --git a/legacy/extensions/core/commons/src/main/adoc/antora.yml b/legacy/extensions/core/commons/src/main/adoc/antora.yml
index 3938f85..cec21c8 100644
--- a/legacy/extensions/core/commons/src/main/adoc/antora.yml
+++ b/legacy/extensions/core/commons/src/main/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: legacy
-version: latest
+version: 2.0.0-M3
diff --git a/legacy/extensions/core/metamodel/src/main/adoc/antora.yml b/legacy/extensions/core/metamodel/src/main/adoc/antora.yml
index 3938f85..cec21c8 100644
--- a/legacy/extensions/core/metamodel/src/main/adoc/antora.yml
+++ b/legacy/extensions/core/metamodel/src/main/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: legacy
-version: latest
+version: 2.0.0-M3
diff --git a/legacy/extensions/core/runtime/src/main/adoc/antora.yml b/legacy/extensions/core/runtime/src/main/adoc/antora.yml
index 3938f85..cec21c8 100644
--- a/legacy/extensions/core/runtime/src/main/adoc/antora.yml
+++ b/legacy/extensions/core/runtime/src/main/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: legacy
-version: latest
+version: 2.0.0-M3
diff --git a/legacy/mappings/restclient/src/main/adoc/antora.yml b/legacy/mappings/restclient/src/main/adoc/antora.yml
index 3938f85..cec21c8 100644
--- a/legacy/mappings/restclient/src/main/adoc/antora.yml
+++ b/legacy/mappings/restclient/src/main/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: legacy
-version: latest
+version: 2.0.0-M3
diff --git a/legacy/subdomains/servletapi/src/main/adoc/antora.yml b/legacy/subdomains/servletapi/src/main/adoc/antora.yml
index 3938f85..cec21c8 100644
--- a/legacy/subdomains/servletapi/src/main/adoc/antora.yml
+++ b/legacy/subdomains/servletapi/src/main/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: legacy
-version: latest
+version: 2.0.0-M3
diff --git a/mappings/adoc/antora.yml b/mappings/adoc/antora.yml
index 7a27b7f..4306f81 100644
--- a/mappings/adoc/antora.yml
+++ b/mappings/adoc/antora.yml
@@ -17,7 +17,7 @@
name: mappings
title: "BC Mappings Catalog"
-version: latest
+version: 2.0.0-M3
start_page: ROOT:about.adoc
nav:
- modules/ROOT/nav.adoc
diff --git a/mappings/jaxrsclient/adoc/antora.yml b/mappings/jaxrsclient/adoc/antora.yml
index ed780ec..417fbbb 100644
--- a/mappings/jaxrsclient/adoc/antora.yml
+++ b/mappings/jaxrsclient/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: mappings
-version: latest
+version: 2.0.0-M3
diff --git a/mappings/minio/adoc/antora.yml b/mappings/minio/adoc/antora.yml
index ed780ec..417fbbb 100644
--- a/mappings/minio/adoc/antora.yml
+++ b/mappings/minio/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: mappings
-version: latest
+version: 2.0.0-M3
diff --git a/mappings/publisher/adoc/antora.yml b/mappings/publisher/adoc/antora.yml
index ed780ec..417fbbb 100644
--- a/mappings/publisher/adoc/antora.yml
+++ b/mappings/publisher/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: mappings
-version: latest
+version: 2.0.0-M3
diff --git a/mappings/restclient/adoc/antora.yml b/mappings/restclient/adoc/antora.yml
index ed780ec..417fbbb 100644
--- a/mappings/restclient/adoc/antora.yml
+++ b/mappings/restclient/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: mappings
-version: latest
+version: 2.0.0-M3
diff --git a/mappings/slack/adoc/antora.yml b/mappings/slack/adoc/antora.yml
index ed780ec..417fbbb 100644
--- a/mappings/slack/adoc/antora.yml
+++ b/mappings/slack/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: mappings
-version: latest
+version: 2.0.0-M3
diff --git a/mavendeps/adoc/antora.yml b/mavendeps/adoc/antora.yml
index 072c382..7cf43f1 100644
--- a/mavendeps/adoc/antora.yml
+++ b/mavendeps/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: docs
-version: latest
+version: 2.0.0-M3
diff --git a/persistence/jdo/adoc/antora.yml b/persistence/jdo/adoc/antora.yml
index f58f7ff..896f113 100644
--- a/persistence/jdo/adoc/antora.yml
+++ b/persistence/jdo/adoc/antora.yml
@@ -17,7 +17,7 @@
name: pjdo
title: "JDO/DataNucleus"
-version: latest
+version: 2.0.0-M3
start_page: ROOT:about.adoc
nav:
- modules/ROOT/nav.adoc
diff --git a/security/adoc/antora.yml b/security/adoc/antora.yml
index c6687a5..6085b2b 100644
--- a/security/adoc/antora.yml
+++ b/security/adoc/antora.yml
@@ -17,7 +17,7 @@
name: security
title: "Security Guide"
-version: latest
+version: 2.0.0-M3
start_page: ROOT:about.adoc
nav:
- modules/ROOT/nav.adoc
diff --git a/security/bypass/src/main/adoc/antora.yml b/security/bypass/src/main/adoc/antora.yml
index 2be1151..30aa573 100644
--- a/security/bypass/src/main/adoc/antora.yml
+++ b/security/bypass/src/main/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: security
-version: latest
+version: 2.0.0-M3
diff --git a/security/keycloak/src/main/adoc/antora.yml b/security/keycloak/src/main/adoc/antora.yml
index 2be1151..30aa573 100644
--- a/security/keycloak/src/main/adoc/antora.yml
+++ b/security/keycloak/src/main/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: security
-version: latest
+version: 2.0.0-M3
diff --git a/security/shiro/src/main/adoc/antora.yml b/security/shiro/src/main/adoc/antora.yml
index 2be1151..30aa573 100644
--- a/security/shiro/src/main/adoc/antora.yml
+++ b/security/shiro/src/main/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: security
-version: latest
+version: 2.0.0-M3
diff --git a/starters/adoc/antora.yml b/starters/adoc/antora.yml
index 072c382..7cf43f1 100644
--- a/starters/adoc/antora.yml
+++ b/starters/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: docs
-version: latest
+version: 2.0.0-M3
diff --git a/subdomains/adoc/antora.yml b/subdomains/adoc/antora.yml
index 972e1f9..d8b1470 100644
--- a/subdomains/adoc/antora.yml
+++ b/subdomains/adoc/antora.yml
@@ -17,7 +17,7 @@
name: subdomains
title: "Subdomains Catalog"
-version: latest
+version: 2.0.0-M3
start_page: ROOT:about.adoc
nav:
- modules/ROOT/nav.adoc
diff --git a/subdomains/base/adoc/antora.yml b/subdomains/base/adoc/antora.yml
index 1044dbb..abb5995 100644
--- a/subdomains/base/adoc/antora.yml
+++ b/subdomains/base/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: subdomains
-version: latest
+version: 2.0.0-M3
diff --git a/subdomains/docx/adoc/antora.yml b/subdomains/docx/adoc/antora.yml
index 1044dbb..abb5995 100644
--- a/subdomains/docx/adoc/antora.yml
+++ b/subdomains/docx/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: subdomains
-version: latest
+version: 2.0.0-M3
diff --git a/subdomains/excel/adoc/antora.yml b/subdomains/excel/adoc/antora.yml
index 1044dbb..abb5995 100644
--- a/subdomains/excel/adoc/antora.yml
+++ b/subdomains/excel/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: subdomains
-version: latest
+version: 2.0.0-M3
diff --git a/subdomains/freemarker/adoc/antora.yml b/subdomains/freemarker/adoc/antora.yml
index 1044dbb..abb5995 100644
--- a/subdomains/freemarker/adoc/antora.yml
+++ b/subdomains/freemarker/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: subdomains
-version: latest
+version: 2.0.0-M3
diff --git a/subdomains/ognl/adoc/antora.yml b/subdomains/ognl/adoc/antora.yml
index 1044dbb..abb5995 100644
--- a/subdomains/ognl/adoc/antora.yml
+++ b/subdomains/ognl/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: subdomains
-version: latest
+version: 2.0.0-M3
diff --git a/subdomains/pdfbox/adoc/antora.yml b/subdomains/pdfbox/adoc/antora.yml
index 1044dbb..abb5995 100644
--- a/subdomains/pdfbox/adoc/antora.yml
+++ b/subdomains/pdfbox/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: subdomains
-version: latest
+version: 2.0.0-M3
diff --git a/subdomains/settings/adoc/antora.yml b/subdomains/settings/adoc/antora.yml
index 1044dbb..abb5995 100644
--- a/subdomains/settings/adoc/antora.yml
+++ b/subdomains/settings/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: subdomains
-version: latest
+version: 2.0.0-M3
diff --git a/subdomains/spring/adoc/antora.yml b/subdomains/spring/adoc/antora.yml
index 1044dbb..abb5995 100644
--- a/subdomains/spring/adoc/antora.yml
+++ b/subdomains/spring/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: subdomains
-version: latest
+version: 2.0.0-M3
diff --git a/subdomains/xdocreport/adoc/antora.yml b/subdomains/xdocreport/adoc/antora.yml
index 1044dbb..abb5995 100644
--- a/subdomains/xdocreport/adoc/antora.yml
+++ b/subdomains/xdocreport/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: subdomains
-version: latest
+version: 2.0.0-M3
diff --git a/subdomains/zip/adoc/antora.yml b/subdomains/zip/adoc/antora.yml
index 1044dbb..abb5995 100644
--- a/subdomains/zip/adoc/antora.yml
+++ b/subdomains/zip/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: subdomains
-version: latest
+version: 2.0.0-M3
diff --git a/testing/adoc/antora.yml b/testing/adoc/antora.yml
index e8921cb..b957a77 100644
--- a/testing/adoc/antora.yml
+++ b/testing/adoc/antora.yml
@@ -17,7 +17,7 @@
name: testing
title: "Testing Guide"
-version: latest
+version: 2.0.0-M3
start_page: ROOT:about.adoc
nav:
- modules/ROOT/nav.adoc
diff --git a/testing/fakedata/adoc/antora.yml b/testing/fakedata/adoc/antora.yml
index 3c95843..8ba3b54 100644
--- a/testing/fakedata/adoc/antora.yml
+++ b/testing/fakedata/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: testing
-version: latest
+version: 2.0.0-M3
diff --git a/testing/fixtures/adoc/antora.yml b/testing/fixtures/adoc/antora.yml
index 3c95843..8ba3b54 100644
--- a/testing/fixtures/adoc/antora.yml
+++ b/testing/fixtures/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: testing
-version: latest
+version: 2.0.0-M3
diff --git a/testing/h2console/adoc/antora.yml b/testing/h2console/adoc/antora.yml
index 3c95843..8ba3b54 100644
--- a/testing/h2console/adoc/antora.yml
+++ b/testing/h2console/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: testing
-version: latest
+version: 2.0.0-M3
diff --git a/testing/hsqldbmgr/adoc/antora.yml b/testing/hsqldbmgr/adoc/antora.yml
index 3c95843..8ba3b54 100644
--- a/testing/hsqldbmgr/adoc/antora.yml
+++ b/testing/hsqldbmgr/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: testing
-version: latest
+version: 2.0.0-M3
diff --git a/testing/integtestsupport/adoc/antora.yml b/testing/integtestsupport/adoc/antora.yml
index 3c95843..8ba3b54 100644
--- a/testing/integtestsupport/adoc/antora.yml
+++ b/testing/integtestsupport/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: testing
-version: latest
+version: 2.0.0-M3
diff --git a/testing/specsupport/adoc/antora.yml b/testing/specsupport/adoc/antora.yml
index 3c95843..8ba3b54 100644
--- a/testing/specsupport/adoc/antora.yml
+++ b/testing/specsupport/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: testing
-version: latest
+version: 2.0.0-M3
diff --git a/testing/unittestsupport/adoc/antora.yml b/testing/unittestsupport/adoc/antora.yml
index 3c95843..8ba3b54 100644
--- a/testing/unittestsupport/adoc/antora.yml
+++ b/testing/unittestsupport/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: testing
-version: latest
+version: 2.0.0-M3
diff --git a/valuetypes/adoc/antora.yml b/valuetypes/adoc/antora.yml
index 46395c9..4f69811 100644
--- a/valuetypes/adoc/antora.yml
+++ b/valuetypes/adoc/antora.yml
@@ -17,7 +17,7 @@
name: valuetypes
title: "Value Types Catalog"
-version: latest
+version: 2.0.0-M3
start_page: ROOT:about.adoc
nav:
- modules/ROOT/nav.adoc
diff --git a/valuetypes/asciidoc/adoc/antora.yml b/valuetypes/asciidoc/adoc/antora.yml
index 0f50856..be8e441 100644
--- a/valuetypes/asciidoc/adoc/antora.yml
+++ b/valuetypes/asciidoc/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: valuetypes
-version: latest
+version: 2.0.0-M3
diff --git a/valuetypes/markdown/adoc/antora.yml b/valuetypes/markdown/adoc/antora.yml
index 0f50856..be8e441 100644
--- a/valuetypes/markdown/adoc/antora.yml
+++ b/valuetypes/markdown/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: valuetypes
-version: latest
+version: 2.0.0-M3
diff --git a/valuetypes/sse/adoc/antora.yml b/valuetypes/sse/adoc/antora.yml
index 0f50856..be8e441 100644
--- a/valuetypes/sse/adoc/antora.yml
+++ b/valuetypes/sse/adoc/antora.yml
@@ -16,4 +16,4 @@
# under the License.
name: valuetypes
-version: latest
+version: 2.0.0-M3
diff --git a/viewers/restfulobjects/adoc/antora.yml b/viewers/restfulobjects/adoc/antora.yml
index 13c5fde..bc3240a 100644
--- a/viewers/restfulobjects/adoc/antora.yml
+++ b/viewers/restfulobjects/adoc/antora.yml
@@ -17,7 +17,7 @@
name: vro
title: "Restful Objects Viewer"
-version: latest
+version: 2.0.0-M3
start_page: ROOT:about.adoc
nav:
- modules/ROOT/nav.adoc
diff --git a/viewers/wicket/adoc/antora.yml b/viewers/wicket/adoc/antora.yml
index 25d4699..d4ae6a0 100644
--- a/viewers/wicket/adoc/antora.yml
+++ b/viewers/wicket/adoc/antora.yml
@@ -17,7 +17,7 @@
name: vw
title: "Wicket Viewer"
-version: latest
+version: 2.0.0-M3
start_page: ROOT:about.adoc
nav:
- modules/ROOT/nav.adoc
[isis] 01/02: ISIS-2336: release procedures, again.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch 2.0.0-M3
in repository https://gitbox.apache.org/repos/asf/isis.git
commit f9f379a71f91fbc3b4d589cc51f68dc67f89c50f
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Mar 29 16:52:55 2020 +0100
ISIS-2336: release procedures, again.
---
.../release-process-post/update-antora-latest.png | Bin 169270 -> 0 bytes
.../ROOT/pages/post-release-successful.adoc | 93 +++++++++------------
2 files changed, 39 insertions(+), 54 deletions(-)
diff --git a/antora/components/comguide/modules/ROOT/images/release-process-post/update-antora-latest.png b/antora/components/comguide/modules/ROOT/images/release-process-post/update-antora-latest.png
deleted file mode 100644
index fd418d5..0000000
Binary files a/antora/components/comguide/modules/ROOT/images/release-process-post/update-antora-latest.png and /dev/null differ
diff --git a/antora/components/comguide/modules/ROOT/pages/post-release-successful.adoc b/antora/components/comguide/modules/ROOT/pages/post-release-successful.adoc
index e2faf20..9b82f2f 100644
--- a/antora/components/comguide/modules/ROOT/pages/post-release-successful.adoc
+++ b/antora/components/comguide/modules/ROOT/pages/post-release-successful.adoc
@@ -280,38 +280,20 @@ We are now ready to xref:#generate-website[generate the website].
== Generate website
We use Antora to generate the site, not only the version being release but also any previous versions listed in `site.yml`.
-This is done using the `content.sources.url[].tags` and `content.sources.url[].branches` properties.
-We use tags for all cases - note that the tag appears in the generated UI.
-If there are patches to the documentation, we move the tag.
+This is done using the `content.sources.url[].branches` properties.
+We use branches for all cases - note that the branch name appears in the generated UI.
+If there are patches to the documentation, we move the branches.
-We therefore temporarily modify all of the `antora.yml` files and `site.yml` with a reference to a new tag, and then change them back afterwards.
-We also have to modify the home page `index.html`:
+We therefore temporarily modify all of the `antora.yml` files (and update `index.html`) file and create a branch for this change; then we update `site.yml` with a reference to that new branch.
+All of this is changed afterwards.
-* Update the home page of the website, `antora/supplemental-ui/index.html`
-
-** starter app instructions for the helloworld app:
-+
-[source,html,subs="attributes+"]
-----
-curl https://codeload.github.com/apache/isis-app-helloworld/zip/{isisrel} | jar xv
-cd isis-app-helloworld-{isisrel}
-----
+=== Create doc branch
-** starter app instructions for the simpleapp:
-+
-[source,html,subs="attributes+"]
-----
-curl https://codeload.github.com/apache/isis-app-simpleapp/zip/{isisrel} | jar xv
-cd isis-app-simpleapp-{isisrel}
-----
-
-** any mention of `docs/latest` -> `docs/{isisrel}`
+First, we prepare a doc branch to reference:
* Update all `antora.yml` files, eg using an IDE:
+
** `version: latest` -> `version: {isisrel}`
-+
-image::release-process-post/update-antora-latest.png[width="800px",link="{imagesdir}/release-process-post/update-antora-latest.png"]
* Commit all these changes:
+
@@ -321,47 +303,48 @@ git add .
git commit -m "$ISISJIRA: bumps antora.yml and index.html to $ISISREL"
----
-* Now tag.
+We now create a branch to reference in the `site.yml`, later on.
+
+* We create the `{isisrel}` branch.
+
-We use "docs/isis-{isisrel}" as the tag name.
-This mirrors the "rel/isis-{isisrel}" used for the formal (immutable) release tag, but allows us to move it if necessary.
+This mirrors the "rel/isis-{isisrel}" used for the formal (immutable) release tag, but is a branch because it allows us to move it, and must have this simplified name as it is used in the "edit page" link of the site template.
+
[source,bash,subs="attributes+"]
----
-git tag docs/$ISISART-$ISISREL
-git push origin refs/tags/$ISISREL:refs/tags/$ISISREL
+git branch {isisrel}
+git push origin {isisrel}
----
-* Now, immediately revert the last commit.
-+
+Finally, revert the last commit (backing changes to `antora.yml` files and `index.html`):
+
[source,bash,subs="attributes+"]
----
git revert HEAD
----
-* Now we update `site.yml` (in `antora/playbooks`).
-This will reference the tag and also the current branch (for "latest").
-Every content source needs to be updated:
+=== Update `index.html` & site.yml` & generate
+
+Lastly, we update `index.html` and then `site.yml`
+
+* Update the home page of the website, `antora/supplemental-ui/index.html`
+
-For example, we change:
+Note that this isn't performed in the docs branch (xref:#create-doc-branch[previous section]) because the supplemental files are _not_ versioned as a doc component:
+
+** update any mention of `master` -> `{isisrel}`
+
-.site.yml
-[source,yml,subs="attributes+"]
-----
-- url: .
- start_path: antora/components/docs # docs
- branches: HEAD
-----
+This should be the two sets of starter app instructions for helloworld and simpleapp.
+
+** update any mention of `latest` -> `{isisrel}`
++
+This should be in hyperlinks, `<a href="docs/...">`
+
+* Now update `site.yml`
+
-to:
+This will reference the new branch (and any previous branches).
+Every content source needs to be updated:
+
-.site.yml
-[source,yml,subs="attributes+"]
-----
-- url: .
- start_path: antora/components/docs # docs
- tags: docs/isis-{isisrel}
-----
+//** `url: .` -> `url: https://github.com/apache/isis.git`
+** `branches: HEAD` -> `branches: {isisrel}`
* commit this change, too (there's no need to push):
+
@@ -371,7 +354,9 @@ git add .
git commit -m "$ISISJIRA: adds tag to site.yml"
----
-* We are now in a position to actually generate the Antora website:
+We are now in a position to actually generate the Antora website:
+
+* generate the website:
+
[source,bash,subs="attributes+"]
----
@@ -380,8 +365,8 @@ sh preview.sh
+
This will write to `antora/target/site`; we'll use the results in the xref:#publish-website[next section].
-* Finally, revert the changes to `site.yml`:
-+
+Finally, revert the last commit (backing out changes to `site.yml`):
+
[source,bash,subs="attributes+"]
----
git revert HEAD