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 2021/03/28 11:53:18 UTC

[isis] 06/06: ISIS-2483: bumped antora isisprev and isisrel for next release

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 15f7b5507ff88b02740c7fb230f3fc3c735880d3
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Mar 28 12:52:51 2021 +0100

    ISIS-2483: bumped antora isisprev and isisrel for next release
---
 antora/playbooks/site-comguide.yml    | 10 ++++++++--
 antora/playbooks/site-conguide.yml    | 10 ++++++++--
 antora/playbooks/site-core.yml        | 10 ++++++++--
 antora/playbooks/site-docs.yml        | 10 ++++++++--
 antora/playbooks/site-extensions.yml  | 10 ++++++++--
 antora/playbooks/site-incubator.yml   | 10 ++++++++--
 antora/playbooks/site-legacy.yml      | 12 ++++++++----
 antora/playbooks/site-mappings.yml    | 10 ++++++++--
 antora/playbooks/site-persistence.yml | 11 +++++++++--
 antora/playbooks/site-refguide.yml    | 12 ++++++++----
 antora/playbooks/site-relnotes.yml    | 12 ++++++++----
 antora/playbooks/site-security.yml    | 11 ++++++++---
 antora/playbooks/site-setupguide.yml  | 10 ++++++++--
 antora/playbooks/site-subdomains.yml  | 10 ++++++++--
 antora/playbooks/site-testing.yml     | 10 ++++++++--
 antora/playbooks/site-tooling.yml     | 11 ++++++++---
 antora/playbooks/site-userguide.yml   | 18 ++++++++++++++++--
 antora/playbooks/site-valuetypes.yml  | 12 ++++++++++--
 antora/playbooks/site-vro.yml         | 11 +++++++++--
 antora/playbooks/site-vw.yml          | 11 +++++++++--
 antora/playbooks/site.yml             |  4 ++--
 21 files changed, 175 insertions(+), 50 deletions(-)

diff --git a/antora/playbooks/site-comguide.yml b/antora/playbooks/site-comguide.yml
index 3384db2..3a48644 100644
--- a/antora/playbooks/site-comguide.yml
+++ b/antora/playbooks/site-comguide.yml
@@ -74,8 +74,14 @@ asciidoc:
     experimental: ""
     idprefix: ""
     idseparator: "-"
-#    plantuml-server-url: "http://www.plantuml.com/plantuml"
-    page-isisrel: "2.0.0-M4"
+    # kroki
+    # for more options see https://github.com/Mogztter/asciidoctor-kroki
+    kroki-default-format: svg # (default)
+    kroki-default-options: interactive # only available for SVG
+    kroki-fetch-diagram: true
+    kroki-server-url: https://kroki.io # (default)
+    page-isisprev: "2.0.0-M5"
+    page-isisrel: "2.0.0-M6"
 
 output:
   dir: antora/target/site
diff --git a/antora/playbooks/site-conguide.yml b/antora/playbooks/site-conguide.yml
index 2bee055..f352e43 100644
--- a/antora/playbooks/site-conguide.yml
+++ b/antora/playbooks/site-conguide.yml
@@ -66,8 +66,14 @@ asciidoc:
     experimental: ""
     idprefix: ""
     idseparator: "-"
-#    plantuml-server-url: "http://www.plantuml.com/plantuml"
-    page-isisrel: "2.0.0-M4"
+    # kroki
+    # for more options see https://github.com/Mogztter/asciidoctor-kroki
+    kroki-default-format: svg # (default)
+    kroki-default-options: interactive # only available for SVG
+    kroki-fetch-diagram: true
+    kroki-server-url: https://kroki.io # (default)
+    page-isisprev: "2.0.0-M5"
+    page-isisrel: "2.0.0-M6"
 
 output:
   dir: antora/target/site
diff --git a/antora/playbooks/site-core.yml b/antora/playbooks/site-core.yml
index 71edc04..c6ae34a 100644
--- a/antora/playbooks/site-core.yml
+++ b/antora/playbooks/site-core.yml
@@ -95,8 +95,14 @@ asciidoc:
     experimental: ""
     idprefix: ""
     idseparator: "-"
-#    plantuml-server-url: "http://www.plantuml.com/plantuml"
-    page-isisrel: "2.0.0-M4"
+    # kroki
+    # for more options see https://github.com/Mogztter/asciidoctor-kroki
+    kroki-default-format: svg # (default)
+    kroki-default-options: interactive # only available for SVG
+    kroki-fetch-diagram: true
+    kroki-server-url: https://kroki.io # (default)
+    page-isisprev: "2.0.0-M5"
+    page-isisrel: "2.0.0-M6"
 
 output:
   dir: antora/target/site
