diff --git a/CHANGELOG.md b/CHANGELOG.md index 504eec18085082a1fbc1ff8b80fa91f2c3166bf5..e13710c75907fc4ebd780bab8b543a8c74ce4caf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ 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.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [0.12.0] - 2023-10-24 +## [0.12.0] - 2023-10-25 (Timm Fitschen) ### Fixed diff --git a/CITATION.cff b/CITATION.cff index 962c0cfce8443708de4094ea83658bd468ada26d..a7c72943398fe58430003e8412d7d01e911c9f43 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -23,6 +23,6 @@ authors: given-names: Stefan orcid: https://orcid.org/0000-0001-7214-8125 title: "CaosDB - Server" -version: 0.11.0 +version: 0.12.0 doi: 10.3390/data4020083 -date-released: 2023-10-13 +date-released: 2023-10-25 diff --git a/RELEASE_GUIDELINES.md b/RELEASE_GUIDELINES.md index 1b5ae48906d4e8328064ecaf7e7c4f7a4a2bd20f..2da13c6e38e22085af912f267032c0d4973300b3 100644 --- a/RELEASE_GUIDELINES.md +++ b/RELEASE_GUIDELINES.md @@ -26,18 +26,20 @@ guidelines of the CaosDB Project 5. Merge the release branch into the main branch. -6. Tag the latest commit of the main branch with `v<VERSION>`. +6. Wait for the main branch pipelines to pass. -7. Delete the release branch. +7. Tag the latest commit of the main branch with `v<VERSION>`. -8. Merge the main branch back into the dev branch. +8. Delete the release branch. -9. Update the versions for the next developement round: +9. Merge the main branch back into the dev branch. + +10. Update the versions for the next developement round: * [pom.xml](./pom.xml) with a `-SNAPSHOT` suffix * `src/doc/conf.py` * `CHANGELOG.md`: Re-add the `[Unreleased]` section. -10. Add a gitlab release in the respective repository: +11. Add a gitlab release in the respective repository: https://gitlab.indiscale.com/caosdb/src/caosdb-server/-/releases Add a description, which can be a copy&paste from the CHANGELOG, possibly prepended by: diff --git a/pom.xml b/pom.xml index 9573fdf92d0b81b82ca291c6569d7ad3ba37c35d..2607b1ed016c03cfc7788277ae151b5922803669 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.caosdb</groupId> <artifactId>caosdb-server</artifactId> - <version>0.11.1-SNAPSHOT</version> + <version>0.12.0</version> <packaging>jar</packaging> <name>CaosDB Server</name> <scm> diff --git a/src/doc/conf.py b/src/doc/conf.py index 7e5e62367b2d6682bbd345554334bfb5b11571a4..57b60c2bd6922af2bcb26f464e41392cd0c89ac8 100644 --- a/src/doc/conf.py +++ b/src/doc/conf.py @@ -26,9 +26,9 @@ copyright = '2023, IndiScale GmbH' author = 'Daniel Hornung, Timm Fitschen' # The short X.Y version -version = '0.11.1' +version = '0.12.0' # The full version, including alpha/beta/rc tags -release = '0.11.1-SNAPSHOT' +release = '0.12.0' # -- General configuration ---------------------------------------------------