Merge branch 'dev' into f-string-ids

CHANGELOG.md

@@ -17,13 +17,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+### Security
+
+## [0.12.0] - 2023-10-25
+(Timm Fitschen)
+
+### Fixed
+
 * `FIND ENTITY <ID> is broken`.
   [linkahead-server#323](https://gitlab.indiscale.com/caosdb/src/caosdb-server/-/issues/323)
 * Unknown Server Error when inserting an Entity.
   [linkahead-mariadbbackend](https://gitlab.indiscale.com/caosdb/src/caosdb-mysqlbackend/-/issues/48)
 
-### Security
-
 ## [0.11.0] 2023-10-13 ##
 
 ### Added ###

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

DEPENDENCIES.md

@@ -3,7 +3,7 @@
 ## For Building and Running the Server
 
 * `>=caosdb-proto 0.3.0`
-* `>=caosdb-mysqlbackend 5.0.0`
+* `>=caosdb-mysqlbackend 7.0.0`
 * `>=Java 11`
 * `>=Apache Maven 3.6.0`
 * `>=Make 4.2`
@@ -13,7 +13,7 @@
 
 ## For Deploying a Web User Interface (optional)
 
-* `>=caosdb-webui 0.8.0`
+* `>=caosdb-webui 0.13.0`
 
 ## For Building the Documentation (optional)
 

RELEASE_GUIDELINES.md

@@ -26,23 +26,25 @@ 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:
-    https://gitlab.indiscale.com/caosdb/src/caosdb-server/-/releases
+11. Add a gitlab release in the respective repository:
+    https://gitlab.com/linkahead/linkahead-server/-/releases
 
     Add a description, which can be a copy&paste from the CHANGELOG, possibly prepended by:
     ```md
 # Changelog
 
-[See full changelog](https://gitlab.indiscale.com/caosdb/src/caosdb-server/-/blob/${TAG}/CHANGELOG.md)
+[See full changelog](https://gitlab.com/linkahead/linkahead-server/-/blob/${TAG}/CHANGELOG.md)
     ```

caosdb-webui @ d5f9090e

-Subproject commit e6fef9f35da49dfea5b11f99b872d15c35fd043d
+Subproject commit d5f9090eca25a92fc44dbeeba305768e8d9f4bcb

conf/core/server.conf

@@ -69,7 +69,7 @@ MYSQL_USER_NAME=caosdb
 # Password for the user
 MYSQL_USER_PASSWORD=random1234
 # Schema of mysql procedures and tables which is required by this CaosDB instance
-MYSQL_SCHEMA_VERSION=v6.1
+MYSQL_SCHEMA_VERSION=v7.0
 
 
 # --------------------------------------------------

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.13.0-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>CaosDB Server</name>
   <scm>

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.13.0'
 # The full version, including alpha/beta/rc tags
-release = '0.11.1-SNAPSHOT'
+release = '0.13.0-dev'
 
 
 # -- General configuration ---------------------------------------------------