Merge branch 'dev' into f-remove-dropoffbox

CHANGELOG.md

@@ -19,6 +19,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Security
 
+## [0.13.0] - 2024-10-24
+
+### Changed
+
+* Update LinkAhead MariaDB Backend to [version
+  8.0.0](https://gitlab.com/linkahead/linkahead-mariadbbackend/-/releases/v8.0.0)
+  to make LinkAhead compatible to MariaDB >= 10.6. Old SQL dumps may
+  be incompatible to MariaDB 10.6 and above; see
+  [`update_dumps/README.md`](https://gitlab.com/linkahead/linkahead-mariadbbackend/-/blob/main/dump_updates/README.md?ref_type=heads)
+  in the LinkAhead MariaDB Backend repo for more information and a
+  script to update incompatible dumps.
+
+## [0.12.3] - 2024-09-25
+
+### Fixed
+
+* Workaround in `make jar` for Debian bug https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1039607
+
 ## [0.12.2] - 2024-03-18
 
 ### Fixed
@@ -91,14 +109,14 @@ sensitive information. See the bug reports for more information.
 * The default behavior of the query `FIND SomeName [...]` (as well as COUNT and SELECT) is being
   made configurable and changes:
   * `FIND SomeName` will be interpreted as `FIND <FIND_QUERY_DEFAULT_ROLE>
-    SomeName` from now on where `FIND_QUERY_DEFAULT_ROLE` is a newly introduced
-    server property.
+	SomeName` from now on where `FIND_QUERY_DEFAULT_ROLE` is a newly introduced
+	server property.
   * The new `FIND_QUERY_DEFAULT_ROLE` server property defaults to `RECORD`
-    which is why the behavior of the server api has a **breaking change**.
+	which is why the behavior of the server api has a **breaking change**.
   * The semantics of `FIND *` are affected as well. `FIND *` is equivalent to
-    `FIND <FIND_QUERY_DEFAULT_ROLE>`.
+	`FIND <FIND_QUERY_DEFAULT_ROLE>`.
   * Of course, administrators can choose to retain the old behavior by setting
-    `FIND_QUERY_DEFAULT_ROLE=ENTITY`.
+	`FIND_QUERY_DEFAULT_ROLE=ENTITY`.
 * CQL now treats `WITH` and `WITH A` equivalently. Issue: [#192](https://gitlab.com/caosdb/caosdb-server/-/issues/192)
 * The InsertFilesInDir FlagJob now creates File entities without a name.  The previous behavior
   caused severe performance problems for very large numbers of files. Issue: [#197](https://gitlab.com/caosdb/caosdb-server/-/issues/197)
@@ -304,12 +322,12 @@ process. It is identical to v0.7.1
   "authentication" header.
   Notable limitations of the current implementation of the API:
   * It is currently not possible to mix retrievals
-    (caosdb.entity.v1.RetrieveRequest) with any other transaction type - so
-    transaction are either read-only or write-only. The server throws an error
-    if it finds mixed read/write transactions.
+	(caosdb.entity.v1.RetrieveRequest) with any other transaction type - so
+	transaction are either read-only or write-only. The server throws an error
+	if it finds mixed read/write transactions.
   * It is currently not possible to have more that one query
-    (caosdb.entity.v1.Query) in a single transaction. The server throws an
-    error if it finds more than one query.
+	(caosdb.entity.v1.Query) in a single transaction. The server throws an
+	error if it finds more than one query.
 
 
 ### Changed

CITATION.cff

@@ -23,6 +23,6 @@ authors:
     given-names: Stefan
     orcid: https://orcid.org/0000-0001-7214-8125
 title: "CaosDB - Server"
-version: 0.12.2
+version: 0.12.3
 doi: 10.3390/data4020083
-date-released: 2024-03-18
+date-released: 2024-09-25

DEPENDENCIES.md

@@ -3,7 +3,7 @@
 ## For Building and Running the Server
 
 * `>=caosdb-proto 0.3.0`
-* `>=caosdb-mysqlbackend 7.0.0`
+* `>=caosdb-mysqlbackend 8.0.0`
 * `>=Java 11`
 * `>=Apache Maven 3.6.0`
 * `>=Make 4.2`

Makefile

@@ -23,7 +23,9 @@
 # ** end header
 #
 
-CAOSDB_SERVER_VERSION ?= $(shell mvn org.apache.maven.plugins:maven-help-plugin:3.1.0:evaluate -Dexpression=project.version -q -DforceStdout)
+# TODO Remove the "sed" part of the command after the fix of
+# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1039607
+CAOSDB_SERVER_VERSION != mvn org.apache.maven.plugins:maven-help-plugin:3.5.0:evaluate -Dexpression=project.version -q -DforceStdout | sed -e 's/\x1B.*//g'
 CAOSDB_COMMAND_LINE_OPTIONS ?=
 SHELL:=/bin/bash
 JPDA_PORT ?= 9000
@@ -59,7 +61,7 @@ formatting:
 jar: print-version easy-units
 	mvn -e package -DskipTests
 	@pushd target ; \
-		ln -s caosdb-server-$(CAOSDB_SERVER_VERSION)-jar-with-dependencies.jar caosdb-server.jar; \
+		ln -s "caosdb-server-$(CAOSDB_SERVER_VERSION)-jar-with-dependencies.jar" caosdb-server.jar; \
 		popd
 
 antlr:

conf/core/server.conf

@@ -62,7 +62,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=v7.0
+MYSQL_SCHEMA_VERSION=v8.0
 
 
 # --------------------------------------------------

pom.xml

@@ -25,7 +25,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.caosdb</groupId>
   <artifactId>caosdb-server</artifactId>
-  <version>0.12.3-SNAPSHOT</version>
+  <version>0.13.1-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.12.3'
+version = '0.13.1'
 # The full version, including alpha/beta/rc tags
-release = '0.12.3-SNAPSHOT'
+release = '0.13.1-SNAPSHOT'
 
 
 # -- General configuration ---------------------------------------------------