You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by zr...@apache.org on 2023/02/06 12:42:58 UTC
[camel-website] branch main updated (8b243567 -> 8b1bd1f6)
This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-website.git
from 8b243567 CAMEL-19011: update release notes to point users to use camel-bom / c… (#975)
new 956b6180 chore: support `-M` and `-RC` versions
new 8b1bd1f6 chore: remove `legacy` and add `RC` category
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
content/releases/release-3.0.0-RC1.md | 4 ++--
content/releases/release-3.0.0-RC2.md | 4 ++--
content/releases/release-3.0.0-RC3.md | 4 ++--
content/releases/release-4.0.0-M1.md | 4 ++--
data/release-categories.yaml | 4 ++--
layouts/partials/releases/downloads.html | 2 +-
layouts/partials/releases/version_sort.html | 16 ++++++++++++++--
7 files changed, 25 insertions(+), 13 deletions(-)
[camel-website] 01/02: chore: support `-M` and `-RC` versions
Posted by zr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-website.git
commit 956b6180a4b017af884ad2989793f2893b3071bd
Author: Zoran Regvart <zo...@regvart.com>
AuthorDate: Mon Feb 6 11:26:52 2023 +0100
chore: support `-M` and `-RC` versions
Sorting now supports `-M` and `-RC` versions. This eliminates the need
for `rc: true` filter on versions needed for sorting.
---
content/releases/release-3.0.0-RC1.md | 3 +--
content/releases/release-3.0.0-RC2.md | 3 +--
content/releases/release-3.0.0-RC3.md | 3 +--
content/releases/release-4.0.0-M1.md | 3 +--
layouts/partials/releases/downloads.html | 2 +-
layouts/partials/releases/version_sort.html | 16 ++++++++++++++--
6 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/content/releases/release-3.0.0-RC1.md b/content/releases/release-3.0.0-RC1.md
index d83cc60c..ae8862ea 100644
--- a/content/releases/release-3.0.0-RC1.md
+++ b/content/releases/release-3.0.0-RC1.md
@@ -1,9 +1,8 @@
---
date: 2019-09-01
-draft: false
+draft: false
type: release-note
version: 3.0.0-RC1
-rc: true
title: "Release 3.0.0-RC1"
preview: "First release candidate for 3.0.0"
apiBreaking: ""
diff --git a/content/releases/release-3.0.0-RC2.md b/content/releases/release-3.0.0-RC2.md
index 22951afe..1124d7fd 100644
--- a/content/releases/release-3.0.0-RC2.md
+++ b/content/releases/release-3.0.0-RC2.md
@@ -1,9 +1,8 @@
---
date: 2019-10-06
-draft: false
+draft: false
type: release-note
version: 3.0.0-RC2
-rc: true
title: "Release 3.0.0-RC2"
preview: "Second release candidate for 3.0.0"
apiBreaking: ""
diff --git a/content/releases/release-3.0.0-RC3.md b/content/releases/release-3.0.0-RC3.md
index e22b2854..92fc8b3f 100644
--- a/content/releases/release-3.0.0-RC3.md
+++ b/content/releases/release-3.0.0-RC3.md
@@ -1,9 +1,8 @@
---
date: 2019-10-25
-draft: false
+draft: false
type: release-note
version: 3.0.0-RC3
-rc: true
title: "Release 3.0.0-RC3"
preview: "Third release candidate for 3.0.0"
apiBreaking: ""
diff --git a/content/releases/release-4.0.0-M1.md b/content/releases/release-4.0.0-M1.md
index 4c27bba1..fa578fe1 100644
--- a/content/releases/release-4.0.0-M1.md
+++ b/content/releases/release-4.0.0-M1.md
@@ -1,9 +1,8 @@
---
date: 2023-02-04
-draft: false
+draft: false
type: release-note
version: 4.0.0-M1
-rc: true
title: "Release 4.0.0-M1"
preview: "First milestone for 4.0.0"
apiBreaking: ""
diff --git a/layouts/partials/releases/downloads.html b/layouts/partials/releases/downloads.html
index 20e8af57..41a1112f 100644
--- a/layouts/partials/releases/downloads.html
+++ b/layouts/partials/releases/downloads.html
@@ -9,7 +9,7 @@
{{ $versions := slice }}
{{/* all versions from a category (camel, camel-k...) */}}
-{{ $category_releases := where (where (where .Pages "Section" "releases") ".Params.rc" "ne" "true") ".Params.category" $.Category.id }}
+{{ $category_releases := where (where .Pages "Section" "releases") ".Params.category" $.Category.id }}
{{/* are we featuring a current versions or an archived ones */}}
{{ $is_current_versions := false }}
diff --git a/layouts/partials/releases/version_sort.html b/layouts/partials/releases/version_sort.html
index cb7692e8..58e748e1 100644
--- a/layouts/partials/releases/version_sort.html
+++ b/layouts/partials/releases/version_sort.html
@@ -6,8 +6,20 @@
{{ $version := .Params.version }}
{{/* version as number, e.g. 1.2.3 -> 100020003 */}}
{{ $version_num := 0 }}
- {{ range $version_part := split $version "." }}
- {{ $version_num = add (mul $version_num 1000) (int $version_part) }}
+ {{ range split $version "." }}
+ {{ if strings.ContainsAny . "-RCM" }}
+ {{ range split . "-" }}
+ {{ range split . "M" }}
+ {{ range split . "RC" }}
+ {{ if . }}
+ {{ $version_num = add (mul $version_num 1000) (int .) }}
+ {{ end }}
+ {{ end }}
+ {{ end }}
+ {{ end }}
+ {{ else }}
+ {{ $version_num = add (mul $version_num 1000000) (mul (int .) 1000) }}
+ {{ end }}
{{ end }}
{{ $versions = $versions | append (dict "version_num" $version_num "page" .) }}
{{ end }}
[camel-website] 02/02: chore: remove `legacy` and add `RC` category
Posted by zr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-website.git
commit 8b1bd1f637a230f839ba8bb88e9fda24194bbc04
Author: Zoran Regvart <zo...@regvart.com>
AuthorDate: Mon Feb 6 11:27:00 2023 +0100
chore: remove `legacy` and add `RC` category
For releases the `RC` category can be used to signify the milestone or
release candidate categories. These will now be featured on the
downloads page. Legacy (Camel 2.x) releases will not be featured on the
downloads page.
---
content/releases/release-3.0.0-RC1.md | 1 +
content/releases/release-3.0.0-RC2.md | 1 +
content/releases/release-3.0.0-RC3.md | 1 +
content/releases/release-4.0.0-M1.md | 1 +
data/release-categories.yaml | 4 ++--
5 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/content/releases/release-3.0.0-RC1.md b/content/releases/release-3.0.0-RC1.md
index ae8862ea..360d5272 100644
--- a/content/releases/release-3.0.0-RC1.md
+++ b/content/releases/release-3.0.0-RC1.md
@@ -9,6 +9,7 @@ apiBreaking: ""
knownIssues: ""
jiraVersionId: 12345723
category: camel
+kind: RC
jdk: [8,11]
---
diff --git a/content/releases/release-3.0.0-RC2.md b/content/releases/release-3.0.0-RC2.md
index 1124d7fd..5df8e201 100644
--- a/content/releases/release-3.0.0-RC2.md
+++ b/content/releases/release-3.0.0-RC2.md
@@ -9,6 +9,7 @@ apiBreaking: ""
knownIssues: ""
jiraVersionId: 12345998
category: camel
+kind: RC
jdk: [8,11]
---
diff --git a/content/releases/release-3.0.0-RC3.md b/content/releases/release-3.0.0-RC3.md
index 92fc8b3f..a1c3d040 100644
--- a/content/releases/release-3.0.0-RC3.md
+++ b/content/releases/release-3.0.0-RC3.md
@@ -9,6 +9,7 @@ apiBreaking: ""
knownIssues: ""
jiraVersionId: 12346354
category: camel
+kind: RC
jdk: [8,11]
---
diff --git a/content/releases/release-4.0.0-M1.md b/content/releases/release-4.0.0-M1.md
index fa578fe1..a120a484 100644
--- a/content/releases/release-4.0.0-M1.md
+++ b/content/releases/release-4.0.0-M1.md
@@ -9,6 +9,7 @@ apiBreaking: ""
knownIssues: ""
jiraVersionId: 12352867
category: camel
+kind: RC
jdk: [17]
---
diff --git a/data/release-categories.yaml b/data/release-categories.yaml
index 460045d7..1043e3cd 100644
--- a/data/release-categories.yaml
+++ b/data/release-categories.yaml
@@ -30,8 +30,8 @@ camel:
filter: 'lts'
- name: 'latest'
filter: 'latest'
- - name: 'legacy'
- filter: 'legacy'
+ - name: 'RC'
+ filter: 'RC'
downloads:
- name: 'Sources'
path_format: 'camel/apache-camel/{version}/apache-camel-{version}-src.zip'