This is an automated email from the ASF dual-hosted git repository.
tison pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/pulsar-site.git
The following commit(s) were added to refs/heads/main by this push:
new ee2bebc9cb3 Move pulsar manager release notes to the release-notes
endpoint and split release notes by categories (#330)
ee2bebc9cb3 is described below
commit ee2bebc9cb3a17e44ed3715a36d746f74549f01c
Author: tison <[email protected]>
AuthorDate: Wed Dec 14 14:05:20 2022 +0800
Move pulsar manager release notes to the release-notes endpoint and split
release notes by categories (#330)
Signed-off-by: tison <[email protected]>
---
site2/website-next/data/release-pulsar-adapters.js | 3 +
.../release-pulsar-manager.js} | 2 +-
site2/website-next/docusaurus.config.js | 8 ---
.../pulsar-manager/pulsar-adapters-release.json | 3 -
site2/website-next/release-notes/all.md | 81 ----------------------
site2/website-next/release-notes/client-cpp.mdx | 10 +++
site2/website-next/release-notes/client-cs.mdx | 10 +++
site2/website-next/release-notes/client-go.mdx | 10 +++
site2/website-next/release-notes/client-java.mdx | 10 +++
site2/website-next/release-notes/client-node.mdx | 10 +++
site2/website-next/release-notes/client-python.mdx | 10 +++
site2/website-next/release-notes/client-ws.mdx | 10 +++
site2/website-next/release-notes/clients.mdx | 9 +++
.../pulsar-manager.md} | 13 ++--
site2/website-next/release-notes/pulsar.mdx | 17 +++++
site2/website-next/scripts/sync-docs.sh | 3 -
site2/website-next/scripts/watch.js | 8 +--
site2/website-next/sidebarsReleaseNotes.js | 22 +++++-
site2/website-next/src/components/downloads.tsx | 4 +-
site2/website-next/static/.htaccess | 2 +
tools/pytools/lib/execute/site_syncer.py | 10 ---
21 files changed, 135 insertions(+), 120 deletions(-)
diff --git a/site2/website-next/data/release-pulsar-adapters.js
b/site2/website-next/data/release-pulsar-adapters.js
new file mode 100644
index 00000000000..e92cb8a740f
--- /dev/null
+++ b/site2/website-next/data/release-pulsar-adapters.js
@@ -0,0 +1,3 @@
+module.exports = [
+ "2.8.0"
+]
diff --git a/site2/website-next/pulsar-manager/pulsar-manager-release.json
b/site2/website-next/data/release-pulsar-manager.js
similarity index 64%
rename from site2/website-next/pulsar-manager/pulsar-manager-release.json
rename to site2/website-next/data/release-pulsar-manager.js
index 5360d73abcb..919b998c629 100644
--- a/site2/website-next/pulsar-manager/pulsar-manager-release.json
+++ b/site2/website-next/data/release-pulsar-manager.js
@@ -1,4 +1,4 @@
-[
+module.exports = [
"0.3.0",
"0.2.0",
"0.1.0"
diff --git a/site2/website-next/docusaurus.config.js
b/site2/website-next/docusaurus.config.js
index 46d550d8c80..bb8e2cbc7c3 100644
--- a/site2/website-next/docusaurus.config.js
+++ b/site2/website-next/docusaurus.config.js
@@ -446,14 +446,6 @@ module.exports = {
// showLastUpdateTime: true,
}),
],
- [
- "@docusaurus/plugin-content-docs",
- {
- id: "pulsar-manager-release-notes",
- path: "pulsar-manager",
- routeBasePath: "/",
- },
- ],
],
scripts: [
{
diff --git a/site2/website-next/pulsar-manager/pulsar-adapters-release.json
b/site2/website-next/pulsar-manager/pulsar-adapters-release.json
deleted file mode 100644
index 7bddc6a4ab8..00000000000
--- a/site2/website-next/pulsar-manager/pulsar-adapters-release.json
+++ /dev/null
@@ -1,3 +0,0 @@
-[
- "2.8.0"
-]
diff --git a/site2/website-next/release-notes/all.md
b/site2/website-next/release-notes/all.md
deleted file mode 100644
index 544b3493d42..00000000000
--- a/site2/website-next/release-notes/all.md
+++ /dev/null
@@ -1,81 +0,0 @@
----
-id: all
-title: All Releases
-sidebar_label: All Releases
-slug: /
----
-
-````mdx-code-block
-import PulsarReleaseTable from "../src/components/PulsarReleaseTable";
-import ClientReleaseTable from "../src/components/ClientReleaseTable";
-const pulsar = require(`../data/release-pulsar.js`);
-const java = require(`../data/release-java.js`);
-const python = require(`../data/release-python.js`);
-const cpp = require(`../data/release-cpp.js`);
-const ws = require(`../data/release-ws.js`);
-const golang = require(`../data/release-go.js`);
-const node = require(`../data/release-node.js`);
-const cs = require(`../data/release-cs.js`);
-````
-
-## Pulsar Release Notes
-
-````mdx-code-block
-<PulsarReleaseTable data={pulsar} />
-````
-
-### Previous versions
-
-All release notes of previous versions are available
[here](/release-notes/legacy).
-
-## Client Release Notes
-
-> **Tip**
->
-> - The code repos of **Java and WebSocket** clients are hosted in the [Pulsar
main repo](https://github.com/apache/pulsar). These clients are released with
Pulsar.
->
-> - The code repos of **[C++](https://github.com/apache/pulsar-client-cpp),
[Python](https://github.com/apache/pulsar-client-python),
[Go](https://github.com/apache/pulsar-client-go),
[Node.js](https://github.com/apache/pulsar-client-node), and
[C#](https://github.com/apache/pulsar-dotpulsar)** clients are hosted outside
of the Pulsar main repo. These clients are not released with Pulsar.
->
-> - All clients have [independent release notes](release-notes/versioned) and
they are automatically synced to this page.
-
-### Java
-
-````mdx-code-block
-<ClientReleaseTable data={java} />
-````
-
-### Python
-
-````mdx-code-block
-<ClientReleaseTable data={python} />
-````
-
-### C++
-
-````mdx-code-block
-<ClientReleaseTable data={cpp} />
-````
-
-### WebSocket
-
-````mdx-code-block
-<ClientReleaseTable data={ws} />
-````
-
-### Go
-
-````mdx-code-block
-<ClientReleaseTable data={golang} />
-````
-
-### NodeJs
-
-````mdx-code-block
-<ClientReleaseTable data={node} />
-````
-
-### C#
-
-````mdx-code-block
-<ClientReleaseTable data={cs} />
-````
diff --git a/site2/website-next/release-notes/client-cpp.mdx
b/site2/website-next/release-notes/client-cpp.mdx
new file mode 100644
index 00000000000..71e093d85d3
--- /dev/null
+++ b/site2/website-next/release-notes/client-cpp.mdx
@@ -0,0 +1,10 @@
+---
+id: client-cpp
+title: C++ Client Release Notes
+sidebar_label: C++ Client
+---
+
+import ClientReleaseTable from "../src/components/ClientReleaseTable";
+import data from "../data/release-cpp"
+
+<ClientReleaseTable data={data} />
diff --git a/site2/website-next/release-notes/client-cs.mdx
b/site2/website-next/release-notes/client-cs.mdx
new file mode 100644
index 00000000000..bcb105d16d7
--- /dev/null
+++ b/site2/website-next/release-notes/client-cs.mdx
@@ -0,0 +1,10 @@
+---
+id: client-cs
+title: C# Client Release Notes
+sidebar_label: C# Client
+---
+
+import ClientReleaseTable from "../src/components/ClientReleaseTable";
+import data from "../data/release-cs"
+
+<ClientReleaseTable data={data} />
diff --git a/site2/website-next/release-notes/client-go.mdx
b/site2/website-next/release-notes/client-go.mdx
new file mode 100644
index 00000000000..ba9fa2e6692
--- /dev/null
+++ b/site2/website-next/release-notes/client-go.mdx
@@ -0,0 +1,10 @@
+---
+id: client-go
+title: Go Client Release Notes
+sidebar_label: Go Client
+---
+
+import ClientReleaseTable from "../src/components/ClientReleaseTable";
+import data from "../data/release-go"
+
+<ClientReleaseTable data={data} />
diff --git a/site2/website-next/release-notes/client-java.mdx
b/site2/website-next/release-notes/client-java.mdx
new file mode 100644
index 00000000000..2570b4d6834
--- /dev/null
+++ b/site2/website-next/release-notes/client-java.mdx
@@ -0,0 +1,10 @@
+---
+id: client-java
+title: Java Client Release Notes
+sidebar_label: Java Client
+---
+
+import ClientReleaseTable from "../src/components/ClientReleaseTable";
+import data from "../data/release-java"
+
+<ClientReleaseTable data={data} />
diff --git a/site2/website-next/release-notes/client-node.mdx
b/site2/website-next/release-notes/client-node.mdx
new file mode 100644
index 00000000000..efd515bc161
--- /dev/null
+++ b/site2/website-next/release-notes/client-node.mdx
@@ -0,0 +1,10 @@
+---
+id: client-node
+title: Node.js Client Release Notes
+sidebar_label: Node.js Client
+---
+
+import ClientReleaseTable from "../src/components/ClientReleaseTable";
+import data from "../data/release-node"
+
+<ClientReleaseTable data={data} />
diff --git a/site2/website-next/release-notes/client-python.mdx
b/site2/website-next/release-notes/client-python.mdx
new file mode 100644
index 00000000000..30f65758af6
--- /dev/null
+++ b/site2/website-next/release-notes/client-python.mdx
@@ -0,0 +1,10 @@
+---
+id: client-python
+title: Python Client Release Notes
+sidebar_label: Python Client
+---
+
+import ClientReleaseTable from "../src/components/ClientReleaseTable";
+import data from "../data/release-python"
+
+<ClientReleaseTable data={data} />
diff --git a/site2/website-next/release-notes/client-ws.mdx
b/site2/website-next/release-notes/client-ws.mdx
new file mode 100644
index 00000000000..a9f051f0e43
--- /dev/null
+++ b/site2/website-next/release-notes/client-ws.mdx
@@ -0,0 +1,10 @@
+---
+id: client-ws
+title: WebSocket Client Release Notes
+sidebar_label: WebSocket Client
+---
+
+import ClientReleaseTable from "../src/components/ClientReleaseTable";
+import data from "../data/release-ws"
+
+<ClientReleaseTable data={data} />
diff --git a/site2/website-next/release-notes/clients.mdx
b/site2/website-next/release-notes/clients.mdx
new file mode 100644
index 00000000000..de55cc1adb1
--- /dev/null
+++ b/site2/website-next/release-notes/clients.mdx
@@ -0,0 +1,9 @@
+---
+id: clients
+title: Pulsar Clients Release Notes
+sidebar_label: Pulsar Clients Release Notes
+---
+
+The code repos of Java and WebSocket clients are hosted in the [Pulsar main
repo](https://github.com/apache/pulsar). These clients are released
simultaneously with Pulsar.
+
+The code repos of [C++](https://github.com/apache/pulsar-client-cpp),
[Python](https://github.com/apache/pulsar-client-python),
[Go](https://github.com/apache/pulsar-client-go),
[Node.js](https://github.com/apache/pulsar-client-node), and
[C#](https://github.com/apache/pulsar-dotpulsar) clients are hosted outside the
Pulsar main repo. These clients are released independently with Pulsar.
\ No newline at end of file
diff --git a/site2/website-next/pulsar-manager/pulsar-manager-release-notes.md
b/site2/website-next/release-notes/pulsar-manager.md
similarity index 93%
rename from site2/website-next/pulsar-manager/pulsar-manager-release-notes.md
rename to site2/website-next/release-notes/pulsar-manager.md
index b5db9842a9c..d37c95ee968 100644
--- a/site2/website-next/pulsar-manager/pulsar-manager-release-notes.md
+++ b/site2/website-next/release-notes/pulsar-manager.md
@@ -1,6 +1,11 @@
-## Apache Pulsar Manager
+---
+id: pulsar-manager
+title: Pulsar Manager Release Notes
+sidebar_label: Pulsar Manager Release Notes
+---
+
+## 0.3.0 — 2022-05-25 <a id="0.3.0"></a>
-### 0.3.0 — 2022-05-25 <a id="0.3.0"></a>
* Fix MySQL schema field token error
[PR-339](https://github.com/apache/pulsar-manager/pull/339)
* Fix the bugs in topics list page and search topics
[PR-342](https://github.com/apache/pulsar-manager/pull/342)
* Fix the issue of Swagger does not work
[PR-369](https://github.com/apache/pulsar-manager/pull/369)
@@ -14,7 +19,7 @@
* Add support for Casdoor
[PR-446](https://github.com/apache/pulsar-manager/pull/446)
* Fix unload namespace error
[PR-386](https://github.com/apache/pulsar-manager/pull/386)
-### 0.2.0 — 2020-09-28 <a id="0.2.0"></a>
+## 0.2.0 — 2020-09-28 <a id="0.2.0"></a>
* Support multiple addresses for the broker stats
[PR-306](https://github.com/apache/pulsar-manager/pull/306).
* Use `PulsarAdmin` instead of `HttpUti`l in `BrokerStatsServiceImpl`
[PR-315](https://github.com/apache/pulsar-manager/pull/315).
@@ -32,7 +37,7 @@
* Change the default port and replace the request URI
[PR-316](https://github.com/apache/pulsar-manager/pull/316).
-### 0.1.0 — 2019-11-25 <a id="0.1.0"></a>
+## 0.1.0 — 2019-11-25 <a id="0.1.0"></a>
* Remove streamnative from the project
[PR-213](https://github.com/apache/pulsar-manager/pull/213).
* Add license file for pulsar-manager
[PR-209](https://github.com/apache/pulsar-manager/pull/209).
diff --git a/site2/website-next/release-notes/pulsar.mdx
b/site2/website-next/release-notes/pulsar.mdx
new file mode 100644
index 00000000000..97c39e997b6
--- /dev/null
+++ b/site2/website-next/release-notes/pulsar.mdx
@@ -0,0 +1,17 @@
+---
+id: pulsar
+title: Pulsar Release Notes
+sidebar_label: Pulsar Release Notes
+slug: /
+---
+
+import PulsarReleaseTable from "../src/components/PulsarReleaseTable";
+import pulsar from "../data/release-pulsar"
+
+## Release notes
+
+<PulsarReleaseTable data={pulsar} />
+
+## Previous versions
+
+All release notes of previous versions are available [here](legacy).
diff --git a/site2/website-next/scripts/sync-docs.sh
b/site2/website-next/scripts/sync-docs.sh
index 38739b06dd4..445de24a464 100755
--- a/site2/website-next/scripts/sync-docs.sh
+++ b/site2/website-next/scripts/sync-docs.sh
@@ -15,9 +15,6 @@ cp -r $SRC_DIR/website/versioned_sidebars/*
$ROOT_DIR/site2/website-next/version
cp -r $SRC_DIR/website/sidebars.json $ROOT_DIR/site2/website-next/sidebars.json
cp -r $SRC_DIR/website/versions.json $ROOT_DIR/site2/website-next/versions.json
cp -r $SRC_DIR/website/releases.json $ROOT_DIR/site2/website-next/releases.json
-cp -r $SRC_DIR/website/pulsar-manager-release-notes.md
$ROOT_DIR/site2/website-next/pulsar-manager/pulsar-manager-release-notes.md
-cp -r $SRC_DIR/website/pulsar-manager-release.json
$ROOT_DIR/site2/website-next/pulsar-manager/pulsar-manager-release.json
-cp -r $SRC_DIR/website/pulsar-adapters-release.json
$ROOT_DIR/site2/website-next/pulsar-manager/pulsar-adapters-release.json
cp -r $SRC_DIR/website/static/api $ROOT_DIR/site2/website-next/static/
cd $ROOT_DIR/site2/website-next
diff --git a/site2/website-next/scripts/watch.js
b/site2/website-next/scripts/watch.js
index da6028c4241..027a6f3c8bc 100644
--- a/site2/website-next/scripts/watch.js
+++ b/site2/website-next/scripts/watch.js
@@ -17,13 +17,7 @@ const watcher = chokidar.watch([src + "/docs", src +
"/website"], {
function _watch(path) {
let dest = src + "/.preview/pulsar-site/site2/website-next";
- if (/pulsar-manager-release-notes\.md/.exec(path)) {
- dest += "/pulsar-manager/pulsar-manager-release-notes.md";
- } else if (/pulsar-manager-release\.json/.exec(path)) {
- dest += "/pulsar-manager/pulsar-manager-release.json";
- } else if (/pulsar-adapters-release\.json/.exec(path)) {
- dest = "/pulsar-manager/pulsar-adapters-release.json";
- } else if (/\/docs\/assets\/(.*)/.exec(path)) {
+ if (/\/docs\/assets\/(.*)/.exec(path)) {
const r = /\/docs\/assets\/(.*)/.exec(path);
dest += "/static/assets/" + r[1];
} else if (/(\/docs\/.*)/.exec(path)) {
diff --git a/site2/website-next/sidebarsReleaseNotes.js
b/site2/website-next/sidebarsReleaseNotes.js
index 5bf4ddf0312..8c455fbbab9 100644
--- a/site2/website-next/sidebarsReleaseNotes.js
+++ b/site2/website-next/sidebarsReleaseNotes.js
@@ -1,5 +1,25 @@
+/** @type {import('@docusaurus/plugin-content-docs').SidebarsConfig} */
module.exports = {
releaseNote: [
- 'all'
+ 'pulsar',
+ {
+ "type": "category",
+ "label": "Clients Release Notes",
+ link: {
+ type: 'doc',
+ id: 'clients',
+ },
+ items: [
+ 'client-java',
+ 'client-ws',
+ 'client-cpp',
+ 'client-python',
+ 'client-go',
+ 'client-node',
+ 'client-cs',
+ ],
+ collapsed: false,
+ },
+ 'pulsar-manager',
],
};
diff --git a/site2/website-next/src/components/downloads.tsx
b/site2/website-next/src/components/downloads.tsx
index bf8f11b3832..90dff0cedb5 100644
--- a/site2/website-next/src/components/downloads.tsx
+++ b/site2/website-next/src/components/downloads.tsx
@@ -3,8 +3,8 @@ import pulsarReleases from '@site/releases.json'
import pulsarLegacyVersions from '@site/legacy-versions.json'
import connectors from '@site/data/connectors'
import cppReleases from '@site/data/release-cpp'
-import pulsarManagerReleases from
'@site/pulsar-manager/pulsar-manager-release.json'
-import pulsarAdaptersReleases from
'@site/pulsar-manager/pulsar-adapters-release.json'
+import pulsarManagerReleases from '@site/data/release-pulsar-manager'
+import pulsarAdaptersReleases from '@site/data/release-pulsar-adapters'
import ReleaseTable from "@site/src/components/ReleaseTable";
import ConnectorTable from "@site/src/components/ConnectorTable";
import useDocusaurusContext from "@docusaurus/useDocusaurusContext";
diff --git a/site2/website-next/static/.htaccess
b/site2/website-next/static/.htaccess
index 4e4168aaf24..74d86964b2e 100755
--- a/site2/website-next/static/.htaccess
+++ b/site2/website-next/static/.htaccess
@@ -7,6 +7,8 @@ RewriteRule "^(zh-CN|zh-TW|ja|ko|fr)/docs/(.+)$" "/docs/$2"
[R=301,DPI,L]
RewriteRule "^docs$" "/docs/" [R=301,DPI,L]
RewriteRule "^docs/(.+)-incubating/(.+)$"
"https://pulsar.staged.apache.org/docs/$1-incubating/$2"; [R=301,DPI,L]
+RewriteRule "^pulsar-manager-release-notes(/)?$" "/release-notes" [R=301,DPI,L]
+
# skip if file exists
RewriteCond %{REQUEST_FILENAME}\/index\.html -f
RewriteRule ^ - [L]
diff --git a/tools/pytools/lib/execute/site_syncer.py
b/tools/pytools/lib/execute/site_syncer.py
index 1d42eedaac4..3dd5837d454 100644
--- a/tools/pytools/lib/execute/site_syncer.py
+++ b/tools/pytools/lib/execute/site_syncer.py
@@ -36,13 +36,3 @@ def execute(master: Path):
shutil.copy2(main / 'sidebars.json', site / 'sidebars.json')
shutil.copy2(main / 'versions.json', site / 'versions.json')
shutil.copy2(main / 'releases.json', site / 'releases.json')
-
- shutil.copy2(
- main / 'pulsar-manager-release-notes.md',
- site / 'pulsar-manager' / 'pulsar-manager-release-notes.md')
- shutil.copy2(
- main / 'pulsar-manager-release.json',
- site / 'pulsar-manager' / 'pulsar-manager-release.json')
- shutil.copy2(
- main / 'pulsar-adapters-release.json',
- site / 'pulsar-manager' / 'pulsar-adapters-release.json')