diff --git a/antora/playbooks/site-docs.yml b/antora/playbooks/site-docs.yml
index 2663184..41ab78a 100644
--- a/antora/playbooks/site-docs.yml
+++ b/antora/playbooks/site-docs.yml
@@ -60,8 +60,14 @@ asciidoc:
     experimental: ""
     idprefix: ""
     idseparator: "-"
-#    plantuml-server-url: "http://www.plantuml.com/plantuml"
-    page-isisrel: "2.0.0-M4"
+    # kroki
+    # for more options see https://github.com/Mogztter/asciidoctor-kroki
+    kroki-default-format: svg # (default)
+    kroki-default-options: interactive # only available for SVG
+    kroki-fetch-diagram: true
+    kroki-server-url: https://kroki.io # (default)
+    page-isisprev: "2.0.0-M5"
+    page-isisrel: "2.0.0-M6"
 
 output:
   dir: antora/target/site
diff --git a/antora/playbooks/site-extensions.yml b/antora/playbooks/site-extensions.yml
index 2a691f6..32b747d 100644
--- a/antora/playbooks/site-extensions.yml
+++ b/antora/playbooks/site-extensions.yml
@@ -102,8 +102,14 @@ asciidoc:
     experimental: ""
     idprefix: ""
     idseparator: "-"
-#    plantuml-server-url: "http://www.plantuml.com/plantuml"
-    page-isisrel: "2.0.0-M4"
+    # kroki
+    # for more options see https://github.com/Mogztter/asciidoctor-kroki
+    kroki-default-format: svg # (default)
+    kroki-default-options: interactive # only available for SVG
+    kroki-fetch-diagram: true
+    kroki-server-url: https://kroki.io # (default)
+    page-isisprev: "2.0.0-M5"
+    page-isisrel: "2.0.0-M6"
 
 output:
   dir: antora/target/site
diff --git a/antora/playbooks/site-incubator.yml b/antora/playbooks/site-incubator.yml
index c9c8d1f..6b8dde2 100644
--- a/antora/playbooks/site-incubator.yml
+++ b/antora/playbooks/site-incubator.yml
@@ -79,8 +79,14 @@ asciidoc:
     experimental: ""
     idprefix: ""
     idseparator: "-"
-#    plantuml-server-url: "http://www.plantuml.com/plantuml"
-    page-isisrel: "2.0.0-M4"
+    # kroki
+    # for more options see https://github.com/Mogztter/asciidoctor-kroki
+    kroki-default-format: svg # (default)
+    kroki-default-options: interactive # only available for SVG
+    kroki-fetch-diagram: true
+    kroki-server-url: https://kroki.io # (default)
+    page-isisprev: "2.0.0-M5"
+    page-isisrel: "2.0.0-M6"
 
 output:
   dir: antora/target/site
diff --git a/antora/playbooks/site-legacy.yml b/antora/playbooks/site-legacy.yml
index 4d2fee7..0c1a66c 100644
--- a/antora/playbooks/site-legacy.yml
+++ b/antora/playbooks/site-legacy.yml
@@ -66,8 +66,6 @@ content:
       branches: HEAD
 
 
-
-
 ui:
   bundle:
     url: ../isis-antora/build/ui-bundle.zip
@@ -86,8 +84,14 @@ asciidoc:
     experimental: ""
     idprefix: ""
     idseparator: "-"
-#    plantuml-server-url: "http://www.plantuml.com/plantuml"
-    page-isisrel: "2.0.0-M4"
+    # kroki
+    # for more options see https://github.com/Mogztter/asciidoctor-kroki
+    kroki-default-format: svg # (default)
+    kroki-default-options: interactive # only available for SVG
+    kroki-fetch-diagram: true
+    kroki-server-url: https://kroki.io # (default)
+    page-isisprev: "2.0.0-M5"
+    page-isisrel: "2.0.0-M6"
 
 output:
   dir: antora/target/site
diff --git a/antora/playbooks/site-mappings.yml b/antora/playbooks/site-mappings.yml
index 7d478a9..381d9bd 100644
--- a/antora/playbooks/site-mappings.yml
+++ b/antora/playbooks/site-mappings.yml
@@ -82,8 +82,14 @@ asciidoc:
     experimental: ""
     idprefix: ""
     idseparator: "-"
-#    plantuml-server-url: "http://www.plantuml.com/plantuml"
-    page-isisrel: "2.0.0-M4"
+    # kroki
+    # for more options see https://github.com/Mogztter/asciidoctor-kroki
+    kroki-default-format: svg # (default)
+    kroki-default-options: interactive # only available for SVG
+    kroki-fetch-diagram: true
+    kroki-server-url: https://kroki.io # (default)
+    page-isisprev: "2.0.0-M5"
+    page-isisrel: "2.0.0-M6"
 
 output:
   dir: antora/target/site
