From 0f21010486a4a5cb86289eba1c979141019cd824 Mon Sep 17 00:00:00 2001 From: Timm Fitschen <t.fitschen@indiscale.com> Date: Wed, 10 Feb 2021 20:38:53 +0100 Subject: [PATCH] REL: preparing release --- CHANGELOG.md | 14 ++++++++++++++ DEPENDENCIES.md | 4 ++++ RELEASE_GUIDELINES.md | 6 ++++++ caosdb-webui | 2 +- conf/core/server.conf | 2 +- pom.xml | 2 +- 6 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 DEPENDENCIES.md diff --git a/CHANGELOG.md b/CHANGELOG.md index 7c862661..205fd391 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added +### Changed + +### Deprecated + +### Removed + +### Fixed + +### Security + +## [0.3] - 2021-02-10 + +### Added + * New version history feature. The "H" container flag retrieves the full version history during a transaction (e.g. during Retrievals) and constructs a tree of successors and predecessors of the requested entity version. diff --git a/DEPENDENCIES.md b/DEPENDENCIES.md new file mode 100644 index 00000000..3744c7b7 --- /dev/null +++ b/DEPENDENCIES.md @@ -0,0 +1,4 @@ +* caosdb-mysqlbackend == 4.0.0 +* Java 11 +* Apache Maven >= 3.6.0 +* make >= 4.2.0 diff --git a/RELEASE_GUIDELINES.md b/RELEASE_GUIDELINES.md index 234ff24f..d6c4cabb 100644 --- a/RELEASE_GUIDELINES.md +++ b/RELEASE_GUIDELINES.md @@ -18,6 +18,9 @@ guidelines of the CaosDB Project 2. Check all general prerequisites. +3. Update the version property in [pom.xml](./pom.xml) (probably this means to + remove the `-SNAPSHOT`. + 4. Merge the release branch into the master branch. 5. Tag the latest commit of the master branch with `v<VERSION>`. @@ -25,3 +28,6 @@ guidelines of the CaosDB Project 6. Delete the release branch. 7. Merge the master branch back into the dev branch. + +8. Update the version property in [pom.xml](./pom.xml) for the next + developlement round (with a `-SNAPSHOT` suffix). diff --git a/caosdb-webui b/caosdb-webui index 82315e11..8c59cc86 160000 --- a/caosdb-webui +++ b/caosdb-webui @@ -1 +1 @@ -Subproject commit 82315e1199bd5adcf584f61bfde167bd05624172 +Subproject commit 8c59cc861d646cbdba0ec749ba052656f67fd58d diff --git a/conf/core/server.conf b/conf/core/server.conf index 039284de..ab5d1fb0 100644 --- a/conf/core/server.conf +++ b/conf/core/server.conf @@ -68,7 +68,7 @@ MYSQL_USER_NAME=caosdb # Password for the user MYSQL_USER_PASSWORD=caosdb # Schema of mysql procedures and tables which is required by this CaosDB instance -MYSQL_SCHEMA_VERSION=v4.0.0-rc2 +MYSQL_SCHEMA_VERSION=v4.0.0 # -------------------------------------------------- diff --git a/pom.xml b/pom.xml index 7b229e51..4555112f 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.3-SNAPSHOT</version> + <version>0.3</version> <packaging>jar</packaging> <name>CaosDB Server</name> <properties> -- GitLab