From e05405a4eb4c18defa239c09f06d4b363a3050c6 Mon Sep 17 00:00:00 2001 From: Benjamin Wolf Date: Wed, 19 Jun 2024 17:05:04 +0200 Subject: [PATCH 1/6] Improve overview page of RC --- docs/index_rc.adoc | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/docs/index_rc.adoc b/docs/index_rc.adoc index 3d56769..f3a645d 100644 --- a/docs/index_rc.adoc +++ b/docs/index_rc.adoc @@ -1,19 +1,22 @@ include::config/setup.adoc[] + = image:isaqb-logo.jpg[width=150]Certified Professional for Software Architecture^(R)^ (CPSA) - Curriculum {curriculum-name} [{curriculum-short}] – Release Candidate - +:repo-name: advanced-template + The international Software Architecture Qualification Board (link:https://isaqb.org[iSAQB]) defines curricula on several levels for software architects. The **Release Candidates** of the **{curriculum-name} [{curriculum-short}]** advanced level curriculum are currently maintained and published in both English (EN) and German (DE). Maintainers of this curriculum and voluntary reviewers collaborate on https://github.com/isaqb-org[GitHub] to improve the curriculum. -== Current Release Candidate v2023.1 +== Current Release Candidate {project.version} -image:https://img.shields.io/github/last-commit/isaqb-org/advanced-template/main.svg["Last commit"] -image:https://img.shields.io/github/contributors/isaqb-org/advanced-template.svg["Contributors",link="https://github.com/isaqb-org/advanced-template/graphs/contributors"] -image:https://img.shields.io/github/issues/isaqb-org/advanced-template.svg["Issues",link="https://github.com/isaqb-org/advanced-template/issues"] -image:https://img.shields.io/github/issues-closed/isaqb-org/advanced-template.svg["Issues closed",link="https://github.com/isaqb-org/advanced-template/issues?utf8=%E2%9C%93&q=is%3Aissue+is%3Aclosed+"] -image:https://img.shields.io/github/commits-since/isaqb-org/advanced-template/latest.svg[] +image:https://img.shields.io/github/last-commit/isaqb-org/{repo-name}/main.svg["Last commit"] +image:https://img.shields.io/github/contributors/isaqb-org/{repo-name}.svg["Contributors",link="https://github.com/isaqb-org/{repo-name}/graphs/contributors"] +image:https://img.shields.io/github/issues/isaqb-org/{repo-name}.svg["Issues",link="https://github.com/isaqb-org/{repo-name}/issues"] +image:https://img.shields.io/github/issues-closed/isaqb-org/{repo-name}.svg["Issues closed",link="https://github.com/isaqb-org/{repo-name}/issues?utf8=%E2%9C%93&q=is%3Aissue+is%3Aclosed+"] +image:https://img.shields.io/github/commits-since/isaqb-org/{repo-name}/latest.svg[] |=== | Version | HTML | PDF @@ -28,5 +31,4 @@ image:https://img.shields.io/github/commits-since/isaqb-org/advanced-template/la |=== == Changes compared to XXX -- link:https://github.com/isaqb-org/advanced-template/blob/main/CHANGELOG.md[CHANGELOG.md on GitHub] -// - link: [HTML diff to the latest curriculum] T.B.A. +- link:https://github.com/isaqb-org/{repo-name}/blob/main/CHANGELOG.md[CHANGELOG.md on GitHub] From 9057a4d746f59167494a3cb2dea914e5a5599fef Mon Sep 17 00:00:00 2001 From: Benjamin Wolf Date: Thu, 20 Jun 2024 13:33:25 +0200 Subject: [PATCH 2/6] Add release version without language --- src/main/java/org/isaqb/asciidoc/Main.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/org/isaqb/asciidoc/Main.java b/src/main/java/org/isaqb/asciidoc/Main.java index 456e4db..675a0bf 100644 --- a/src/main/java/org/isaqb/asciidoc/Main.java +++ b/src/main/java/org/isaqb/asciidoc/Main.java @@ -123,6 +123,7 @@ private static Attributes toAttributes( final Map attributes = new HashMap<>() {{ put("icons", "font"); put("version-label", ""); + put("release-version", projectVersion); put("revnumber", fileVersion); put("revdate", versionDate); put("document-version", documentVersion); From 901ce44f39daae1a1963a3aa57ec28a4ab6939ec Mon Sep 17 00:00:00 2001 From: Benjamin Wolf Date: Thu, 20 Jun 2024 13:33:32 +0200 Subject: [PATCH 3/6] Remove dead code --- docs/curriculum-template.adoc | 4 ---- 1 file changed, 4 deletions(-) diff --git a/docs/curriculum-template.adoc b/docs/curriculum-template.adoc index 8a1ef15..5efb0fb 100644 --- a/docs/curriculum-template.adoc +++ b/docs/curriculum-template.adoc @@ -13,10 +13,6 @@ ifeval::["{language}" == "EN"] :toc: left endif::[] -// document-version fallback, should usually be overwritten by the build process, -// e.g. build.gradle -:document-version: 2020.1 - // define terms for toc, learning-goals include::config/i18n-definitions.adoc[tags={language}] From a9dfaecd78577b9c70123db2665d9870e6172508 Mon Sep 17 00:00:00 2001 From: Benjamin Wolf Date: Thu, 20 Jun 2024 13:33:38 +0200 Subject: [PATCH 4/6] Improve headings --- docs/index.adoc | 2 +- docs/index_rc.adoc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/index.adoc b/docs/index.adoc index e182194..ae6fae2 100644 --- a/docs/index.adoc +++ b/docs/index.adoc @@ -7,7 +7,7 @@ The international Software Architecture Qualification Board (link:https://isaqb. The terminology used in the iSAQB curricula can be found as a (freely available) ebook, published on https://leanpub.com/isaqbglossary/read[Leanpub]. -== Development versions +== Latest Release {release-version} The Advanced Level Template Curriculum is currently maintained and published in both English (EN) and German (DE). Maintainers and volunteer reviewers collaborate on GitHub to improve the curriculum. diff --git a/docs/index_rc.adoc b/docs/index_rc.adoc index f3a645d..36608f4 100644 --- a/docs/index_rc.adoc +++ b/docs/index_rc.adoc @@ -10,7 +10,7 @@ The international Software Architecture Qualification Board (link:https://isaqb. The **Release Candidates** of the **{curriculum-name} [{curriculum-short}]** advanced level curriculum are currently maintained and published in both English (EN) and German (DE). Maintainers of this curriculum and voluntary reviewers collaborate on https://github.com/isaqb-org[GitHub] to improve the curriculum. -== Current Release Candidate {project.version} +== Current Release Candidate {release-version} image:https://img.shields.io/github/last-commit/isaqb-org/{repo-name}/main.svg["Last commit"] image:https://img.shields.io/github/contributors/isaqb-org/{repo-name}.svg["Contributors",link="https://github.com/isaqb-org/{repo-name}/graphs/contributors"] From a38fc1791fdb5240064d85b31c13e445bf26f199 Mon Sep 17 00:00:00 2001 From: Benjamin Wolf Date: Thu, 20 Jun 2024 13:34:01 +0200 Subject: [PATCH 5/6] Remove empty line --- docs/index_rc.adoc | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/index_rc.adoc b/docs/index_rc.adoc index 36608f4..3a9511a 100644 --- a/docs/index_rc.adoc +++ b/docs/index_rc.adoc @@ -1,6 +1,5 @@ include::config/setup.adoc[] - = image:isaqb-logo.jpg[width=150]Certified Professional for Software Architecture^(R)^ (CPSA) - Curriculum {curriculum-name} [{curriculum-short}] – Release Candidate - From 1d0e876c541f90338031d40ff5376cb5a7fecda4 Mon Sep 17 00:00:00 2001 From: Benjamin Wolf Date: Thu, 20 Jun 2024 13:42:04 +0200 Subject: [PATCH 6/6] Add release notes for .9 --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f004df..f83b843 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,7 @@ # Release Notes +## New in 2020.9 +- Improved text in index-page + ## New in 2020.8 - Move all workflows to separate repository - Update to Gradle Wrapper 8.8