diff --git a/antora/playbooks/site-persistence.yml b/antora/playbooks/site-persistence.yml
index 87f1ffa..7b30111 100644
--- a/antora/playbooks/site-persistence.yml
+++ b/antora/playbooks/site-persistence.yml
@@ -50,6 +50,7 @@ content:
       start_path: starters/adoc # docs
       branches: HEAD
 
+
 ui:
   bundle:
     url: ../isis-antora/build/ui-bundle.zip
@@ -68,8 +69,14 @@ asciidoc:
     experimental: ""
     idprefix: ""
     idseparator: "-"
-#    plantuml-server-url: "http://www.plantuml.com/plantuml"
-    page-isisrel: "2.0.0-M4"
+    # kroki
+    # for more options see https://github.com/Mogztter/asciidoctor-kroki
+    kroki-default-format: svg # (default)
+    kroki-default-options: interactive # only available for SVG
+    kroki-fetch-diagram: true
+    kroki-server-url: https://kroki.io # (default)
+    page-isisprev: "2.0.0-M5"
+    page-isisrel: "2.0.0-M6"
 
 output:
   dir: antora/target/site
diff --git a/antora/playbooks/site-refguide.yml b/antora/playbooks/site-refguide.yml
index 417eb7d..0101fd2 100644
--- a/antora/playbooks/site-refguide.yml
+++ b/antora/playbooks/site-refguide.yml
@@ -60,8 +60,6 @@ content:
       branches: HEAD
 
 
-
-
 ui:
   bundle:
     url: ../isis-antora/build/ui-bundle.zip
@@ -80,8 +78,14 @@ asciidoc:
     experimental: ""
     idprefix: ""
     idseparator: "-"
-#    plantuml-server-url: "http://www.plantuml.com/plantuml"
-    page-isisrel: "2.0.0-M4"
+    # kroki
+    # for more options see https://github.com/Mogztter/asciidoctor-kroki
+    kroki-default-format: svg # (default)
+    kroki-default-options: interactive # only available for SVG
+    kroki-fetch-diagram: true
+    kroki-server-url: https://kroki.io # (default)
+    page-isisprev: "2.0.0-M5"
+    page-isisrel: "2.0.0-M6"
 
 output:
   dir: antora/target/site
diff --git a/antora/playbooks/site-relnotes.yml b/antora/playbooks/site-relnotes.yml
index 695579a..d3cb73d 100644
--- a/antora/playbooks/site-relnotes.yml
+++ b/antora/playbooks/site-relnotes.yml
@@ -46,8 +46,6 @@ content:
       branches: HEAD
 
 
-
-
 ui:
   bundle:
     url: ../isis-antora/build/ui-bundle.zip
@@ -66,8 +64,14 @@ asciidoc:
     experimental: ""
     idprefix: ""
     idseparator: "-"
-#    plantuml-server-url: "http://www.plantuml.com/plantuml"
-    page-isisrel: "2.0.0-M4"
+    # kroki
+    # for more options see https://github.com/Mogztter/asciidoctor-kroki
+    kroki-default-format: svg # (default)
+    kroki-default-options: interactive # only available for SVG
+    kroki-fetch-diagram: true
+    kroki-server-url: https://kroki.io # (default)
+    page-isisprev: "2.0.0-M5"
+    page-isisrel: "2.0.0-M6"
 
 output:
   dir: antora/target/site
diff --git a/antora/playbooks/site-security.yml b/antora/playbooks/site-security.yml
index 6ce89a6..bc4637e 100644
--- a/antora/playbooks/site-security.yml
+++ b/antora/playbooks/site-security.yml
@@ -78,7 +78,6 @@ content:
       branches: HEAD
 
 
-
 ui:
   bundle:
     url: ../isis-antora/build/ui-bundle.zip
@@ -97,8 +96,14 @@ asciidoc:
     experimental: ""
     idprefix: ""
     idseparator: "-"
-#    plantuml-server-url: "http://www.plantuml.com/plantuml"
-    page-isisrel: "2.0.0-M4"
+    # kroki
+    # for more options see https://github.com/Mogztter/asciidoctor-kroki
+    kroki-default-format: svg # (default)
+    kroki-default-options: interactive # only available for SVG
+    kroki-fetch-diagram: true
+    kroki-server-url: https://kroki.io # (default)
+    page-isisprev: "2.0.0-M5"
+    page-isisrel: "2.0.0-M6"
 
 output:
   dir: antora/target/site
