Skip to content

Commit 7594aa1

Browse files
committed
Prepare release 4.0.0-beta
1 parent 0a71468 commit 7594aa1

File tree

4 files changed

+9
-19
lines changed

4 files changed

+9
-19
lines changed

CHANGELOG.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/)
66
and this project adheres to [Semantic Versioning](https://semver.org/).
77

8-
## [Unreleased]
8+
## [4.0.0-beta] – 2024-09-02
99

1010
### Added
1111

@@ -217,7 +217,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/).
217217

218218
First release of Markdown Architectural Decision Records.
219219

220-
[Unreleased]: https://github.com/adr/madr/compare/3.0.0...develop
220+
[4.0.0-beta]: https://github.com/adr/madr/compare/3.0.0...4.0.0-beta
221221
[3.0.0]: https://github.com/adr/madr/compare/3.0.0-beta.2...3.0.0
222222
[3.0.0-beta.2]: https://github.com/adr/madr/compare/3.0.0-beta...3.0.0-beta.2
223223
[3.0.0-beta]: https://github.com/adr/madr/compare/2.1.2...3.0.0-beta

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ In case you get errors regarding `Gemfile.lock`, just delete `Gemfile.lock` and
8181
3. Commit ("Update examples and decisions") and push. Possibly as pull request.
8282
4. Adapt the version reference in `template/0000-use-madr.md`.
8383
5. Update "template" files in in `docs/decisions/`
84-
* Copy `template/0000-use-madr.md` to `docs/decisions/0000-use-madr.md`.
84+
* Copy `template/0000-use-markdown-architectural-decision-records.md` to `docs/decisions/0000-use-markdown-architectural-decision-records.md`.
8585
* Adapt content of `docs/decisions/adr-template.md` based on `template/adr-template.md`.
8686
Thereby, ensure that the YAML front matter in `docs/decisions/adr-template.md` is kept.
8787
6. Add link to `docs/index.md` at "Older versions" (for the homepage).

docs/decisions/0000-use-madr.md renamed to docs/decisions/0000-use-markdown-architectural-decision-records.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
---
2-
parent: Decisions
3-
nav_order: 0
4-
---
51
# Use Markdown Architectural Decision Records
62

73
## Context and Problem Statement
@@ -23,7 +19,7 @@ Chosen option: "MADR 4.0.0", because
2319

2420
* Implicit assumptions should be made explicit.
2521
Design documentation is important to enable people understanding the decisions later on.
26-
See also [A rational design process: How and why to fake it](https://doi.org/10.1109/TSE.1986.6312940).
22+
See also ["A rational design process: How and why to fake it"](https://doi.org/10.1109/TSE.1986.6312940).
2723
* MADR allows for structured capturing of any decision.
2824
* The MADR format is lean and fits our development style.
2925
* The MADR structure is comprehensible and facilitates usage & maintenance.

docs/decisions/adr-template.md

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,11 @@ title: ADR Template
1313
---
1414
<!-- we need to disable MD025, because we use the different heading "ADR Template" in the homepage (see above) than it is foreseen in the template -->
1515
<!-- markdownlint-disable-next-line MD025 -->
16-
# {short title of solved problem and solution}
16+
# {short title, representative of solved problem and found solution}
1717

1818
## Context and Problem Statement
1919

20-
{Describe the context and problem statement, e.g., in free form using two to three sentences or in the form of an illustrative story.
21-
You may want to articulate the problem in form of a question and add links to collaboration boards or issue management systems.}
20+
{Describe the context and problem statement, e.g., in free form using two to three sentences or in the form of an illustrative story. You may want to articulate the problem in form of a question and add links to collaboration boards or issue management systems.}
2221

2322
<!-- This is an optional element. Feel free to remove. -->
2423
## Decision Drivers
@@ -36,8 +35,7 @@ title: ADR Template
3635

3736
## Decision Outcome
3837

39-
Chosen option: "{title of option 1}", because
40-
{justification. e.g., only option, which meets k.o. criterion decision driver | which resolves force {force} | … | comes out best (see below)}.
38+
Chosen option: {title of option 1}, because {justification. e.g., only option, which meets k.o. criterion decision driver | which resolves force {force} | … | comes out best (see below)}.
4139

4240
<!-- This is an optional element. Feel free to remove. -->
4341
### Consequences
@@ -49,8 +47,7 @@ Chosen option: "{title of option 1}", because
4947
<!-- This is an optional element. Feel free to remove. -->
5048
### Confirmation
5149

52-
{Describe how the implementation of/compliance with the ADR is confirmed. E.g., by a review or an ArchUnit test.
53-
Although we classify this element as optional, it is included in most ADRs.}
50+
{Describe how the implementation of/compliance with the ADR can/will be confirmed. Are the design that was decided for and its implementation in line with the decision made? E.g., a design/code review or a test with a library such as ArchUnit can help validate this. Not that although we classify this element as optional, it is included in many ADRs.}
5451

5552
<!-- This is an optional element. Feel free to remove. -->
5653
## Pros and Cons of the Options
@@ -80,7 +77,4 @@ Chosen option: "{title of option 1}", because
8077
<!-- This is an optional element. Feel free to remove. -->
8178
## More Information
8279

83-
{You might want to provide additional evidence/confidence for the decision outcome here and/or
84-
document the team agreement on the decision and/or
85-
define when/how this decision should be realized and if/when it should be re-visited.
86-
Links to other decisions and resources might appear here as well.}
80+
{You might want to provide additional evidence/confidence for the decision outcome here and/or document the team agreement on the decision and/or define when/how this decision the decision should be realized and if/when it should be re-visited. Links to other decisions and resources might appear here as well.}

0 commit comments

Comments
 (0)