From 516f6ca4e245d51b1f0ed14c931de90d0b75654d Mon Sep 17 00:00:00 2001 From: Mykola Fant Date: Tue, 17 Sep 2024 12:19:06 +0300 Subject: [PATCH 1/7] revert adoc templates --- antora-playbook-local.yml | 2 ++ antora-playbook.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/antora-playbook-local.yml b/antora-playbook-local.yml index d1fbd15f..75c4e1b9 100644 --- a/antora-playbook-local.yml +++ b/antora-playbook-local.yml @@ -78,6 +78,8 @@ content: - url: https://github.com/hazelcast/hazelcast-cloud-maven-plugin branches: main start_path: docs + - url: https://github.com/hazelcast-guides/adoc-templates.git + branches: antora-doc - url: https://github.com/hazelcast-guides/caching-springboot-jcache branches: master start_path: docs diff --git a/antora-playbook.yml b/antora-playbook.yml index 2fe0d9db..439ca316 100644 --- a/antora-playbook.yml +++ b/antora-playbook.yml @@ -80,6 +80,8 @@ content: - url: https://github.com/hazelcast/hazelcast-cloud-maven-plugin branches: main start_path: docs + - url: https://github.com/hazelcast-guides/adoc-templates.git + branches: antora-doc - url: https://github.com/hazelcast-guides/caching-springboot-jcache branches: master start_path: docs From 88c065cfbb6091590f87f7ec5b9249ef258c21ed Mon Sep 17 00:00:00 2001 From: Mykola Fant Date: Mon, 2 Dec 2024 10:16:39 +0200 Subject: [PATCH 2/7] remove collector --- antora-playbook-local.yml | 111 -------------------------------------- antora-playbook.yml | 111 -------------------------------------- package.json | 1 - 3 files changed, 223 deletions(-) diff --git a/antora-playbook-local.yml b/antora-playbook-local.yml index c3cd45e1..15891e31 100644 --- a/antora-playbook-local.yml +++ b/antora-playbook-local.yml @@ -228,117 +228,6 @@ ui: snapshot: true antora: extensions: - - require: '@djencks/antora-aggregate-collector' - trace: true - componentversions: - - name: management-center - version: '6.0-snapshot' - mappings: - - module: integrate - family: attachment - origin: - url: - include: - - '**/hazelcast/management-center' - branch: - includes: - - 'master' - - name: hazelcast - version: '6.0-snapshot' - mappings: - - module: maintain-cluster - family: attachment - origin: - url: - include: - - '**/hazelcast/hazelcast-mono' - branch: - includes: - - 'master' - - name: management-center - version: '5.6' - mappings: - - module: integrate - family: attachment - origin: - url: - include: - - '**/hazelcast/management-center' - branch: - includes: - - '5.6.0' - - name: management-center - version: '5.5' - mappings: - - module: integrate - family: attachment - origin: - url: - include: - - '**/hazelcast/management-center' - branch: - includes: - - '5.5.2' - - name: hazelcast - version: '5.5' - mappings: - - module: maintain-cluster - family: attachment - origin: - url: - include: - - '**/hazelcast/hazelcast-mono' - branch: - includes: - - '5.5.z' - - name: management-center - version: '5.4' - mappings: - - module: integrate - family: attachment - origin: - url: - include: - - '**/hazelcast/management-center' - branch: - includes: - - '5.4.1' - - name: management-center - version: '5.3' - mappings: - - module: integrate - family: attachment - origin: - url: - include: - - '**/hazelcast/management-center' - branch: - includes: - - '5.3.4' - - name: management-center - version: '5.2' - mappings: - - module: integrate - family: attachment - origin: - url: - include: - - '**/hazelcast/management-center' - branch: - includes: - - '5.2.1' - - name: management-center - version: '5.1' - mappings: - - module: integrate - family: attachment - origin: - url: - include: - - '**/hazelcast/management-center' - branch: - includes: - - '5.1.4' - require: ./lib/api_json.js tags: - Favorites diff --git a/antora-playbook.yml b/antora-playbook.yml index a92c425d..84ef1de0 100644 --- a/antora-playbook.yml +++ b/antora-playbook.yml @@ -247,117 +247,6 @@ ui: static_files: [ netlify.toml ] antora: extensions: - - require: '@djencks/antora-aggregate-collector' - trace: true - componentversions: - - name: management-center - version: '6.0-snapshot' - mappings: - - module: integrate - family: attachment - origin: - url: - include: - - '**/hazelcast/management-center' - branch: - includes: - - 'master' - - name: hazelcast - version: '6.0-snapshot' - mappings: - - module: maintain-cluster - family: attachment - origin: - url: - include: - - '**/hazelcast/hazelcast-mono' - branch: - includes: - - 'master' - - name: management-center - version: '5.6' - mappings: - - module: integrate - family: attachment - origin: - url: - include: - - '**/hazelcast/management-center' - branch: - includes: - - '5.6.0' - - name: management-center - version: '5.5' - mappings: - - module: integrate - family: attachment - origin: - url: - include: - - '**/hazelcast/management-center' - branch: - includes: - - '5.5.2' - - name: hazelcast - version: '5.5' - mappings: - - module: maintain-cluster - family: attachment - origin: - url: - include: - - '**/hazelcast/hazelcast-mono' - branch: - includes: - - '5.5.z' - - name: management-center - version: '5.4' - mappings: - - module: integrate - family: attachment - origin: - url: - include: - - '**/hazelcast/management-center' - branch: - includes: - - '5.4.1' - - name: management-center - version: '5.3' - mappings: - - module: integrate - family: attachment - origin: - url: - include: - - '**/hazelcast/management-center' - branch: - includes: - - '5.3.4' - - name: management-center - version: '5.2' - mappings: - - module: integrate - family: attachment - origin: - url: - include: - - '**/hazelcast/management-center' - branch: - includes: - - '5.2.1' - - name: management-center - version: '5.1' - mappings: - - module: integrate - family: attachment - origin: - url: - include: - - '**/hazelcast/management-center' - branch: - includes: - - '5.1.4' - require: ./lib/api_json.js tags: - Favorites diff --git a/package.json b/package.json index ae4891f2..f91e684e 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,6 @@ "devDependencies": { "@antora/cli": "^3.1.1", "@antora/site-generator": "^3.1.1", - "@djencks/antora-aggregate-collector": "^0.1.0-beta.1", "asciidoctor-kroki": "^0.15.0", "ngrok": "^4.2.2", "serve": "^13.0.2" From 11e2ac7a6ba937edfa66e0c6b3b42d8c16655f10 Mon Sep 17 00:00:00 2001 From: Mykola Fant Date: Mon, 2 Dec 2024 12:12:44 +0200 Subject: [PATCH 3/7] relocate antora symlinks --- antora-playbook.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/antora-playbook.yml b/antora-playbook.yml index 84ef1de0..a52277ae 100644 --- a/antora-playbook.yml +++ b/antora-playbook.yml @@ -204,11 +204,8 @@ content: branches: [master, 5.5.z] start_path: docs/rest - url: https://github.com/hazelcast/management-center - branches: [master, 5.4.1, 5.5.2, 5.6.0] - start_path: hazelcast-management-center/src/openapi/external - - url: https://github.com/hazelcast/management-center - branches: [5.1.4, 5.2.1, 5.3.4] - start_path: openapi/external + branches: [master, 5.1.4, 5.2.1, 5.3.4, 5.4.1, 5.5.2, 5.6.0] + start_path: antora - url: https://github.com/hazelcast-guides/csharp-client-getting-started branches: master start_path: docs From 585d07a8f991ec46d54b05dba70883cdab884742 Mon Sep 17 00:00:00 2001 From: Mykola Fant Date: Mon, 2 Dec 2024 12:15:34 +0200 Subject: [PATCH 4/7] relocate antora symlinks --- antora-playbook-local.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/antora-playbook-local.yml b/antora-playbook-local.yml index 15891e31..699afc61 100644 --- a/antora-playbook-local.yml +++ b/antora-playbook-local.yml @@ -199,11 +199,8 @@ content: # branches: [master] # start_path: docs/rest # - url: https://github.com/hazelcast/management-center - # branches: [master] - # start_path: hazelcast-management-center/src/openapi/external - # - url: https://github.com/hazelcast/management-center - # branches: [5.1.z, 5.2.z, 5.3.0] - # start_path: openapi/external + # branches: [master, 5.1.4, 5.2.1, 5.3.4, 5.4.1, 5.5.2, 5.6.0] + # start_path: antora - url: https://github.com/hazelcast-guides/csharp-client-getting-started branches: master start_path: docs From 8a2d45cbb2a6819a9591ad191617660155fc8964 Mon Sep 17 00:00:00 2001 From: Mykola Fant Date: Mon, 2 Dec 2024 17:25:31 +0200 Subject: [PATCH 5/7] relocate antora symlinks --- antora-playbook.yml | 27 +++++++++++++++++++++++++++ package.json | 1 + 2 files changed, 28 insertions(+) diff --git a/antora-playbook.yml b/antora-playbook.yml index a52277ae..396c6d27 100644 --- a/antora-playbook.yml +++ b/antora-playbook.yml @@ -244,6 +244,33 @@ ui: static_files: [ netlify.toml ] antora: extensions: + - require: '@djencks/antora-aggregate-collector' + trace: true + componentversions: + - name: hazelcast + version: '6.0-snapshot' + mappings: + - module: maintain-cluster + family: attachment + origin: + url: + include: + - '**/hazelcast/hazelcast-mono' + branch: + includes: + - 'master' + - name: hazelcast + version: '5.5' + mappings: + - module: maintain-cluster + family: attachment + origin: + url: + include: + - '**/hazelcast/hazelcast-mono' + branch: + includes: + - '5.5.z' - require: ./lib/api_json.js tags: - Favorites diff --git a/package.json b/package.json index f91e684e..ae4891f2 100644 --- a/package.json +++ b/package.json @@ -26,6 +26,7 @@ "devDependencies": { "@antora/cli": "^3.1.1", "@antora/site-generator": "^3.1.1", + "@djencks/antora-aggregate-collector": "^0.1.0-beta.1", "asciidoctor-kroki": "^0.15.0", "ngrok": "^4.2.2", "serve": "^13.0.2" From 36bea6c3e74e775031e2a11c0991ff22a4b553f2 Mon Sep 17 00:00:00 2001 From: Mykola Fant Date: Mon, 2 Dec 2024 17:57:34 +0200 Subject: [PATCH 6/7] remove extra symlink --- antora-playbook-local.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/antora-playbook-local.yml b/antora-playbook-local.yml index 699afc61..2a4922be 100644 --- a/antora-playbook-local.yml +++ b/antora-playbook-local.yml @@ -195,6 +195,7 @@ content: # Uncomment to build Swagger docs locally # These are private repos. You need to do private repository authentication. # See [here](https://docs.antora.org/antora/latest/playbook/private-repository-auth/) how to do that + # The easiest way is to use a GitHub token like https://{TOKEN}:@github.com/hazelcast/hazelcast-mono # - url: https://github.com/hazelcast/hazelcast-mono # branches: [master] # start_path: docs/rest From 28372ef84b4ac3288d2bbdabcfa61f80848c18c4 Mon Sep 17 00:00:00 2001 From: Mykola Fant Date: Wed, 4 Dec 2024 20:06:48 +0200 Subject: [PATCH 7/7] remove collector --- antora-playbook.yml | 27 --------------------------- package.json | 1 - 2 files changed, 28 deletions(-) diff --git a/antora-playbook.yml b/antora-playbook.yml index 396c6d27..a52277ae 100644 --- a/antora-playbook.yml +++ b/antora-playbook.yml @@ -244,33 +244,6 @@ ui: static_files: [ netlify.toml ] antora: extensions: - - require: '@djencks/antora-aggregate-collector' - trace: true - componentversions: - - name: hazelcast - version: '6.0-snapshot' - mappings: - - module: maintain-cluster - family: attachment - origin: - url: - include: - - '**/hazelcast/hazelcast-mono' - branch: - includes: - - 'master' - - name: hazelcast - version: '5.5' - mappings: - - module: maintain-cluster - family: attachment - origin: - url: - include: - - '**/hazelcast/hazelcast-mono' - branch: - includes: - - '5.5.z' - require: ./lib/api_json.js tags: - Favorites diff --git a/package.json b/package.json index ae4891f2..f91e684e 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,6 @@ "devDependencies": { "@antora/cli": "^3.1.1", "@antora/site-generator": "^3.1.1", - "@djencks/antora-aggregate-collector": "^0.1.0-beta.1", "asciidoctor-kroki": "^0.15.0", "ngrok": "^4.2.2", "serve": "^13.0.2"