diff --git a/antora/playbooks/site-setupguide.yml b/antora/playbooks/site-setupguide.yml
index fa0f3a8..e3230f5 100644
--- a/antora/playbooks/site-setupguide.yml
+++ b/antora/playbooks/site-setupguide.yml
@@ -64,8 +64,14 @@ asciidoc:
     experimental: ""
     idprefix: ""
     idseparator: "-"
-#    plantuml-server-url: "http://www.plantuml.com/plantuml"
-    page-isisrel: "2.0.0-M4"
+    # kroki
+    # for more options see https://github.com/Mogztter/asciidoctor-kroki
+    kroki-default-format: svg # (default)
+    kroki-default-options: interactive # only available for SVG
+    kroki-fetch-diagram: true
+    kroki-server-url: https://kroki.io # (default)
+    page-isisprev: "2.0.0-M5"
+    page-isisrel: "2.0.0-M6"
 
 output:
   dir: antora/target/site
diff --git a/antora/playbooks/site-subdomains.yml b/antora/playbooks/site-subdomains.yml
index 4b58b56..b713ec0 100644
--- a/antora/playbooks/site-subdomains.yml
+++ b/antora/playbooks/site-subdomains.yml
@@ -97,8 +97,14 @@ asciidoc:
     experimental: ""
     idprefix: ""
     idseparator: "-"
-#    plantuml-server-url: "http://www.plantuml.com/plantuml"
-    page-isisrel: "2.0.0-M4"
+    # kroki
+    # for more options see https://github.com/Mogztter/asciidoctor-kroki
+    kroki-default-format: svg # (default)
+    kroki-default-options: interactive # only available for SVG
+    kroki-fetch-diagram: true
+    kroki-server-url: https://kroki.io # (default)
+    page-isisprev: "2.0.0-M5"
+    page-isisrel: "2.0.0-M6"
 
 output:
   dir: antora/target/site
diff --git a/antora/playbooks/site-testing.yml b/antora/playbooks/site-testing.yml
index 3e1bcbe..eb384e4 100644
--- a/antora/playbooks/site-testing.yml
+++ b/antora/playbooks/site-testing.yml
@@ -88,8 +88,14 @@ asciidoc:
     experimental: ""
     idprefix: ""
     idseparator: "-"
-#    plantuml-server-url: "http://www.plantuml.com/plantuml"
-    page-isisrel: "2.0.0-M4"
+    # kroki
+    # for more options see https://github.com/Mogztter/asciidoctor-kroki
+    kroki-default-format: svg # (default)
+    kroki-default-options: interactive # only available for SVG
+    kroki-fetch-diagram: true
+    kroki-server-url: https://kroki.io # (default)
+    page-isisprev: "2.0.0-M5"
+    page-isisrel: "2.0.0-M6"
 
 output:
   dir: antora/target/site
diff --git a/antora/playbooks/site-tooling.yml b/antora/playbooks/site-tooling.yml
index ea22fc8..ae17670 100644
--- a/antora/playbooks/site-tooling.yml
+++ b/antora/playbooks/site-tooling.yml
@@ -64,7 +64,6 @@ content:
 
 
 
-
 ui:
   bundle:
     url: ../isis-antora/build/ui-bundle.zip
@@ -83,8 +82,14 @@ asciidoc:
     experimental: ""
     idprefix: ""
     idseparator: "-"
-#    plantuml-server-url: "http://www.plantuml.com/plantuml"
-    page-isisrel: "2.0.0-M4"
+    # kroki
+    # for more options see https://github.com/Mogztter/asciidoctor-kroki
+    kroki-default-format: svg # (default)
+    kroki-default-options: interactive # only available for SVG
+    kroki-fetch-diagram: true
+    kroki-server-url: https://kroki.io # (default)
+    page-isisprev: "2.0.0-M5"
+    page-isisrel: "2.0.0-M6"
 
 output:
   dir: antora/target/site
diff --git a/antora/playbooks/site-userguide.yml b/antora/playbooks/site-userguide.yml
index d8bfb08..8c1c834 100644
--- a/antora/playbooks/site-userguide.yml
+++ b/antora/playbooks/site-userguide.yml
@@ -51,6 +51,14 @@ content:
       start_path: starters/adoc # docs
       branches: HEAD
 
+# tooling
+    - url: .
+      start_path: tooling/adoc # toc
+      branches: HEAD
+    - url: .
+      start_path: tooling/cli/adoc # cli
+      branches: HEAD
+
 
 
 ui:
@@ -71,8 +79,14 @@ asciidoc:
     experimental: ""
     idprefix: ""
     idseparator: "-"
