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 7efdf19 fix logic issue introduced with artemis release include file
and copied over to nms-amqp include file
7efdf19 is described below
commit 7efdf197562cc84ce8f1e6c67b3770100a87f58b
Author: Robbie Gemmell <[email protected]>
AuthorDate: Tue Sep 14 15:00:58 2021 +0100
fix logic issue introduced with artemis release include file and copied
over to nms-amqp include file
causes some past-release links to be wrongly set as current-release links
if in the same version stream
simplify and just have the including file indicate if the release is
current, since it has already correctly worked that itself before the include
also fix issue with some archive release links spotted once that was
corrected
---
src/_includes/artemis_release.md | 9 +--------
src/_includes/nms_amqp_download_links.md | 15 ++++-----------
src/_layouts/nms_amqp_release.md | 2 +-
src/components/artemis/download/index.md | 2 +-
src/components/artemis/download/past_releases.md | 2 +-
src/components/nms/providers/amqp/downloads/index.md | 2 +-
.../nms/providers/amqp/downloads/past_releases.md | 2 +-
7 files changed, 10 insertions(+), 24 deletions(-)
diff --git a/src/_includes/artemis_release.md b/src/_includes/artemis_release.md
index c30d249..44a4f2f 100644
--- a/src/_includes/artemis_release.md
+++ b/src/_includes/artemis_release.md
@@ -2,17 +2,10 @@
{% if include.latest_docs %}
{% assign docs_version = "latest" %}
{% endif %}
-{% assign is_current_release = false %}
-{% for current_release_prefix in site.data.current_releases["artemis"] %}
- {% if include.release.version contains current_release_prefix %}
- {% assign is_current_release = true %}
- {% break %}
- {% endif %}
-{% endfor %}
#### ActiveMQ Artemis {{include.release.version}}
({{include.release.release_date | date_to_string: "ordinal", "US"}})
[Release Notes](release-notes-{{include.release.version}}) | [Git
Report](commit-report-{{include.release.version}}) |
[Documentation](../documentation/{{docs_version}})
-{% if is_current_release %}
+{% if include.is_current_release %}
tar.gz:|[apache-artemis-{{include.release.version}}-bin.tar.gz](https://www.apache.org/dyn/closer.cgi?filename=activemq/activemq-artemis/{{include.release.version}}/apache-artemis-{{include.release.version}}-bin.tar.gz&action=download)|[SHA512](https://downloads.apache.org/activemq/activemq-artemis/{{include.release.version}}/apache-artemis-{{include.release.version}}-bin.tar.gz.sha512)|[GPG
Signature](https://downloads.apache.org/activemq/activemq-artemis/{{include.release.version}}/apa
[...]
ZIP:|[apache-artemis-{{include.release.version}}-bin.zip](https://www.apache.org/dyn/closer.cgi?filename=activemq/activemq-artemis/{{include.release.version}}/apache-artemis-{{include.release.version}}-bin.zip&action=download)|[SHA512](https://downloads.apache.org/activemq/activemq-artemis/{{include.release.version}}/apache-artemis-{{include.release.version}}-bin.zip.sha512)|[GPG
Signature](https://downloads.apache.org/activemq/activemq-artemis/{{include.release.version}}/apache-artemis-
[...]
Source
Distribution:|[apache-artemis-{{include.release.version}}-source-release.tar.gz](https://www.apache.org/dyn/closer.cgi?filename=activemq/activemq-artemis/{{include.release.version}}/apache-artemis-{{include.release.version}}-source-release.tar.gz&action=download)|[SHA512](https://downloads.apache.org/activemq/activemq-artemis/{{include.release.version}}/apache-artemis-{{include.release.version}}-source-release.tar.gz.sha512)|[GPG
Signature](https://downloads.apache.org/activemq/ac [...]
diff --git a/src/_includes/nms_amqp_download_links.md
b/src/_includes/nms_amqp_download_links.md
index b5518df..0a535f5 100644
--- a/src/_includes/nms_amqp_download_links.md
+++ b/src/_includes/nms_amqp_download_links.md
@@ -1,16 +1,9 @@
-{% assign is_current_release = false %}
-{% for current_release_prefix in site.data.current_releases["nms_amqp"] %}
- {% if include.release.version contains current_release_prefix %}
- {% assign is_current_release = true %}
- {% break %}
- {% endif %}
-{% endfor %}
-{% if is_current_release %}
+{% if include.is_current_release %}
|Apache.NMS.AMQP Source
code|[Apache.NMS.AMQP-{{include.release.version}}-src.zip](https://www.apache.org/dyn/closer.lua?filename=/activemq/apache-nms-amqp/{{include.release.version}}/Apache.NMS.AMQP-{{include.release.version}}-src.zip&action=download)|[SHA512](https://downloads.apache.org/activemq/apache-nms-amqp/{{include.release.version}}/Apache.NMS.AMQP-{{include.release.version}}-src.zip.sha512)|[PGP
Signature](https://downloads.apache.org/activemq/apache-nms-amqp/{{include.release.
[...]
|Apache.NMS.AMQP Binary
Assemblies|[Apache.NMS.AMQP-{{include.release.version}}-bin.zip](https://www.apache.org/dyn/closer.lua?filename=/activemq/apache-nms-amqp/{{include.release.version}}/Apache.NMS.AMQP-{{include.release.version}}-bin.zip&action=download)|[SHA512](https://downloads.apache.org/activemq/apache-nms-amqp/{{include.release.version}}/Apache.NMS.AMQP-{{include.release.version}}-bin.zip.sha512)|[PGP
Signature](https://downloads.apache.org/activemq/apache-nms-amqp/{{include.re
[...]
|Apache.NMS.AMQP Nuget
Package|[Apache.NMS.AMQP.{{include.release.version}}.nupkg](https://www.apache.org/dyn/closer.lua?filename=/activemq/apache-nms-amqp/{{include.release.version}}/Apache.NMS.AMQP.{{include.release.version}}.nupkg&action=download)|[SHA512](https://downloads.apache.org/activemq/apache-nms-amqp/{{include.release.version}}/Apache.NMS.AMQP.{{include.release.version}}.nupkg.sha512)|[PGP
Signature](https://downloads.apache.org/activemq/apache-nms-amqp/{{include.release.vers
[...]
{% else %}
-|Apache.NMS.AMQP Source
code|[Apache.NMS.AMQP-{{include.release.version}}-src.zip](https://archive.apache.org/dist//activemq/apache-nms-amqp/{{include.release.version}}/Apache.NMS.AMQP-{{include.release.version}}-src.zip&action=download)|[SHA512](https://archive.apache.org/dist/activemq/apache-nms-amqp/{{include.release.version}}/Apache.NMS.AMQP-{{include.release.version}}-src.zip.sha512)|[PGP
Signature](https://archive.apache.org/dist/activemq/apache-nms-amqp/{{include.release.version}}
[...]
-|Apache.NMS.AMQP Binary
Assemblies|[Apache.NMS.AMQP-{{include.release.version}}-bin.zip](https://archive.apache.org/dist//activemq/apache-nms-amqp/{{include.release.version}}/Apache.NMS.AMQP-{{include.release.version}}-bin.zip&action=download)|[SHA512](https://archive.apache.org/dist/activemq/apache-nms-amqp/{{include.release.version}}/Apache.NMS.AMQP-{{include.release.version}}-bin.zip.sha512)|[PGP
Signature](https://archive.apache.org/dist/activemq/apache-nms-amqp/{{include.release.ver
[...]
-|Apache.NMS.AMQP Nuget
Package|[Apache.NMS.AMQP.{{include.release.version}}.nupkg](https://archive.apache.org/dist//activemq/apache-nms-amqp/{{include.release.version}}/Apache.NMS.AMQP.{{include.release.version}}.nupkg&action=download)|[SHA512](https://archive.apache.org/dist/activemq/apache-nms-amqp/{{include.release.version}}/Apache.NMS.AMQP.{{include.release.version}}.nupkg.sha512)|[PGP
Signature](https://archive.apache.org/dist/activemq/apache-nms-amqp/{{include.release.version}}/Apa
[...]
+|Apache.NMS.AMQP Source
code|[Apache.NMS.AMQP-{{include.release.version}}-src.zip](https://archive.apache.org/dist/activemq/apache-nms-amqp/{{include.release.version}}/Apache.NMS.AMQP-{{include.release.version}}-src.zip)|[SHA512](https://archive.apache.org/dist/activemq/apache-nms-amqp/{{include.release.version}}/Apache.NMS.AMQP-{{include.release.version}}-src.zip.sha512)|[PGP
Signature](https://archive.apache.org/dist/activemq/apache-nms-amqp/{{include.release.version}}/Apache.NMS.AMQP-
[...]
+|Apache.NMS.AMQP Binary
Assemblies|[Apache.NMS.AMQP-{{include.release.version}}-bin.zip](https://archive.apache.org/dist/activemq/apache-nms-amqp/{{include.release.version}}/Apache.NMS.AMQP-{{include.release.version}}-bin.zip)|[SHA512](https://archive.apache.org/dist/activemq/apache-nms-amqp/{{include.release.version}}/Apache.NMS.AMQP-{{include.release.version}}-bin.zip.sha512)|[PGP
Signature](https://archive.apache.org/dist/activemq/apache-nms-amqp/{{include.release.version}}/Apache.NMS
[...]
+|Apache.NMS.AMQP Nuget
Package|[Apache.NMS.AMQP.{{include.release.version}}.nupkg](https://archive.apache.org/dist/activemq/apache-nms-amqp/{{include.release.version}}/Apache.NMS.AMQP.{{include.release.version}}.nupkg)|[SHA512](https://archive.apache.org/dist/activemq/apache-nms-amqp/{{include.release.version}}/Apache.NMS.AMQP.{{include.release.version}}.nupkg.sha512)|[PGP
Signature](https://archive.apache.org/dist/activemq/apache-nms-amqp/{{include.release.version}}/Apache.NMS.AMQP.{{re
[...]
{% endif %}
diff --git a/src/_layouts/nms_amqp_release.md b/src/_layouts/nms_amqp_release.md
index ed75391..03ce7f0 100644
--- a/src/_layouts/nms_amqp_release.md
+++ b/src/_layouts/nms_amqp_release.md
@@ -27,7 +27,7 @@ layout: default_md
Download
--------
-{% include nms_amqp_download_links.md release=page %}
+{% include nms_amqp_download_links.md release=page
is_current_release=isCurrentRelease %}
Change Log
----------
diff --git a/src/components/artemis/download/index.md
b/src/components/artemis/download/index.md
index d3a3cae..2cc162b 100644
--- a/src/components/artemis/download/index.md
+++ b/src/components/artemis/download/index.md
@@ -15,7 +15,7 @@ It is important to [verify the
integrity](#verify-the-integrity-of-downloads) of
{% for current_release_prefix in site.data.current_releases["artemis"] %}
{% for release in reversed_releases %}
{% if release.version contains current_release_prefix %}
- {% include artemis_release.md release=release
latest_docs=latest_docs %}
+ {% include artemis_release.md release=release
is_current_release=true latest_docs=latest_docs %}
{% assign latest_docs = false %}
{% break %}
{% endif %}
diff --git a/src/components/artemis/download/past_releases.md
b/src/components/artemis/download/past_releases.md
index 1ed2389..9ac022a 100644
--- a/src/components/artemis/download/past_releases.md
+++ b/src/components/artemis/download/past_releases.md
@@ -27,7 +27,7 @@ It is important to [verify the
integrity]({{site.baseurl}}/components/artemis/do
{% for release in reversed_releases %}
{% unless current_releases contains release.version %}
-{% include artemis_release.md release=release %}
+{% include artemis_release.md release=release is_current_release=false %}
<br/>
{% endunless %}
{% endfor %}
diff --git a/src/components/nms/providers/amqp/downloads/index.md
b/src/components/nms/providers/amqp/downloads/index.md
index 1261d41..6167749 100644
--- a/src/components/nms/providers/amqp/downloads/index.md
+++ b/src/components/nms/providers/amqp/downloads/index.md
@@ -17,7 +17,7 @@ It is important to [verify the
integrity](#verify-the-integrity-of-downloads) of
#### NMS AMQP {{release.version}} ({{release.release_date | date_to_string:
"ordinal", "US"}})
[Release Notes]({{ release.release_notes }}) | [Release Page]({{release.url}})
- {% include nms_amqp_download_links.md release=release %}
+ {% include nms_amqp_download_links.md release=release
is_current_release=true %}
{% break %}
{% endif %}
{% endfor %}
diff --git a/src/components/nms/providers/amqp/downloads/past_releases.md
b/src/components/nms/providers/amqp/downloads/past_releases.md
index ab507c0..48ad3d7 100644
--- a/src/components/nms/providers/amqp/downloads/past_releases.md
+++ b/src/components/nms/providers/amqp/downloads/past_releases.md
@@ -30,7 +30,7 @@ It is important to [verify the
integrity]({{site.baseurl}}/components/nms/provid
#### NMS AMQP {{release.version}} ({{release.release_date | date_to_string:
"ordinal", "US"}})
[Release Notes]({{ release.release_notes }}) | [Release Page]({{release.url}})
-{% include nms_amqp_download_links.md release=release %}
+{% include nms_amqp_download_links.md release=release is_current_release=false
%}
<br/>
{% endunless %}
