From b1c20c09ff0ff930985a50ea23e8d8a59139948b Mon Sep 17 00:00:00 2001 From: Mykola Fant Date: Mon, 7 Oct 2024 17:03:18 +0300 Subject: [PATCH 1/7] Merge main into develop (#394) # Description of change Merge main into develop --------- Signed-off-by: devOpsHelm Co-authored-by: Oliver Howell Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: GitHub Actions Bot <> Co-authored-by: devopshazelcast Co-authored-by: devOpsHelm <54980549+devOpsHelm@users.noreply.github.com> Co-authored-by: Nishaat Rajabali <12186256+nishaatr@users.noreply.github.com> --- antora-playbook.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/antora-playbook.yml b/antora-playbook.yml index 439ca316..23071ee1 100644 --- a/antora-playbook.yml +++ b/antora-playbook.yml @@ -194,7 +194,7 @@ content: branches: master start_path: docs - url: https://github.com/hazelcast/hazelcast-mono - branches: [master, 5.5.0] + branches: [master, 5.5.z] start_path: docs/rest - url: https://github.com/hazelcast/management-center branches: [master, 5.4.0, 5.5.0] @@ -269,9 +269,9 @@ antora: - '**/hazelcast/hazelcast-mono' branch: includes: - - '5.5.0' + - '5.5.z' - name: management-center - version: '6.0-snapshot' + version: '5.6-snapshot' mappings: - module: integrate family: attachment From 5e428733a59aecd462e687465490d29948b47482 Mon Sep 17 00:00:00 2001 From: Oliver Howell Date: Tue, 8 Oct 2024 11:19:01 +0100 Subject: [PATCH 2/7] Add CLC 5.4.1 to Algolia; Update search-config.json (#396) --- search-config.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/search-config.json b/search-config.json index 74a1de1f..957299a6 100644 --- a/search-config.json +++ b/search-config.json @@ -159,6 +159,18 @@ ], "selectors_key": "cloud" }, + { + "url": "https://docs.hazelcast.com/clc/(?P.*?)/", + "tags": [ + "clc-5.4.1" + ], + "variables": { + "version": [ + "5.4.1" + ] + }, + "selectors_key": "command-line-client" + }, { "url": "https://docs.hazelcast.com/clc/(?P.*?)/", "tags": [ From b137abbc7092bce5d0b029c23bff04395a23a783 Mon Sep 17 00:00:00 2001 From: Oliver Howell Date: Tue, 8 Oct 2024 11:19:14 +0100 Subject: [PATCH 3/7] Update CLC to 5.4.1 (#395) Makes 5.4.1 the /latest --- _redirects | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_redirects b/_redirects index d3af8679..8cb36802 100644 --- a/_redirects +++ b/_redirects @@ -32,7 +32,7 @@ /clc/latest-dev/* /clc/latest/:splat 200! # Redirect latest clc alias to the latest version -/clc/latest/* /clc/5.4.0/:splat 200! +/clc/latest/* /clc/5.4.1/:splat 200! # Redirect legacy /4 version to the /4.0 version /imdg/4/* /imdg/4.0/:splat 301! From f672de424d27c886b2c66ca3441af642eff71eca Mon Sep 17 00:00:00 2001 From: GitHub Actions Bot <> Date: Wed, 9 Oct 2024 12:27:54 +0000 Subject: [PATCH 4/7] 5.6-snapshot : update _redirects and search-config.json and antora-playbook.yml and antora-playbook-local.yml --- search-config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/search-config.json b/search-config.json index 957299a6..272c709b 100644 --- a/search-config.json +++ b/search-config.json @@ -170,7 +170,7 @@ ] }, "selectors_key": "command-line-client" - }, + }, { "url": "https://docs.hazelcast.com/clc/(?P.*?)/", "tags": [ From 9851eb75f2134f7131dfc92ba52a7caf82e185d7 Mon Sep 17 00:00:00 2001 From: GitHub Actions Bot <> Date: Wed, 9 Oct 2024 12:27:55 +0000 Subject: [PATCH 5/7] 5.6-snapshot : update _redirects and search-config.json and antora-playbook.yml and antora-playbook-local.yml --- search-config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/search-config.json b/search-config.json index 957299a6..272c709b 100644 --- a/search-config.json +++ b/search-config.json @@ -170,7 +170,7 @@ ] }, "selectors_key": "command-line-client" - }, + }, { "url": "https://docs.hazelcast.com/clc/(?P.*?)/", "tags": [ From abfa5f7a90ea0405f5798377751b18550b44cea9 Mon Sep 17 00:00:00 2001 From: GitHub Actions Bot <> Date: Tue, 15 Oct 2024 13:35:01 +0000 Subject: [PATCH 6/7] 6.0-snapshot : update _redirects and search-config.json and antora-playbook.yml and antora-playbook-local.yml --- _redirects | 2 +- search-config.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/_redirects b/_redirects index 8cb36802..e59393d2 100644 --- a/_redirects +++ b/_redirects @@ -5,7 +5,7 @@ /management-center/latest/* /management-center/5.5/:splat 200! # Redirect latest-dev management-center alias to the latest version -/management-center/latest-dev/* /management-center/5.6-snapshot/:splat 200! +/management-center/latest-dev/* /management-center/6.0-snapshot/:splat 200! # Redirect latest cloud-only management-center alias to the latest version /management-center/5.4-CLOUD-1/* /management-center/5.4-snapshot/:splat 200! diff --git a/search-config.json b/search-config.json index 272c709b..a9d7ac22 100644 --- a/search-config.json +++ b/search-config.json @@ -23,11 +23,11 @@ { "url": "https://docs.hazelcast.com/management-center/(?P.*?)/", "tags": [ - "management-center-5.6-snapshot" + "management-center-6.0-snapshot" ], "variables": { "version": [ - "5.6-snapshot" + "6.0-snapshot" ] }, "selectors_key": "mc" From ecf010ba2983756be92bad7ffa4a3051c7201248 Mon Sep 17 00:00:00 2001 From: GitHub Actions Bot <> Date: Wed, 16 Oct 2024 11:10:31 +0000 Subject: [PATCH 7/7] 5.6.0 : update _redirects and search-config.json and antora-playbook.yml and antora-playbook-local.yml --- _redirects | 2 +- antora-playbook-local.yml | 12 ++++++++++++ antora-playbook.yml | 34 +++++++++++++++++++++++++++++++--- search-config.json | 12 ++++++++++++ 4 files changed, 56 insertions(+), 4 deletions(-) diff --git a/_redirects b/_redirects index e59393d2..db080678 100644 --- a/_redirects +++ b/_redirects @@ -2,7 +2,7 @@ /hazelcast /home 200! # Redirect latest management-center alias to the latest version -/management-center/latest/* /management-center/5.5/:splat 200! +/management-center/latest/* /management-center/5.6/:splat 200! # Redirect latest-dev management-center alias to the latest version /management-center/latest-dev/* /management-center/6.0-snapshot/:splat 200! diff --git a/antora-playbook-local.yml b/antora-playbook-local.yml index 75c4e1b9..4b4ae2fa 100644 --- a/antora-playbook-local.yml +++ b/antora-playbook-local.yml @@ -314,6 +314,18 @@ antora: branch: includes: - 5.5.0 + - name: management-center + version: "5.6" + mappings: + - module: integrate + family: attachment + origin: + url: + include: + - '**/hazelcast/management-center' + branch: + includes: + - 5.6.0 - require: ./lib/api_json.js tags: - Favorites diff --git a/antora-playbook.yml b/antora-playbook.yml index 23071ee1..c601a1a1 100644 --- a/antora-playbook.yml +++ b/antora-playbook.yml @@ -197,7 +197,7 @@ content: branches: [master, 5.5.z] start_path: docs/rest - url: https://github.com/hazelcast/management-center - branches: [master, 5.4.0, 5.5.0] + branches: [master, 5.4.0, 5.5.0, 5.6.0] 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] @@ -232,6 +232,10 @@ ui: + + + + for = "/api/*" [headers.values] Access-Control-Allow-Origin = "*" @@ -255,6 +259,18 @@ antora: 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 - require: '@djencks/antora-aggregate-collector' trace: true componentversions: @@ -281,7 +297,7 @@ antora: - '**/hazelcast/management-center' branch: includes: - - 'master' + - 'master' - name: management-center version: '5.5' mappings: @@ -293,7 +309,7 @@ antora: - '**/hazelcast/management-center' branch: includes: - - '5.5.0' + - '5.5.0' - name: management-center version: '5.3' mappings: @@ -342,6 +358,18 @@ antora: branch: includes: - '5.4.0' + - name: management-center + version: "5.6" + mappings: + - module: integrate + family: attachment + origin: + url: + include: + - '**/hazelcast/management-center' + branch: + includes: + - 5.6.0 - require: ./lib/api_json.js tags: - Favorites diff --git a/search-config.json b/search-config.json index a9d7ac22..1ae0156b 100644 --- a/search-config.json +++ b/search-config.json @@ -398,6 +398,18 @@ ] }, "selectors_key": "mc" + }, + { + "url": "https://docs.hazelcast.com/management-center/(?P.*?)/", + "tags": [ + "management-center-5.6" + ], + "variables": { + "version": [ + "5.6" + ] + }, + "selectors_key": "mc" } ], "sitemap_urls": [