diff --git a/.github/workflows/build_main.yml b/.github/workflows/build_main.yml index 34d0a32..7907af9 100644 --- a/.github/workflows/build_main.yml +++ b/.github/workflows/build_main.yml @@ -63,7 +63,7 @@ jobs: draft: false prerelease: false bodyFile: "CHANGELOG.md" - artifacts: "LICENSE.adoc,release_dir/*.pdf,release_dir/*.zip" + artifacts: "license-copyright/LICENSE.adoc,release_dir/*.pdf,release_dir/*.zip" token: ${{ secrets.GITHUB_TOKEN }} - name: Deploy if: startsWith(github.ref, 'refs/tags/') diff --git a/.github/workflows/build_releasecandidate.yml b/.github/workflows/build_releasecandidate.yml index 101aab6..b0194ba 100644 --- a/.github/workflows/build_releasecandidate.yml +++ b/.github/workflows/build_releasecandidate.yml @@ -66,7 +66,7 @@ jobs: draft: false prerelease: true bodyFile: "CHANGELOG.md" - artifacts: "LICENSE.adoc,release_dir/*.pdf,release_dir/*.zip" + artifacts: "license-copyright/LICENSE.adoc,release_dir/*.pdf,release_dir/*.zip" token: ${{ secrets.GITHUB_TOKEN }} - name: Deploy Release Candidate to GitHub Pages if: startsWith(github.ref, 'refs/tags/') diff --git a/.gitmodules b/.gitmodules index 6d6422d..f80c461 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "html-theme"] path = html-theme url = https://github.com/isaqb-org/html-theme +[submodule "license-copyright"] + path = license-copyright + url = https://github.com/isaqb-org/license-copyright diff --git a/LICENSE.adoc b/LICENSE.adoc deleted file mode 100644 index 57a70f0..0000000 --- a/LICENSE.adoc +++ /dev/null @@ -1,26 +0,0 @@ -This is COPYRIGHTED work. - -(C) (Copyright), International Software Architecture Qualification Board e. V. -(iSAQB^(R)^ e. V.) 2019ff - -Die Nutzung des Lehrplans ist nur unter den nachfolgenden Voraussetzungen erlaubt: - -1. Sie möchten das Zertifikat zum CPSA Certified Professional for Software Architecture Foundation Level^(R)^ erwerben. -Für den Erwerb des Zertifikats ist es gestattet, die Textdokumente und/oder Lehrpläne zu nutzen, -indem eine Arbeitskopie für den eigenen Rechner erstellt wird. Soll eine darüber hinaus gehende Nutzung der Dokumente -und/oder Lehrpläne erfolgen, zum Beispiel zur Weiterverbreitung an Dritte, Werbung etc., -bitte unter info@isaqb.org nachfragen. -Es müsste dann ein eigener Lizenzvertrag geschlossen werden. - -2. Sind Sie Trainer:in oder Trainingsprovider, ist die Nutzung der Dokumente und/oder Lehrpläne nach Erwerb -einer Nutzungslizenz möglich. Hierzu bitte unter info@isaqb.org nachfragen. -Lizenzverträge, die alles umfassend regeln, sind vorhanden. - -3. Falls Sie unter keine der vorstehenden Kategorien fallen, aber dennoch die Dokumente und/oder Lehrpläne nutzen möchten, -nehmen Sie bitte ebenfalls Kontakt unter info@isaqb.org zum iSAQB e.V. auf. -Sie werden dort über die Möglichkeit des Erwerbs entsprechender Lizenzen im Rahmen der vorhandenen -Lizenzverträge informiert und können die gewünschten Nutzungsgenehmigungen erhalten. - -Grundsätzlich weisen wir darauf hin, dass dieser Lehrplan urheberrechtlich geschützt ist. - -Alle Rechte an diesen Copyrights stehen ausschließlich dem International Software Architecture Qualification Board e. V. (iSAQB^(R)^ e. V.) zu. diff --git a/README.adoc b/README.adoc index 8d8202a..4f5e656 100644 --- a/README.adoc +++ b/README.adoc @@ -32,7 +32,7 @@ This is <>. toc::[] == What's CPSA-Foundation? -Licensed trainings for _Certified Professional for Software Architecture – Foundation Level (CPSA-F)_ will provide participants with the knowledge and skills required to design, specify and document a software architecture adequate to fulfil the respective requirements for small and medium-sized systems. +Licensed trainings for _Certified Professional for Software Architecture – Foundation Level (CPSA-F)_ will provide participants with the knowledge and skills required to design, specify and document a software architecture adequate to fulfil the respective requirements for small and medium-sized systems. == How to contribute or participate You found a bug in one of the published versions, have remarks, comments or proposals? @@ -43,7 +43,7 @@ TODO: add issue templates for bugs, comments, proposals Prerequisite: You need a Java Runtime(tm) installed. -You build the output documents with gradle. That will produce both pdf and html output in German (DE) _and_ English (EN), unless you modify the configuration. +You build the output documents with gradle. That will produce both pdf and html output in German (DE) _and_ English (EN), unless you modify the configuration. In case you want to change that, adjust the following part of `build.gradle`: @@ -86,8 +86,8 @@ image:./release-process/release-process-2023.drawio.png[graphical overview of re [cols="1,6,2,2"] |=== | Nr | Activity | Duration | Schedule/deadline -| 1 | Collect change requests | continuously -| for 2023, CRs are accepted until May 5th 2022 +| 1 | Collect change requests | continuously +| for 2023, CRs are accepted until May 5th 2022 a| 2 | Examination providers provide (structured) data as input, so the FLWG can create (anonymous) statistical evaluation of examinations and examination questions. These statistics also result in CRs, unless it concerns specific formulations in exam questions. In that case, it's managed in our private JIRA. | continuously | none | 3 | FLWG maintains the curriculum and associated information within this public Github repository | | | 4 | FLWG decides internally, which changes to accept for the upcoming release.| | RD - 6M, Oct 1st 2022 @@ -97,16 +97,16 @@ a| 2 | Examination providers provide (structured) data as input, so the FLWG ca | 4 weeks | RD - 5M, Nov 1st 2022 (FLWG failed to meet this date) a| 7 | When all changes are included and finalized, a new version of the curriculum is generated (in both EN and DE language) - but not yet made mandatory! All training providers and trainers shall be notified of this update. -**This new version is published on the isaqb-org.github.io website.** +**This new version is published on the isaqb-org.github.io website.** | 2 weeks | RD - 4M, Dec 20th 2022 -| 4, 6 & 7 | Minor corrections, hotfixes | continuously | +| 4, 6 & 7 | Minor corrections, hotfixes | continuously | | 8 | FLWG determines which exam questions are affected by the changes in curriculum and updates the exam questions accordingly. Changes to questions are reviewed internally. This will need at least three Independent reviewers| 4-6 weeks | a| 9 | Finalized questions are transformed into pdf/xml and/or other formats, appropriately labelled and securely transmitted to both EP and iSAQB GmbH (to allow translation to languages other than DE and EN) EP need to incorporate this updated version into their examination process and/or toolset until the release date RD.| RD - 3M, Jan 15th 2023| | 10 | iSAQB GmbH contracts translation of curriculum and questions to translation office (which is under strict nondisclosure agreements) | 4 weeks| | 11 | For every target language there need to be an expert group who can handle review of translation - | 4-6 weeks | + | 4-6 weeks | a| 12 | **EN + DE release of curriculum and examination question: Usage of new version is mandatory in all trainings given in DE or EN.** * All trainers need to have their complete training material updated to this release @@ -118,15 +118,15 @@ Usage of new version is mandatory in all trainings given in any language. |=== -* **RD**: Release-Date (next: April 1st 2023) +* **RD**: Release-Date (next: April 1st 2023) * **EP**: Examination Provider === New major versions of the curriculum * Announcements: major versions (2019.x, 2021.x) are announced to training providers at least 3-4 month in advance--usually at the iSAQB members meeting. * RC1: About 4-6 month prior to release, training providers receive the first release candidate (RC1) for review and comments. -* RC2: 6-8 weeks prior to release they receive the final release candidate RC2, which is _feature frozen_ (meaning neither learning goals nor priorities will substantially change, only bugs and typos will be fixed). +* RC2: 6-8 weeks prior to release they receive the final release candidate RC2, which is _feature frozen_ (meaning neither learning goals nor priorities will substantially change, only bugs and typos will be fixed). * Final version (e.g. 2021.1) will be made public on iSAQB.org and iSAQB.com -* Released versions will be tagged in git. +* Released versions will be tagged in git. All languages (e.g. DE and EN) will be released at the same time. @@ -181,7 +181,7 @@ The current (2022) FLWG members are: As stated above, _Foundation Level_ covers small to medium-sized software systems. -Based upon their individual practical experience and existing skills, participants will learn to derive architectural decisions from an existing system vision and adequately detailed requirements. +Based upon their individual practical experience and existing skills, participants will learn to derive architectural decisions from an existing system vision and adequately detailed requirements. CPSA-F trainings teach methods and principles for design, communication, documentation and evaluation of software architectures, independent of specific development processes. Focus is education and training of the following skills: @@ -211,4 +211,4 @@ Wolfgang Fahl, Philip Ghadir, Prof. Dieter Jungmann, Prof. Arne Koschel, Prof. A [[copyrighted]] == Licensing and Copyright -include::LICENSE.adoc[] +include::license-copyright/LICENSE.adoc[] diff --git a/docs/00-preamble/copyright.adoc b/docs/00-preamble/copyright.adoc deleted file mode 100644 index e49c845..0000000 --- a/docs/00-preamble/copyright.adoc +++ /dev/null @@ -1,54 +0,0 @@ - -// tag::DE[] -== Rechtliches - -**(C) (Copyright), International Software Architecture Qualification Board e. V. (iSAQB^(R)^ e. V.) 2021** - -Die Nutzung des Lehrplans ist nur unter den nachfolgenden Voraussetzungen erlaubt: - -1. Sie möchten das Zertifikat zum CPSA Certified Professional for Software Architecture Foundation Level^(R)^ erwerben. -Für den Erwerb des Zertifikats ist es gestattet, die Textdokumente und/oder Lehrpläne zu nutzen, indem eine Arbeitskopie für den eigenen Rechner erstellt wird. Soll eine darüber hinaus gehende Nutzung der Dokumente und/oder Lehrpläne erfolgen, zum Beispiel zur Weiterverbreitung an Dritte, Werbung etc., bitte unter info@isaqb.org nachfragen. -Es müsste dann ein eigener Lizenzvertrag geschlossen werden. - -2. Sind Sie Trainer:in oder Trainingsprovider, ist die Nutzung der Dokumente und/oder Lehrpläne nach Erwerb einer Nutzungslizenz möglich. Hierzu bitte unter info@isaqb.org nachfragen. -Lizenzverträge, die alles umfassend regeln, sind vorhanden. - -3. Falls Sie unter keine der vorstehenden Kategorien fallen, aber dennoch die Dokumente und/oder Lehrpläne nutzen möchten, nehmen Sie bitte ebenfalls Kontakt unter info@isaqb.org zum iSAQB e.V. auf. -Sie werden dort über die Möglichkeit des Erwerbs entsprechender Lizenzen im Rahmen der vorhandenen Lizenzverträge informiert und können die gewünschten Nutzungsgenehmigungen erhalten. - -.Wichtiger Hinweis -**** -*Grundsätzlich weisen wir darauf hin, dass dieser Lehrplan urheberrechtlich geschützt ist. -Alle Rechte an diesen Copyrights stehen ausschließlich dem International Software Architecture Qualification Board e. V. (iSAQB^(R)^ e. V.) zu.* -**** - -Die Abkürzung "e. V." ist Teil des offiziellen Namens des iSAQB und steht für "eingetragener Verein", der seinen Status als juristische Person nach deutschem Recht beschreibt. -Der Einfachheit halber wird iSAQB e. V. im Folgenden ohne die Verwendung dieser Abkürzung als iSAQB bezeichnet. - -// end::DE[] - -// tag::EN[] - -== Legal Notice - -**(C) (Copyright), International Software Architecture Qualification Board e. V. (iSAQB^(R)^ e. V.) 2021** - -The curriculum may only be used subject to the following conditions: - -1. You wish to obtain the CPSA Certified Professional for Software Architecture Foundation Level^(R)^ certificate. For the purpose of obtaining the certificate, it shall be permitted to use these text documents and/or curricula by creating working copies for your own computer. If any other use of documents and/or curricula is intended, for instance for their dissemination to third parties, for advertising etc., please write to info@isaqb.org to enquire whether this is permitted. A separate license agreement would then have to be entered into. - -2. If you are a trainer or training provider, it shall be possible for you to use the documents and/or curricula once you have obtained a usage license. -Please address any enquiries to info@isaqb.org. License agreements with comprehensive provisions for all aspects exist. - -3. If you fall neither into category 1 nor category 2, but would like to use these documents and/or curricula nonetheless, please also contact the iSAQB e. V. by writing to info@isaqb.org. You will then be informed about the possibility of acquiring relevant licenses through existing license agreements, allowing you to obtain your desired usage authorizations. - -.Important Notice -**** -*We stress that, as a matter of principle, this curriculum is protected by copyright. -The International Software Architecture Qualification Board e. V. (iSAQB^(R)^ e. V.) has exclusive entitlement to these copyrights.* -**** - -The abbreviation "e. V." is part of the iSAQB's official name and stands for "eingetragener Verein" (registered association), which describes its status as a legal entity according to German law. -For the purpose of simplicity, iSAQB e. V. shall hereafter be referred to as iSAQB without the use of said abbreviation. - -// end::EN[] diff --git a/docs/curriculum-foundation.adoc b/docs/curriculum-foundation.adoc index ea7ed96..fc398d3 100644 --- a/docs/curriculum-foundation.adoc +++ b/docs/curriculum-foundation.adoc @@ -22,7 +22,7 @@ include::config/i18n-definitions.adoc[tags={language}] <<< :sectnums!: -include::00-preamble/copyright.adoc[{include_configuration}] +include::../license-copyright/copyright.adoc[{include_configuration}] <<< // put table of contents right behind copyright page diff --git a/license-copyright b/license-copyright new file mode 160000 index 0000000..e0420d7 --- /dev/null +++ b/license-copyright @@ -0,0 +1 @@ +Subproject commit e0420d728958ac9631d9376beb519733a91c1fae