From 364dbe56884e6a3ff55a82023daa72f25d65db0d Mon Sep 17 00:00:00 2001 From: James Rodewig <40268737+jrodewig@users.noreply.github.com> Date: Thu, 9 Dec 2021 16:45:54 -0500 Subject: [PATCH 01/11] [DOCS] Bump current version to 8.0 --- conf.yaml | 11 ++++++----- shared/versions/stack/7.16.asciidoc | 2 +- shared/versions/stack/8.0.asciidoc | 4 ++-- shared/versions/stack/current.asciidoc | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/conf.yaml b/conf.yaml index e343aaa9a28d2..9f75e2017bf03 100644 --- a/conf.yaml +++ b/conf.yaml @@ -68,10 +68,10 @@ contents_title: Elastic Stack and Product Documentation # : & # The keys don't really matter, but by convention the are the same as the variable. variables: - stackcurrent: &stackcurrent 7.16 - stacklive: &stacklive [ master, 8.0, 7.16, 6.8 ] + stackcurrent: &stackcurrent 8.0 + stacklive: &stacklive [ master, 8.0, 7.16 ] - stacklivemain: &stacklivemain [ main, 8.0, 7.16, 6.8 ] + stacklivemain: &stacklivemain [ main, 8.0, 7.16 ] cloudSaasCurrent: &cloudSaasCurrent ms-66 @@ -649,9 +649,10 @@ contents: exclude_branches: [ 6.2, 6.1, 6.0, 5.6, 5.5, 5.4, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - title: Java Transport Client (deprecated) prefix: java-api - current: *stackcurrent + # TODO: Undo this before merge + current: 7.16 branches: [ 7.16, 7.15, 7.14, 7.13, 7.12, 7.11, 7.10, 7.9, 7.8, 7.7, 7.6, 7.5, 7.4, 7.3, 7.2, 7.1, 7.0, 6.8, 6.7, 6.6, 6.5, 6.4, 6.3, 6.2, 6.1, 6.0, 5.6, 5.5, 5.4, 5.3, 5.2, 5.1, 5.0, 2.4, 2.3, 2.2, 2.1, 2.0, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - live: *stacklive + live: [ 7.16, 6.8 ] index: docs/java-api/index.asciidoc tags: Clients/Java subject: Clients diff --git a/shared/versions/stack/7.16.asciidoc b/shared/versions/stack/7.16.asciidoc index a6889f37af44b..7bbddeaaf6337 100644 --- a/shared/versions/stack/7.16.asciidoc +++ b/shared/versions/stack/7.16.asciidoc @@ -22,7 +22,7 @@ release-state can be: released | prerelease | unreleased ////////// is-current-version can be: true | false ////////// -:is-current-version: true +:is-current-version: false ////////// hide-xpack-tags defaults to "false" (they are shown unless set to "true") diff --git a/shared/versions/stack/8.0.asciidoc b/shared/versions/stack/8.0.asciidoc index 6032e711ae31f..c23a0a573a929 100644 --- a/shared/versions/stack/8.0.asciidoc +++ b/shared/versions/stack/8.0.asciidoc @@ -18,12 +18,12 @@ bare_version never includes -alpha or -beta ////////// release-state can be: released | prerelease | unreleased ////////// -:release-state: prerelease +:release-state: released ////////// is-current-version can be: true | false ////////// -:is-current-version: false +:is-current-version: true ////////// hide-xpack-tags defaults to "false" (they are shown unless set to "true") diff --git a/shared/versions/stack/current.asciidoc b/shared/versions/stack/current.asciidoc index 2806214d473df..cbba0bc7c7a60 100644 --- a/shared/versions/stack/current.asciidoc +++ b/shared/versions/stack/current.asciidoc @@ -1 +1 @@ -include::7.16.asciidoc[] +include::8.0.asciidoc[] From f34478adc07734f6c6f9d0a75adc1bc7998b715c Mon Sep 17 00:00:00 2001 From: James Rodewig <40268737+jrodewig@users.noreply.github.com> Date: Wed, 26 Jan 2022 13:09:07 -0500 Subject: [PATCH 02/11] Trigger Build From e6c921d06aeefcb4e59a234db1d59de1f12dfb7b Mon Sep 17 00:00:00 2001 From: James Rodewig <40268737+jrodewig@users.noreply.github.com> Date: Wed, 26 Jan 2022 18:49:31 -0500 Subject: [PATCH 03/11] trigger build From dd5dc3583da4c3aba2dc4d0e0254af614f37bdd7 Mon Sep 17 00:00:00 2001 From: James Rodewig <40268737+jrodewig@users.noreply.github.com> Date: Thu, 27 Jan 2022 10:23:16 -0500 Subject: [PATCH 04/11] trigger build From c0a5e2ab7c975175d192725564ce5ab8c69204c1 Mon Sep 17 00:00:00 2001 From: James Rodewig <40268737+jrodewig@users.noreply.github.com> Date: Thu, 27 Jan 2022 18:16:54 -0500 Subject: [PATCH 05/11] trigger build From 212881509d964837848034fe48505fdb0bef1035 Mon Sep 17 00:00:00 2001 From: James Rodewig <40268737+jrodewig@users.noreply.github.com> Date: Tue, 1 Feb 2022 11:09:55 -0500 Subject: [PATCH 06/11] fix merge conflict --- conf.yaml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/conf.yaml b/conf.yaml index a720118467cb1..d5fbe30fb9e57 100644 --- a/conf.yaml +++ b/conf.yaml @@ -71,17 +71,10 @@ contents_title: Elastic Stack and Product Documentation # : & # The keys don't really matter, but by convention the are the same as the variable. variables: -<<<<<<< HEAD stackcurrent: &stackcurrent 8.0 stacklive: &stacklive [ master, 8.0, 7.17 ] stacklivemain: &stacklivemain [ main, 8.0, 7.17 ] -======= - stackcurrent: &stackcurrent 7.17 - stacklive: &stacklive [ master, 8.0, 7.17, 6.8 ] - - stacklivemain: &stacklivemain [ main, 8.0, 7.17, 6.8 ] ->>>>>>> upstream/master cloudSaasCurrent: &cloudSaasCurrent ms-68 From 38daa8afc95487a98cd83fe3e0275ac754d535c8 Mon Sep 17 00:00:00 2001 From: James Rodewig <40268737+jrodewig@users.noreply.github.com> Date: Thu, 3 Feb 2022 09:06:56 -0500 Subject: [PATCH 07/11] trigger build From f78f50c70a4803c10b68ddca1f28540e42a5dac9 Mon Sep 17 00:00:00 2001 From: James Rodewig <40268737+jrodewig@users.noreply.github.com> Date: Thu, 3 Feb 2022 13:35:24 -0500 Subject: [PATCH 08/11] trigger build From 04f319b48556f693d15fd2820dd110700f595ef7 Mon Sep 17 00:00:00 2001 From: James Rodewig <40268737+jrodewig@users.noreply.github.com> Date: Fri, 4 Feb 2022 11:46:13 -0500 Subject: [PATCH 09/11] remove 6.8 from stacklive --- conf.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf.yaml b/conf.yaml index 494ada306cd03..bc80a09044469 100644 --- a/conf.yaml +++ b/conf.yaml @@ -72,9 +72,9 @@ contents_title: Elastic Stack and Product Documentation # The keys don't really matter, but by convention the are the same as the variable. variables: stackcurrent: &stackcurrent 8.0 - stacklive: &stacklive [ master, 8.1, 8.0, 7.17, 6.8 ] + stacklive: &stacklive [ master, 8.1, 8.0, 7.17 ] - stacklivemain: &stacklivemain [ main, 8.1, 8.0, 7.17, 6.8 ] + stacklivemain: &stacklivemain [ main, 8.1, 8.0, 7.17 ] cloudSaasCurrent: &cloudSaasCurrent ms-69 From 825c9c2273bc7576588ee11471e0a71a8af8bb1a Mon Sep 17 00:00:00 2001 From: James Rodewig <40268737+jrodewig@users.noreply.github.com> Date: Fri, 4 Feb 2022 11:46:32 -0500 Subject: [PATCH 10/11] whitespace fix --- conf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf.yaml b/conf.yaml index bc80a09044469..4af2020c41470 100644 --- a/conf.yaml +++ b/conf.yaml @@ -72,7 +72,7 @@ contents_title: Elastic Stack and Product Documentation # The keys don't really matter, but by convention the are the same as the variable. variables: stackcurrent: &stackcurrent 8.0 - stacklive: &stacklive [ master, 8.1, 8.0, 7.17 ] + stacklive: &stacklive [ master, 8.1, 8.0, 7.17 ] stacklivemain: &stacklivemain [ main, 8.1, 8.0, 7.17 ] From 63389e39146e3b3b3d3d46be725cff47abe7fe0f Mon Sep 17 00:00:00 2001 From: James Rodewig <40268737+jrodewig@users.noreply.github.com> Date: Fri, 4 Feb 2022 11:47:05 -0500 Subject: [PATCH 11/11] update 7.17 --- shared/versions/stack/7.17.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared/versions/stack/7.17.asciidoc b/shared/versions/stack/7.17.asciidoc index 77ccd33cfc6cc..6a286b72d60a0 100644 --- a/shared/versions/stack/7.17.asciidoc +++ b/shared/versions/stack/7.17.asciidoc @@ -22,7 +22,7 @@ release-state can be: released | prerelease | unreleased ////////// is-current-version can be: true | false ////////// -:is-current-version: true +:is-current-version: false ////////// hide-xpack-tags defaults to "false" (they are shown unless set to "true")