diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md
deleted file mode 100644
index dfbb3e72..00000000
--- a/doc/CHANGELOG.md
+++ /dev/null
@@ -1,157 +0,0 @@
-# Changelog
-All notable changes to this project will be documented in this file.
-
-The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
-and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
-
-## [Unreleased]
-
-### Added
-
-- Added `provides` tags to `module-info.java` files required by ServiceLoader [#336](https://github.com/itsallcode/openfasttrace/issues/336) / [PR 337#](https://github.com/itsallcode/openfasttrace/pull/337)
-- Added XML namespace support to specobject importer [#299](https://github.com/itsallcode/openfasttrace/issues/299) / [PR #300](https://github.com/itsallcode/openfasttrace/pull/300), thanks to [@poldi2015](https://github.com/poldi2015)!
-- Added support for Java 18 [PR #344](https://github.com/itsallcode/openfasttrace/pull/344)
- - Added support for tracing TypeScript files (`.ts`)
-
-### Refactoring
-
-- Renamed `develop` branch to `main` and deleted `master` [#341](https://github.com/itsallcode/openfasttrace/issues/341)
-
-### Continuous Integration Build
-
-- Added builds for macOS and Windows [#340](https://github.com/itsallcode/openfasttrace/issues/340)
-
-### Bugfixes
-
-- Fixed running unit tests under macOS [#308](https://github.com/itsallcode/openfasttrace/issues/308) / [PR #339](https://github.com/itsallcode/openfasttrace/pull/339)
- - Also fixed Jacoco code coverage and integration tests
-
-## [3.6.0] - 2022-08-21
-
-### Added
-
-- Added support for C# files with postfix `.cs` [#326](https://github.com/itsallcode/openfasttrace/issues/326) / [PR #327](https://github.com/itsallcode/openfasttrace/pull/327)
-- Added support for Robot Framework with postfix `.robot` [#302](https://github.com/itsallcode/openfasttrace/issues/302) / [PR #332](https://github.com/itsallcode/openfasttrace/pull/332)
-- Upload self-tracing report to GitHub Action result [#246](https://github.com/itsallcode/openfasttrace/issues/246) / [PR #333](https://github.com/itsallcode/openfasttrace/pull/333)
-- Added `module-info.java` files to support Java modules [#334](https://github.com/itsallcode/openfasttrace/pull/334)
-
-### Refactoring
-
-- Fixed static code analysis warnings in unit tests [PR #329](https://github.com/itsallcode/openfasttrace/pull/329)
-- Upgrade test and build dependencies [PR #330](https://github.com/itsallcode/openfasttrace/pull/330)
-- Removed license headers from sources and license-maven-plugin [PR #331](https://github.com/itsallcode/openfasttrace/pull/331)
-
-## [3.5.0] - 2022-03-17
-
-### Updated
-
-- Use readable names for imported tags with needed coverage [#315](https://github.com/itsallcode/openfasttrace/issues/315) / [PR #316](https://github.com/itsallcode/openfasttrace/pull/316)
-
-### Added
-
-- Added `help` command that prints CLI usage instructions [PR #317](https://github.com/itsallcode/openfasttrace/pull/317)
-
-### Documentation
-
-- Added info about reportsettings and reportToPath to user guide [PR #305](https://github.com/itsallcode/openfasttrace/pull/305), thanks to [jonathanvijayakumar](https://github.com/jonathanvijayakumar) for his contribution!
-
-## [3.4.0] - 2022-01-31
-
-### Added
-
-- Optionally require coverage in Tag importer [#306](https://github.com/itsallcode/openfasttrace/issues/306) / [PR #307](https://github.com/itsallcode/openfasttrace/pull/307)
-
-### Updated
-
-- Upgrade dependencies [#310](https://github.com/itsallcode/openfasttrace/issues/310)
-
-## [3.3.0] - 2021-11-12
-
-### Added
-
-- [Go](https://golang.org/) support for Tag Importer [#294](https://github.com/itsallcode/openfasttrace/issues/294)
-- [PlantUML](https://plantuml.com) support for Tag Importer [#296](https://github.com/itsallcode/openfasttrace/issues/296)
-
-### Fixed
-
-- Support building, testing and running with Java 16 [#287](https://github.com/itsallcode/openfasttrace/issues/287) / [#288](https://github.com/itsallcode/openfasttrace/issues/288)
-
-## [3.2.1] - 2021-07-19
-
-### Upgraded dependencies
-
-- Test dependencies
- - [JUnit](https://github.com/itsallcode/openfasttrace/pull/275)
- - [mockito-junit-jupiter](https://github.com/itsallcode/openfasttrace/pull/284)
- - [equalsverifier](https://github.com/itsallcode/openfasttrace/pull/285)
-- Build dependencies
- - [license-maven-plugin](https://github.com/itsallcode/openfasttrace/pull/276)
- - [flatten-maven-plugin](https://github.com/itsallcode/openfasttrace/pull/278)
- - [maven-javadoc-plugin](https://github.com/itsallcode/openfasttrace/pull/279)
- - [plantuml](https://github.com/itsallcode/openfasttrace/pull/81)
- - [pitest-maven](https://github.com/itsallcode/openfasttrace/pull/282)
- - [maven-deploy-plugin](https://github.com/itsallcode/openfasttrace/pull/283)
-
-## [3.2.0] - 2021-05-30
-
-### Added
-
-- Aspec (augmented specobject) exporter [#260](https://github.com/itsallcode/openfasttrace/issues/260) [#261](https://github.com/itsallcode/openfasttrace/pull/261)
-
-### Changed
-
-- Importing of files for which no importer or more than one importer is found don't let the build fail [#258](https://github.com/itsallcode/openfasttrace/pull/258)
-
-
-## [3.1.0] - 2021-05-20
-
-### Changed
-
-- Added support for JVM languages: Clojure, Kotlin and Scala [#270](https://github.com/itsallcode/openfasttrace/issues/270) [#271](https://github.com/itsallcode/openfasttrace/issues/271)
-
-## [3.0.2]
-
-### Fixed
-
-- Fix deployment to maven central: attributes in pom.xml where missing.
-
-## [3.0.1]
-
-### Fixed
-
-- Published pom files contained invalid version: `${revision}`
-
-## [3.0.0]
-
-### Changed
-
-- Added support for more file types and use Java 11 [#238](https://github.com/itsallcode/openfasttrace/issues/238) [#239](https://github.com/itsallcode/openfasttrace/issues/239)
-- Rename Java packages so that they are unique for each module [#237](https://github.com/itsallcode/openfasttrace/pull/237)
-
-## [2.3.5] - 2019-04-14
-
-### Changed
-
-- New project structure with sub-modules [#213](https://github.com/itsallcode/openfasttrace/issues/216) [#213](https://github.com/itsallcode/openfasttrace/pull/213)
-- Extract reporters into sub-module [#221](https://github.com/itsallcode/openfasttrace/issues/221) [#226](https://github.com/itsallcode/openfasttrace/pull/226)
-- Simplify maven setup [#225](https://github.com/itsallcode/openfasttrace/pull/225) [#224](https://github.com/itsallcode/openfasttrace/issues/224)
-
-### Added
-
-- Pretty print specobjects [#229](https://github.com/itsallcode/openfasttrace/pull/229) [#219](https://github.com/itsallcode/openfasttrace/issues/219)
-
-### Fixed
-
-- Fix maven project deployment [#231](https://github.com/itsallcode/openfasttrace/issues/231) [#231](https://github.com/itsallcode/openfasttrace/pull/232)
-- Export specobject title [#212](https://github.com/itsallcode/openfasttrace/pull/212/) [#209](https://github.com/itsallcode/openfasttrace/issues/209)
-- Fix exit codes [#218](https://github.com/itsallcode/openfasttrace/pull/218) [#215](https://github.com/itsallcode/openfasttrace/issues/215)
-
-## [2.3.4] - 2019-04-14 [YANKED]
-
-## [2.3.3] - 2019-04-14 [YANKED]
-
-## [2.3.2] - 2019-04-05 [YANKED]
-
-## [2.3.1] - 2019-03-31 [YANKED]
-
-## [2.3.0] - 2019-03-31 [YANKED]
diff --git a/doc/changes/changes_2.3.5.md b/doc/changes/changes_2.3.5.md
index ab3de8a7..d0ee2fa7 100644
--- a/doc/changes/changes_2.3.5.md
+++ b/doc/changes/changes_2.3.5.md
@@ -8,7 +8,7 @@ In this release we split OFT into Maven submodules.
## Features
-* #226: Pretty print specobjects
+* #219: Pretty print specobjects
## Bugfixes
diff --git a/doc/changes/changes_3.0.0.md b/doc/changes/changes_3.0.0.md
index 95ac91db..10d0babb 100644
--- a/doc/changes/changes_3.0.0.md
+++ b/doc/changes/changes_3.0.0.md
@@ -11,7 +11,8 @@ We also broadened the support of file types in the `TagImporter`.
## Features
* #238: Added more file suffixes to the `TagImporter`
+* #239: Added file suffix for SQL to the `TagImporter`
## Refactoring
-* #238: Ported to Java 11
+* #237: Ported to Java 11. Renamed Java packages so that they are unique for each module.
diff --git a/doc/changes/changes_3.0.1.md b/doc/changes/changes_3.0.1.md
index 1472f2b9..3ca236e6 100644
--- a/doc/changes/changes_3.0.1.md
+++ b/doc/changes/changes_3.0.1.md
@@ -1,7 +1,7 @@
-# OpenFastTrace 3.0.1
+# OpenFastTrace 3.0.1, Unreleased on GitHub
-Code name: Unreleased on GitHub
+Code name: Fixed POM file versions
## Bugfixes
-* Published pom files contained invalid version: `${revision}`
+* Published POM files contained invalid version: `${revision}`
diff --git a/doc/changes/changes_3.0.2.md b/doc/changes/changes_3.0.2.md
index 57329ffb..4e0db06c 100644
--- a/doc/changes/changes_3.0.2.md
+++ b/doc/changes/changes_3.0.2.md
@@ -1,6 +1,6 @@
-# OpenFastTrace 3.0.2
+# OpenFastTrace 3.0.2, Unreleased on GitHub
-Code name: Unreleased on GitHub
+Code name: Maven Central deployment fix
## Bugfixes
diff --git a/doc/changes/changes_3.2.0.md b/doc/changes/changes_3.2.0.md
index 95238b66..5bf695e5 100644
--- a/doc/changes/changes_3.2.0.md
+++ b/doc/changes/changes_3.2.0.md
@@ -10,4 +10,8 @@ In this release we added an exporter that creates ASPEC documents.
## Features
-* #260: Added ASPEC exporter
\ No newline at end of file
+* #260: Added ASPEC exporter
+
+## Bugfixes
+
+* #258: Importing of files for which no importer or more than one importer is found don't let the build fail
\ No newline at end of file
diff --git a/doc/changes/changes_3.4.0.md b/doc/changes/changes_3.4.0.md
index ef802e70..813995cc 100644
--- a/doc/changes/changes_3.4.0.md
+++ b/doc/changes/changes_3.4.0.md
@@ -8,4 +8,8 @@ With this release you can now optionally require coverage in the `TagImporter`.
## Features
-* #306: Optionally require coverage in `TagImporter`
\ No newline at end of file
+* #306: Optionally require coverage in `TagImporter`
+
+## Dependencies
+
+* 310: Updated dependencies
\ No newline at end of file
diff --git a/doc/changes/changes_3.6.0.md b/doc/changes/changes_3.6.0.md
index eae34bfc..8a87767c 100644
--- a/doc/changes/changes_3.6.0.md
+++ b/doc/changes/changes_3.6.0.md
@@ -1,4 +1,4 @@
-# OpenFastTrace 3.6.0, released
+# OpenFastTrace 3.6.0, released 2022-08-21
Code name: C# and Robot Framework support in `TagImporter`
@@ -18,5 +18,5 @@ We now also upload a self-tracing report as part of the CI build and added suppo
* #246: Upload self-tracing report to GitHub Action result in CI build
* #329: Fixed static code analysis warnings in unit tests
* #330: upgraded test and build dependencies
-* #334: Added `module-info.java` files to support Java modules
* #331: Removed license headers from sources and `license-maven-plugin`
+* #334: Added `module-info.java` files to support Java modules
diff --git a/doc/changes/changes_4.2.0.md b/doc/changes/changes_4.2.0.md
index 9f46e4a1..dc59762c 100644
--- a/doc/changes/changes_4.2.0.md
+++ b/doc/changes/changes_4.2.0.md
@@ -15,4 +15,5 @@ We also added a whole section about understanding and fixing broken links betwee
## Documentation
+* #427: Removed old `CHANGELOG.md` file and merged missing parts into release history
* #431: Documented "unwanted coverage" in user guide.