This is an automated email from the ASF dual-hosted git repository. kgyrtkirk pushed a commit to branch 36.0.0 in repository https://gitbox.apache.org/repos/asf/druid.git
commit 3b3859cf7b73cc8ee11f25cddad22278512b2bf6 Author: Zoltan Haindrich <[email protected]> AuthorDate: Fri Jan 9 16:34:15 2026 +0000 preapre branch for 36.0.0 release --- dev/update-version-master | 4 ++-- distribution/docker/docker-compose.yml | 10 +++++----- .../header-bar/__snapshots__/header-bar.spec.tsx.snap | 2 +- .../__snapshots__/restricted-mode.spec.tsx.snap | 4 ++-- .../__snapshots__/compaction-config-dialog.spec.tsx.snap | 8 ++++---- .../__snapshots__/retention-dialog.spec.tsx.snap | 2 +- web-console/src/links.ts | 2 +- .../__snapshots__/execution-error-pane.spec.tsx.snap | 2 +- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dev/update-version-master b/dev/update-version-master index 2c88bbb440c..ad89b00c993 100755 --- a/dev/update-version-master +++ b/dev/update-version-master @@ -19,13 +19,13 @@ # Updates the versions for the master branch # https://github.com/apache/druid/blob/master/distribution/asf-release-process-guide.md -[ "$#" -lt 1 ] && echo "usage: $0 <new_version>" && exit 1 +[ "$#" -lt 1 ] && echo -e "usage: $0 <new_version> [<docs_version>]\n note: omit docs_version during master update" && exit 1 set -e set -x VERSION=$1 -DOCS_VERSION=latest +DOCS_VERSION=${2:-latest} sed -i -r "s|public/web-console-[^<]+.js|public/web-console-${VERSION}.js|" web-console/unified-console.html sed -i -r "s|DRUID_DOCS_VERSION = '[^']+'|DRUID_DOCS_VERSION = '${DOCS_VERSION}'|" web-console/src/links.ts diff --git a/distribution/docker/docker-compose.yml b/distribution/docker/docker-compose.yml index 8fab34ad2d2..4f5ab4edc91 100644 --- a/distribution/docker/docker-compose.yml +++ b/distribution/docker/docker-compose.yml @@ -51,7 +51,7 @@ services: - ZOO_MY_ID=1 coordinator: - image: apache/druid:34.0.0 + image: apache/druid:36.0.0 container_name: coordinator volumes: - druid_shared:/opt/shared @@ -67,7 +67,7 @@ services: - environment broker: - image: apache/druid:34.0.0 + image: apache/druid:36.0.0 container_name: broker volumes: - broker_var:/opt/druid/var @@ -83,7 +83,7 @@ services: - environment historical: - image: apache/druid:34.0.0 + image: apache/druid:36.0.0 container_name: historical volumes: - druid_shared:/opt/shared @@ -100,7 +100,7 @@ services: - environment middlemanager: - image: apache/druid:34.0.0 + image: apache/druid:36.0.0 container_name: middlemanager volumes: - druid_shared:/opt/shared @@ -118,7 +118,7 @@ services: - environment router: - image: apache/druid:34.0.0 + image: apache/druid:36.0.0 container_name: router volumes: - router_var:/opt/druid/var diff --git a/web-console/src/components/header-bar/__snapshots__/header-bar.spec.tsx.snap b/web-console/src/components/header-bar/__snapshots__/header-bar.spec.tsx.snap index 3d6e080fdcb..f06fc90d0e1 100644 --- a/web-console/src/components/header-bar/__snapshots__/header-bar.spec.tsx.snap +++ b/web-console/src/components/header-bar/__snapshots__/header-bar.spec.tsx.snap @@ -376,7 +376,7 @@ exports[`HeaderBar matches snapshot 1`] = ` <Blueprint5.MenuItem active={false} disabled={false} - href="https://druid.apache.org/docs/latest"; + href="https://druid.apache.org/docs/36.0.0"; icon="th" multiline={false} popoverProps={{}} diff --git a/web-console/src/components/header-bar/restricted-mode/__snapshots__/restricted-mode.spec.tsx.snap b/web-console/src/components/header-bar/restricted-mode/__snapshots__/restricted-mode.spec.tsx.snap index 00521ae8d6e..43ef0c93ce1 100644 --- a/web-console/src/components/header-bar/restricted-mode/__snapshots__/restricted-mode.spec.tsx.snap +++ b/web-console/src/components/header-bar/restricted-mode/__snapshots__/restricted-mode.spec.tsx.snap @@ -17,7 +17,7 @@ exports[`RestrictedMode matches snapshot when in auto capability detection mode For more info refer to the <Memo(ExternalLink) - href="https://druid.apache.org/docs/latest/operations/web-console"; + href="https://druid.apache.org/docs/36.0.0/operations/web-console"; > web console documentation </Memo(ExternalLink)> @@ -88,7 +88,7 @@ exports[`RestrictedMode matches snapshot when in manual capability detection mod For more info refer to the <Memo(ExternalLink) - href="https://druid.apache.org/docs/latest/operations/web-console"; + href="https://druid.apache.org/docs/36.0.0/operations/web-console"; > web console documentation </Memo(ExternalLink)> diff --git a/web-console/src/dialogs/compaction-config-dialog/__snapshots__/compaction-config-dialog.spec.tsx.snap b/web-console/src/dialogs/compaction-config-dialog/__snapshots__/compaction-config-dialog.spec.tsx.snap index b9b48cf6e58..7fbf0fb815b 100644 --- a/web-console/src/dialogs/compaction-config-dialog/__snapshots__/compaction-config-dialog.spec.tsx.snap +++ b/web-console/src/dialogs/compaction-config-dialog/__snapshots__/compaction-config-dialog.spec.tsx.snap @@ -360,7 +360,7 @@ exports[`CompactionConfigDialog matches snapshot with compactionConfig (dynamic For more information refer to the <Memo(ExternalLink) - href="https://druid.apache.org/docs/latest/ingestion/concurrent-append-replace"; + href="https://druid.apache.org/docs/36.0.0/ingestion/concurrent-append-replace"; > documentation </Memo(ExternalLink)> @@ -770,7 +770,7 @@ exports[`CompactionConfigDialog matches snapshot with compactionConfig (hashed p For more information refer to the <Memo(ExternalLink) - href="https://druid.apache.org/docs/latest/ingestion/concurrent-append-replace"; + href="https://druid.apache.org/docs/36.0.0/ingestion/concurrent-append-replace"; > documentation </Memo(ExternalLink)> @@ -1180,7 +1180,7 @@ exports[`CompactionConfigDialog matches snapshot with compactionConfig (range pa For more information refer to the <Memo(ExternalLink) - href="https://druid.apache.org/docs/latest/ingestion/concurrent-append-replace"; + href="https://druid.apache.org/docs/36.0.0/ingestion/concurrent-append-replace"; > documentation </Memo(ExternalLink)> @@ -1590,7 +1590,7 @@ exports[`CompactionConfigDialog matches snapshot without compactionConfig 1`] = For more information refer to the <Memo(ExternalLink) - href="https://druid.apache.org/docs/latest/ingestion/concurrent-append-replace"; + href="https://druid.apache.org/docs/36.0.0/ingestion/concurrent-append-replace"; > documentation </Memo(ExternalLink)> diff --git a/web-console/src/dialogs/retention-dialog/__snapshots__/retention-dialog.spec.tsx.snap b/web-console/src/dialogs/retention-dialog/__snapshots__/retention-dialog.spec.tsx.snap index 24b08fedea1..f748cc6925f 100644 --- a/web-console/src/dialogs/retention-dialog/__snapshots__/retention-dialog.spec.tsx.snap +++ b/web-console/src/dialogs/retention-dialog/__snapshots__/retention-dialog.spec.tsx.snap @@ -67,7 +67,7 @@ exports[`RetentionDialog matches snapshot 1`] = ` Druid uses rules to determine what data should be retained in the cluster. The rules are evaluated in order from top to bottom. For more information please refer to the <a - href="https://druid.apache.org/docs/latest/operations/rule-configuration"; + href="https://druid.apache.org/docs/36.0.0/operations/rule-configuration"; rel="noopener noreferrer" target="_blank" > diff --git a/web-console/src/links.ts b/web-console/src/links.ts index 552ca5e8122..13214705eab 100644 --- a/web-console/src/links.ts +++ b/web-console/src/links.ts @@ -17,7 +17,7 @@ */ // This is set to the latest available version and should be updated to the next version before release -const DRUID_DOCS_VERSION = 'latest'; +const DRUID_DOCS_VERSION = '36.0.0'; function fillVersion(str: string): string { return str.replace(/\{\{VERSION}}/g, DRUID_DOCS_VERSION); diff --git a/web-console/src/views/workbench-view/execution-error-pane/__snapshots__/execution-error-pane.spec.tsx.snap b/web-console/src/views/workbench-view/execution-error-pane/__snapshots__/execution-error-pane.spec.tsx.snap index 8895d9819f9..8502413d89f 100644 --- a/web-console/src/views/workbench-view/execution-error-pane/__snapshots__/execution-error-pane.spec.tsx.snap +++ b/web-console/src/views/workbench-view/execution-error-pane/__snapshots__/execution-error-pane.spec.tsx.snap @@ -10,7 +10,7 @@ exports[`ExecutionErrorPane matches snapshot 1`] = ` > <React.Fragment> <Memo(ExternalLink) - href="https://druid.apache.org/docs/latest/multi-stage-query/reference#error_TooManyWarnings"; + href="https://druid.apache.org/docs/36.0.0/multi-stage-query/reference#error_TooManyWarnings"; > TooManyWarnings </Memo(ExternalLink)> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
