Skip to content

Commit 9be7f52

Browse files
authored
Merge pull request #342 from isaqb-org/338-update-copyright
Update Copyright
2 parents f1e64be + 06a6c6e commit 9be7f52

File tree

8 files changed

+19
-95
lines changed

8 files changed

+19
-95
lines changed

.github/workflows/build_main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
draft: false
6464
prerelease: false
6565
bodyFile: "CHANGELOG.md"
66-
artifacts: "LICENSE.adoc,release_dir/*.pdf,release_dir/*.zip"
66+
artifacts: "license-copyright/LICENSE.adoc,release_dir/*.pdf,release_dir/*.zip"
6767
token: ${{ secrets.GITHUB_TOKEN }}
6868
- name: Deploy
6969
if: startsWith(github.ref, 'refs/tags/')

.github/workflows/build_releasecandidate.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
draft: false
6767
prerelease: true
6868
bodyFile: "CHANGELOG.md"
69-
artifacts: "LICENSE.adoc,release_dir/*.pdf,release_dir/*.zip"
69+
artifacts: "license-copyright/LICENSE.adoc,release_dir/*.pdf,release_dir/*.zip"
7070
token: ${{ secrets.GITHUB_TOKEN }}
7171
- name: Deploy Release Candidate to GitHub Pages
7272
if: startsWith(github.ref, 'refs/tags/')

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,6 @@
44
[submodule "html-theme"]
55
path = html-theme
66
url = https://github.com/isaqb-org/html-theme
7+
[submodule "license-copyright"]
8+
path = license-copyright
9+
url = https://github.com/isaqb-org/license-copyright

LICENSE.adoc

Lines changed: 0 additions & 26 deletions
This file was deleted.

README.adoc

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ This is <<copyrighted,copyrighted work>>.
3232
toc::[]
3333

3434
== What's CPSA-Foundation?
35-
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.
35+
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.
3636

3737
== How to contribute or participate
3838
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
4343

4444
Prerequisite: You need a Java Runtime(tm) installed.
4545

46-
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.
46+
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.
4747

4848
In case you want to change that, adjust the following part of `build.gradle`:
4949

@@ -86,8 +86,8 @@ image:./release-process/release-process-2023.drawio.png[graphical overview of re
8686
[cols="1,6,2,2"]
8787
|===
8888
| Nr | Activity | Duration | Schedule/deadline
89-
| 1 | Collect change requests | continuously
90-
| for 2023, CRs are accepted until May 5th 2022
89+
| 1 | Collect change requests | continuously
90+
| for 2023, CRs are accepted until May 5th 2022
9191
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
9292
| 3 | FLWG maintains the curriculum and associated information within this public Github repository | |
9393
| 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
9797
| 4 weeks | RD - 5M, Nov 1st 2022 (FLWG failed to meet this date)
9898
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.
9999

100-
**This new version is published on the isaqb-org.github.io website.**
100+
**This new version is published on the isaqb-org.github.io website.**
101101
| 2 weeks | RD - 4M, Dec 20th 2022
102-
| 4, 6 & 7 | Minor corrections, hotfixes | continuously |
102+
| 4, 6 & 7 | Minor corrections, hotfixes | continuously |
103103
| 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 |
104104
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)
105105
EP need to incorporate this updated version into their examination process and/or toolset until the release date RD.| RD - 3M, Jan 15th 2023|
106106
| 10 | iSAQB GmbH contracts translation of curriculum and questions to translation office (which is under strict nondisclosure agreements)
107107
| 4 weeks|
108108
| 11 | For every target language there need to be an expert group who can handle review of translation
109-
| 4-6 weeks |
109+
| 4-6 weeks |
110110
a| 12 | **EN + DE release of curriculum and examination question: Usage of new version is mandatory in all trainings given in DE or EN.**
111111

112112
* 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.
118118

119119
|===
120120

121-
* **RD**: Release-Date (next: April 1st 2023)
121+
* **RD**: Release-Date (next: April 1st 2023)
122122
* **EP**: Examination Provider
123123

124124
=== New major versions of the curriculum
125125
* 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.
126126
* RC1: About 4-6 month prior to release, training providers receive the first release candidate (RC1) for review and comments.
127-
* 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).
127+
* 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).
128128
* Final version (e.g. 2021.1) will be made public on iSAQB.org and iSAQB.com
129-
* Released versions will be tagged in git.
129+
* Released versions will be tagged in git.
130130

131131
All languages (e.g. DE and EN) will be released at the same time.
132132

@@ -181,7 +181,7 @@ The current (2022) FLWG members are:
181181

182182
As stated above, _Foundation Level_ covers small to medium-sized software systems.
183183

184-
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.
184+
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.
185185
CPSA-F trainings teach methods and principles for design, communication, documentation and evaluation of software architectures, independent of specific development processes.
186186

187187
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
211211
[[copyrighted]]
212212
== Licensing and Copyright
213213

214-
include::LICENSE.adoc[]
214+
include::license-copyright/LICENSE.adoc[]

docs/00-preamble/copyright.adoc

Lines changed: 0 additions & 54 deletions
This file was deleted.

docs/curriculum-foundation.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ include::config/i18n-definitions.adoc[tags={language}]
2222

2323
<<<
2424
:sectnums!:
25-
include::00-preamble/copyright.adoc[{include_configuration}]
25+
include::../license-copyright/copyright.adoc[{include_configuration}]
2626

2727
<<<
2828
// put table of contents right behind copyright page

license-copyright

Submodule license-copyright added at e0420d7

0 commit comments

Comments
 (0)