-#    plantuml-server-url: "http://www.plantuml.com/plantuml"
-    page-isisrel: "2.0.0-M4"
+    # kroki
+    # for more options see https://github.com/Mogztter/asciidoctor-kroki
+    kroki-default-format: svg # (default)
+    kroki-default-options: interactive # only available for SVG
+    kroki-fetch-diagram: true
+    kroki-server-url: https://kroki.io # (default)
+    page-isisprev: "2.0.0-M5"
+    page-isisrel: "2.0.0-M6"
 
 output:
   dir: antora/target/site
diff --git a/antora/playbooks/site-valuetypes.yml b/antora/playbooks/site-valuetypes.yml
index fa34dc7..51f9ed2 100644
--- a/antora/playbooks/site-valuetypes.yml
+++ b/antora/playbooks/site-valuetypes.yml
@@ -56,6 +56,8 @@ content:
       start_path: valuetypes/sse/adoc # valuetypes
       branches: HEAD
 
+
+
 ui:
   bundle:
     url: ../isis-antora/build/ui-bundle.zip
@@ -74,8 +76,14 @@ asciidoc:
     experimental: ""
     idprefix: ""
     idseparator: "-"
-#    plantuml-server-url: "http://www.plantuml.com/plantuml"
-    page-isisrel: "2.0.0-M4"
+    # kroki
+    # for more options see https://github.com/Mogztter/asciidoctor-kroki
+    kroki-default-format: svg # (default)
+    kroki-default-options: interactive # only available for SVG
+    kroki-fetch-diagram: true
+    kroki-server-url: https://kroki.io # (default)
+    page-isisprev: "2.0.0-M5"
+    page-isisrel: "2.0.0-M6"
 
 output:
   dir: antora/target/site
diff --git a/antora/playbooks/site-vro.yml b/antora/playbooks/site-vro.yml
index 36bd92c..1c63692 100644
--- a/antora/playbooks/site-vro.yml
+++ b/antora/playbooks/site-vro.yml
@@ -53,6 +53,7 @@ content:
       branches: HEAD
 
 
+
 ui:
   bundle:
     url: ../isis-antora/build/ui-bundle.zip
@@ -71,8 +72,14 @@ asciidoc:
     experimental: ""
     idprefix: ""
     idseparator: "-"
-#    plantuml-server-url: "http://www.plantuml.com/plantuml"
-    page-isisrel: "2.0.0-M4"
+    # kroki
+    # for more options see https://github.com/Mogztter/asciidoctor-kroki
+    kroki-default-format: svg # (default)
+    kroki-default-options: interactive # only available for SVG
+    kroki-fetch-diagram: true
+    kroki-server-url: https://kroki.io # (default)
+    page-isisprev: "2.0.0-M5"
+    page-isisrel: "2.0.0-M6"
 
 output:
   dir: antora/target/site
diff --git a/antora/playbooks/site-vw.yml b/antora/playbooks/site-vw.yml
index 8188235..193d028 100644
--- a/antora/playbooks/site-vw.yml
+++ b/antora/playbooks/site-vw.yml
@@ -59,6 +59,7 @@ content:
       branches: HEAD
 
 
+
 ui:
   bundle:
     url: ../isis-antora/build/ui-bundle.zip
@@ -77,8 +78,14 @@ asciidoc:
     experimental: ""
     idprefix: ""
     idseparator: "-"
-#    plantuml-server-url: "http://www.plantuml.com/plantuml"
-    page-isisrel: "2.0.0-M4"
+    # kroki
+    # for more options see https://github.com/Mogztter/asciidoctor-kroki
+    kroki-default-format: svg # (default)
+    kroki-default-options: interactive # only available for SVG
+    kroki-fetch-diagram: true
+    kroki-server-url: https://kroki.io # (default)
+    page-isisprev: "2.0.0-M5"
+    page-isisrel: "2.0.0-M6"
 
 output:
   dir: antora/target/site
diff --git a/antora/playbooks/site.yml b/antora/playbooks/site.yml
index 1e02ff3..52bd79c 100644
--- a/antora/playbooks/site.yml
+++ b/antora/playbooks/site.yml
@@ -356,8 +356,8 @@ asciidoc:
     kroki-default-options: interactive # only available for SVG
     kroki-fetch-diagram: true
     kroki-server-url: https://kroki.io # (default)
-    page-isisprev: "2.0.0-M4"
-    page-isisrel: "2.0.0-M5"
+    page-isisprev: "2.0.0-M5"
+    page-isisrel: "2.0.0-M6"
 
 output:
   dir: antora/target/site