This is an automated email from the ASF dual-hosted git repository.
robbie pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-website.git
The following commit(s) were added to refs/heads/main by this push:
new 36c5678f7 update handling of adding artemis-console releases
36c5678f7 is described below
commit 36c5678f7c1b30b4651f649c1ea6154aca64ae08
Author: Robbie Gemmell <[email protected]>
AuthorDate: Mon Oct 14 15:34:29 2024 +0100
update handling of adding artemis-console releases
- Use collection-based generated release updates like other components
- Create local release notes page rather than linking to Jira
- Add scripts to simplify doing above things further
---
_config.yml | 2 +
scripts/release/add-artemis-console-release.sh | 58 ++++++++++++++++++++++
...se-file => create-artemis-console-release-file} | 13 ++---
...e-file => create-artemis-console-release-notes} | 31 +++++-------
scripts/release/create-artemis-release-file | 4 +-
.../artemis-console-01-00-00.md | 6 +++
src/_data/current_releases.yml | 2 +
src/_includes/artemis_console_release.md | 14 ++++++
src/_includes/news.md | 8 ++-
src/components/artemis-console/download/index.md | 32 ++++++------
.../artemis-console/download/past_releases.md | 37 ++++++++++++++
.../download/release-notes-1.0.0.md | 11 ++++
src/news/index.md | 4 +-
13 files changed, 176 insertions(+), 46 deletions(-)
diff --git a/_config.yml b/_config.yml
index 500520abf..9bf625af4 100644
--- a/_config.yml
+++ b/_config.yml
@@ -14,6 +14,8 @@ sass:
collections:
artemis_releases:
permalink: /components/artemis/download/:name
+ artemis_console_releases:
+ permalink: /components/artemis-console/download/:name
classic_releases:
output: true
permalink: /components/classic/download/:name
diff --git a/scripts/release/add-artemis-console-release.sh
b/scripts/release/add-artemis-console-release.sh
new file mode 100755
index 000000000..beaaa900b
--- /dev/null
+++ b/scripts/release/add-artemis-console-release.sh
@@ -0,0 +1,58 @@
+#!/bin/bash
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# Setting the script to fail if anything goes wrong
+set -e -u -o pipefail
+shopt -s failglob
+
+error () {
+ echo ""
+ echo "** ERROR: $@ **"
+ echo ""
+ echo "Usage: ./scripts/release/add-artemis-console-release.sh
<new-release-version>"
+ echo ""
+ echo "Must be run from within an activemq-website checkout root."
+ echo ""
+ echo "Example:"
+ echo "cd <path.to>/activemq-website"
+ echo "./scripts/release/add-artemis-console-release.sh 1.0.0"
+ echo ""
+ exit 64
+}
+
+if [ ! -f serve.sh ] || [ ! -f _config.yml ]; then
+ error "This script has to be run from inside the root of an
activemq-website checkout"
+ exit 1
+fi
+WEBSITE_DIR="$( pwd )"
+
+if [ "$#" -lt 1 ]; then
+ error "The new Artemis Console release version must be specified"
+ exit 1
+fi
+
+NEW_VERSION="$1"
+
+./scripts/release/create-artemis-console-release-file $NEW_VERSION
+
+./scripts/release/create-artemis-console-release-notes $NEW_VERSION
+
+echo ""
+echo "Files created for adding release. See output above for details."
+echo "Update the artemis_console list within the
src/_data/current_releases.yml file if needed."
+echo "Check over git status, add remaining files, commit and push."
diff --git a/scripts/release/create-artemis-release-file
b/scripts/release/create-artemis-console-release-file
similarity index 78%
copy from scripts/release/create-artemis-release-file
copy to scripts/release/create-artemis-console-release-file
index 84b846ad4..5ae7fc9ba 100755
--- a/scripts/release/create-artemis-release-file
+++ b/scripts/release/create-artemis-console-release-file
@@ -26,22 +26,19 @@ template = \
---
version: {version}
release_date: {date_string}
-title: ActiveMQ Artemis {version}
+title: ActiveMQ Artemis Console {version}
shortDescription: Bug fix release.
-# Docs subdir name for past-releases and previous-docs pages, 'latest' is
always used on the main download page.
-docs_version: {version}
-java_version: 11+
---
"""
-def create_release_notes(version):
+def create_release_file(version):
padded_components = [component.zfill(2) for component in
version.split(".")]
if len(padded_components) < 3:
exit("Version ({}) must have 3 components to pad, but only have:
{}".format(version, str(padded_components)))
padded_version = "-".join(padded_components)
- output_path = "src/_artemis_releases/artemis-{}.md".format(padded_version)
+ output_path =
"src/_artemis_console_releases/artemis-console-{}.md".format(padded_version)
date_string = get_date_string()
@@ -55,9 +52,9 @@ def create_release_notes(version):
ARGS = _sys.argv
if len(ARGS) < 2:
- exit("Usage: ./scripts/release/create-artemis-release-file <version>")
+ exit("Usage: ./scripts/release/create-artemis-console-release-file
<version>")
version = ARGS[1]
-release_file = create_release_notes(version)
+release_file = create_release_file(version)
print("Release file generated at {}".format(release_file))
diff --git a/scripts/release/create-artemis-release-file
b/scripts/release/create-artemis-console-release-notes
similarity index 56%
copy from scripts/release/create-artemis-release-file
copy to scripts/release/create-artemis-console-release-notes
index 84b846ad4..b284f1ab8 100755
--- a/scripts/release/create-artemis-release-file
+++ b/scripts/release/create-artemis-console-release-notes
@@ -24,26 +24,21 @@ from util import *
template = \
"""
---
-version: {version}
-release_date: {date_string}
-title: ActiveMQ Artemis {version}
-shortDescription: Bug fix release.
-# Docs subdir name for past-releases and previous-docs pages, 'latest' is
always used on the main download page.
-docs_version: {version}
-java_version: 11+
+layout: default_md
+title: ActiveMQ Artemis Console {version} Release Notes
+title-class: page-title-artemis
+type: artemis
---
-"""
-def create_release_notes(version):
- padded_components = [component.zfill(2) for component in
version.split(".")]
+{release_notes}
- if len(padded_components) < 3:
- exit("Version ({}) must have 3 components to pad, but only have:
{}".format(version, str(padded_components)))
+"""
- padded_version = "-".join(padded_components)
- output_path = "src/_artemis_releases/artemis-{}.md".format(padded_version)
+def create_release_notes(version):
+ output_path =
"src/components/artemis-console/download/release-notes-{}.md".format(version)
- date_string = get_date_string()
+ jira_version = "console-{}".format(version)
+ release_notes = render_release_notes("artemis", jira_version)
output = template.format(**locals())
output = output.strip()
@@ -55,9 +50,9 @@ def create_release_notes(version):
ARGS = _sys.argv
if len(ARGS) < 2:
- exit("Usage: ./scripts/release/create-artemis-release-file <version>")
+ exit("Usage: ./scripts/release/create-artemis-console-release-notes
<version>")
version = ARGS[1]
-release_file = create_release_notes(version)
+rn_file = create_release_notes(version)
-print("Release file generated at {}".format(release_file))
+print("Release notes generated to {}".format(rn_file))
diff --git a/scripts/release/create-artemis-release-file
b/scripts/release/create-artemis-release-file
index 84b846ad4..cf3784b5e 100755
--- a/scripts/release/create-artemis-release-file
+++ b/scripts/release/create-artemis-release-file
@@ -34,7 +34,7 @@ java_version: 11+
---
"""
-def create_release_notes(version):
+def create_release_file(version):
padded_components = [component.zfill(2) for component in
version.split(".")]
if len(padded_components) < 3:
@@ -58,6 +58,6 @@ if len(ARGS) < 2:
exit("Usage: ./scripts/release/create-artemis-release-file <version>")
version = ARGS[1]
-release_file = create_release_notes(version)
+release_file = create_release_file(version)
print("Release file generated at {}".format(release_file))
diff --git a/src/_artemis_console_releases/artemis-console-01-00-00.md
b/src/_artemis_console_releases/artemis-console-01-00-00.md
new file mode 100644
index 000000000..d1344fca6
--- /dev/null
+++ b/src/_artemis_console_releases/artemis-console-01-00-00.md
@@ -0,0 +1,6 @@
+---
+version: 1.0.0
+release_date: 2024-10-08
+title: ActiveMQ Artemis Console 1.0.0
+shortDescription: Next generation Artemis Console using Hawtio 4 with React +
Patternfly.
+---
diff --git a/src/_data/current_releases.yml b/src/_data/current_releases.yml
index 90cd2be76..bf2bb5f4a 100644
--- a/src/_data/current_releases.yml
+++ b/src/_data/current_releases.yml
@@ -1,6 +1,8 @@
# Current release streams "x.y.[z]" prefixes
artemis:
- "2.37."
+artemis_console:
+ - "1.0."
classic:
- "6.1."
- "5.18."
diff --git a/src/_includes/artemis_console_release.md
b/src/_includes/artemis_console_release.md
new file mode 100644
index 000000000..3da9bda56
--- /dev/null
+++ b/src/_includes/artemis_console_release.md
@@ -0,0 +1,14 @@
+#### ActiveMQ Artemis Console {{include.release.version}}
({{include.release.release_date | date_to_string: "ordinal", "US"}})
+[Release Notes](release-notes-{{include.release.version}}) |
[Documentation](../documentation/)
+
+{% if include.is_current_release %}
+tar.gz |
[apache-artemis-console-{{include.release.version}}-bin.tar.gz](https://www.apache.org/dyn/closer.cgi?filename=activemq/activemq-artemis-console/{{include.release.version}}/apache-artemis-console-{{include.release.version}}-bin.tar.gz&action=download)
|
[SHA512](https://downloads.apache.org/activemq/activemq-artemis-console/{{include.release.version}}/apache-artemis-console-{{include.release.version}}-bin.tar.gz.sha512)
| [GPG Signature](https://downloads.apache.org/activemq/act [...]
+ZIP |
[apache-artemis-console-{{include.release.version}}-bin.zip](https://www.apache.org/dyn/closer.cgi?filename=activemq/activemq-artemis-console/{{include.release.version}}/apache-artemis-console-{{include.release.version}}-bin.zip&action=download)
|
[SHA512](https://downloads.apache.org/activemq/activemq-artemis-console/{{include.release.version}}/apache-artemis-console-{{include.release.version}}-bin.zip.sha512)
| [GPG Signature](https://downloads.apache.org/activemq/activemq-artemi [...]
+Source tar.gz |
[apache-artemis-console-{{include.release.version}}-source-release.tar.gz](https://www.apache.org/dyn/closer.cgi?filename=activemq/activemq-artemis-console/{{include.release.version}}/apache-artemis-console-{{include.release.version}}-source-release.tar.gz&action=download)
|
[SHA512](https://downloads.apache.org/activemq/activemq-artemis-console/{{include.release.version}}/apache-artemis-console-{{include.release.version}}-source-release.tar.gz.sha512)
| [GPG Signature](h [...]
+Source ZIP |
[apache-artemis-console-{{include.release.version}}-source-release.zip](https://www.apache.org/dyn/closer.cgi?filename=activemq/activemq-artemis-console/{{include.release.version}}/apache-artemis-console-{{include.release.version}}-source-release.zip&action=download)
|
[SHA512](https://downloads.apache.org/activemq/activemq-artemis-console/{{include.release.version}}/apache-artemis-console-{{include.release.version}}-source-release.zip.sha512)
| [GPG Signature](https://downl [...]
+{% else %}
+tar.gz |
[apache-artemis-console-{{include.release.version}}-bin.tar.gz](https://archive.apache.org/dist/activemq/activemq-artemis-console/{{include.release.version}}/apache-artemis-console-{{include.release.version}}-bin.tar.gz)
|
[SHA512](https://archive.apache.org/dist/activemq/activemq-artemis-console/{{include.release.version}}/apache-artemis-console-{{include.release.version}}-bin.tar.gz.sha512)
| [GPG
Signature](https://archive.apache.org/dist/activemq/activemq-artemis-console/{{i
[...]
+ZIP |
[apache-artemis-console-{{include.release.version}}-bin.zip](https://archive.apache.org/dist/activemq/activemq-artemis-console/{{include.release.version}}/apache-artemis-console-{{include.release.version}}-bin.zip)
|
[SHA512](https://archive.apache.org/dist/activemq/activemq-artemis-console/{{include.release.version}}/apache-artemis-console-{{include.release.version}}-bin.zip.sha512)
| [GPG
Signature](https://archive.apache.org/dist/activemq/activemq-artemis-console/{{include.relea
[...]
+Source tar.gz |
[apache-artemis-console-{{include.release.version}}-source-release.tar.gz](https://archive.apache.org/dist/activemq/activemq-artemis-console/{{include.release.version}}/apache-artemis-console-{{include.release.version}}-source-release.tar.gz)
|
[SHA512](https://archive.apache.org/dist/activemq/activemq-artemis-console/{{include.release.version}}/apache-artemis-console-{{include.release.version}}-source-release.tar.gz.sha512)
| [GPG Signature](https://archive.apache.org/di [...]
+Source ZIP |
[apache-artemis-console-{{include.release.version}}-source-release.zip](https://archive.apache.org/dist/activemq/activemq-artemis-console/{{include.release.version}}/apache-artemis-console-{{include.release.version}}-source-release.zip)
|
[SHA512](https://archive.apache.org/dist/activemq/activemq-artemis-console/{{include.release.version}}/apache-artemis-console-{{include.release.version}}-source-release.zip.sha512)
| [GPG Signature](https://archive.apache.org/dist/activemq/ [...]
+{% endif %}
diff --git a/src/_includes/news.md b/src/_includes/news.md
index ea37eb7b3..0edbdf81e 100644
--- a/src/_includes/news.md
+++ b/src/_includes/news.md
@@ -5,7 +5,9 @@
{% for release in releases %} {% if i > 2 %} {% break %} {% endif %}
<div class="card card-grey-small">
<div class="card-body ml-0 p-2">
-{% if release.collection contains "artemis" %}
+{% if release.collection contains "artemis_console" %}
+ <h6 class="card-title"><a class="text-blue"
href="{{site.baseurl}}/components/artemis-console/download/">{{release.title}}</a></h6>
+{% elsif release.collection contains "artemis" %}
<h6 class="card-title"><a class="text-blue"
href="{{site.baseurl}}/components/artemis/download/">{{release.title}}</a></h6>
{% elsif release.collection contains "nms_api" %}
<h6 class="card-title"><a class="text-blue"
href="{{site.baseurl}}/components/nms/nms-api-downloads">{{release.title}}</a></h6>
@@ -15,7 +17,9 @@
<h6 class="card-title"><a class="text-blue"
href="{{release.url}}">{{release.title}}</a></h6>
{% endif %}
-{% if release.collection contains "artemis" %}
+{% if release.collection contains "artemis_console" %}
+ {{release.shortDescription }}<a style="display: unset;" class="nav-link
pl-0 ml-0"
href="{{site.baseurl}}/components/artemis-console/download/">...more</a>
+{% elsif release.collection contains "artemis" %}
{{release.shortDescription }}<a style="display: unset;" class="nav-link
pl-0 ml-0" href="{{site.baseurl}}/components/artemis/download/">...more</a>
{% elsif release.collection contains "nms_api" %}
{{release.shortDescription }}<a style="display: unset;" class="nav-link
pl-0 ml-0" href="{{site.baseurl}}/components/nms/nms-api-downloads">...more</a>
diff --git a/src/components/artemis-console/download/index.md
b/src/components/artemis-console/download/index.md
index 0d2d8f92d..5cda618b7 100644
--- a/src/components/artemis-console/download/index.md
+++ b/src/components/artemis-console/download/index.md
@@ -4,21 +4,23 @@ title: Download ActiveMQ Artemis Console
title-class: page-title-artemis
type: artemis
---
-
-This is the current ActiveMQ Artemis Console release.
-
-## ActiveMQ Artemis Console 1.0.0 (8th October 2024)
-
-[Release
Notes](https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12315920&version=12354639)
\| [Documentation](../documentation)
-
-
-|----------------------|--------------------------------------------------------|------------|-------------------|
-| tar.gz |
[apache-artemis-console-1.0.0-bin.tar.gz](https://www.apache.org/dyn/closer.cgi?filename=activemq/activemq-artemis-console/1.0.0/apache-artemis-console-1.0.0-bin.tar.gz&action=download)
|
[SHA512](https://downloads.apache.org/activemq/activemq-artemis-console/1.0.0/apache-artemis-console-1.0.0-bin.tar.gz.sha512)
| [GPG
Signature](https://downloads.apache.org/activemq/activemq-artemis-console/1.0.0/apache-artemis-console-1.0.0-bin.tar.gz.asc)
|
-| ZIP |
[apache-artemis-console-1.0.0-bin.zip](https://www.apache.org/dyn/closer.cgi?filename=activemq/activemq-artemis-console/1.0.0/apache-artemis-console-1.0.0-bin.zip&action=download)
|
[SHA512](https://downloads.apache.org/activemq/activemq-artemis-console/1.0.0/apache-artemis-console-1.0.0-bin.zip.sha512)
| [GPG
Signature](https://downloads.apache.org/activemq/activemq-artemis-console/1.0.0/apache-artemis-console-1.0.0-bin.zip.asc)
|
-| Source tar.gz |
[apache-artemis-console-1.0.0-source-release.tar.gz](https://www.apache.org/dyn/closer.cgi?filename=activemq/activemq-artemis-console/1.0.0/apache-artemis-console-1.0.0-source-release.tar.gz&action=download)
|
[SHA512](https://downloads.apache.org/activemq/activemq-artemis-console/1.0.0/apache-artemis-console-1.0.0-source-release.tar.gz.sha512)
| [GPG
Signature](https://downloads.apache.org/activemq/activemq-artemis-console/1.0.0/apache-artemis-console-1.0.0-source-rel
[...]
-| Source ZIP |
[apache-artemis-console-1.0.0-source-release.zip](https://www.apache.org/dyn/closer.cgi?filename=activemq/activemq-artemis-console/1.0.0/apache-artemis-console-1.0.0-source-release.zip&action=download)
|
[SHA512](https://downloads.apache.org/activemq/activemq-artemis-console/1.0.0/apache-artemis-console-1.0.0-source-release.zip.sha512)
| [GPG
Signature](https://downloads.apache.org/activemq/activemq-artemis-console/1.0.0/apache-artemis-console-1.0.0-source-release.zip.asc)
|
-
-
+{% assign reversed_releases = site["artemis_console_releases"] | reverse %}
+{% if reversed_releases.size > 1 %}
+This is the current ActiveMQ Artemis Console release. For prior releases,
please see the <a href="past_releases">past releases</a> page.
+
+{% endif %}
+It is important to [verify the integrity](#verify-the-integrity-of-downloads)
of the files you download.
+
+{% for current_release_prefix in site.data.current_releases["artemis_console"]
%}
+ {% for release in reversed_releases %}
+ {% if release.version contains current_release_prefix %}
+{% include artemis_console_release.md release=release is_current_release=true
%}
+ {% break %}
+ {% endif %}
+ {% endfor %}
+{% endfor %}
+
+--------------------------------------
#### Verify the Integrity of Downloads
{% include verify_download.md %}
\ No newline at end of file
diff --git a/src/components/artemis-console/download/past_releases.md
b/src/components/artemis-console/download/past_releases.md
new file mode 100644
index 000000000..9bde11836
--- /dev/null
+++ b/src/components/artemis-console/download/past_releases.md
@@ -0,0 +1,37 @@
+---
+layout: default_md
+title: ActiveMQ Artemis Console Past Releases
+title-class: page-title-artemis
+type: artemis
+---
+
+<div class="alert alert-warning">
+ These are older releases. To get the current release, please see the <a
href="{{site.baseurl}}/components/artemis-console/download"
class="alert-link">download page</a>.
+</div>
+
+It is important to [verify the
integrity]({{site.baseurl}}/components/artemis-console/download#verify-the-integrity-of-downloads)
of the files you download.
+
+{% assign reversed_releases = site["artemis_console_releases"] | reverse %}
+{% assign current_releases = "" | split: ',' %}
+{% assign no_past_releases = true %}
+
+{% for current_release_prefix in site.data.current_releases["artemis_console"]
%}
+ {% for release in reversed_releases %}
+ {% if release.version contains current_release_prefix %}
+ {% assign current_releases = current_releases | push:
release.version %}
+ {% break %}
+ {% endif %}
+ {% endfor %}
+{% endfor %}
+
+{% for release in reversed_releases %}
+ {% unless current_releases contains release.version %}
+{% assign no_past_releases = false %}
+{% include artemis_console_release.md release=release is_current_release=false
%}
+<br/>
+ {% endunless %}
+{% endfor %}
+
+{% if no_past_releases == true %}
+At present there are no non-current releases. Please find the current release
on the <a href="{{site.baseurl}}/components/artemis-console/download">download
page</a>
+{% endif %}
diff --git a/src/components/artemis-console/download/release-notes-1.0.0.md
b/src/components/artemis-console/download/release-notes-1.0.0.md
new file mode 100644
index 000000000..49592b94e
--- /dev/null
+++ b/src/components/artemis-console/download/release-notes-1.0.0.md
@@ -0,0 +1,11 @@
+---
+layout: default_md
+title: ActiveMQ Artemis Console 1.0.0 Release Notes
+title-class: page-title-artemis
+type: artemis
+---
+
+
+## Improvements
+
+* [ARTEMIS-4680](https://issues.apache.org/jira/browse/ARTEMIS-4680) - Upgrade
the console to use HawtIO 4
\ No newline at end of file
diff --git a/src/news/index.md b/src/news/index.md
index d579bde7a..5a145d4f9 100644
--- a/src/news/index.md
+++ b/src/news/index.md
@@ -18,7 +18,9 @@ type: main
{{document.shortDescription}}
-{% if document.collection contains "artemis" %}
+{% if document.collection contains "artemis_console" %}
+[Read More]({{site.baseurl}}/components/artemis-console/download/)
+{% elsif document.collection contains "artemis" %}
[Read More]({{site.baseurl}}/components/artemis/download/)
{% elsif document.collection contains "nms_api" %}
[Read More]({{site.baseurl}}/components/nms/nms-api-downloads)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information, visit: https://activemq.apache.org/contact
