Merge branch 'release-0.12.2' into 'main'

Release 0.12.2

See merge request !117

CHANGELOG.md

@@ -5,6 +5,14 @@ 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.2] - 2024-03-18
+
+### Fixed
+
+* Unknown error when trying to access the user list.
+  [linkahead-server#250](https://gitlab.com/linkahead/linkahead-server/-/issues/250)
+* Legacy integer ids are incremented by 1 again, not by 2.
+
 ## [0.12.1] - 2023-12-13
 (Timm Fitschen)
 

CITATION.cff

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

README_SETUP.md

@@ -241,6 +241,7 @@ Stand-alone documentation is built using Sphinx: `make doc`
 - recommonmark
 - sphinx
 - sphinx-rtd-theme
+- sphinx-a4doc
 - sphinxcontrib-plantuml
 - javasphinx :: `pip3 install --user javasphinx`
   - Alternative, if javasphinx fails because python3-sphinx is too recent:

pom.xml

@@ -25,7 +25,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.caosdb</groupId>
   <artifactId>caosdb-server</artifactId>
-  <version>0.12.1</version>
+  <version>0.12.2</version>
   <packaging>jar</packaging>
   <name>CaosDB Server</name>
   <scm>

requirements-docs.txt

+sphinx-rtd-theme
+sphinxcontrib-plantuml
+javasphinx
+sphinx-a4doc

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.1'
+version = '0.12.2'
 # The full version, including alpha/beta/rc tags
-release = '0.12.1'
+release = '0.12.2'
 
 
 # -- General configuration ---------------------------------------------------

src/doc/index.rst

@@ -19,7 +19,9 @@ Welcome to caosdb-server's documentation!
    Changelog <CHANGELOG>
    specification/index.rst
    Glossary
-   Server Internals<_apidoc/packages>
+   Server Internals <_apidoc/packages>
+   Related Projects <related_projects/index>
+   Back to overview <https://docs.indiscale.com/>
 
 Welcome to the CaosDB, the flexible semantic data management toolkit!
 

src/doc/related_projects/index.rst

+Related Projects
+++++++++++++++++
+
+.. toctree::
+   :maxdepth: 2
+   :caption: Contents:
+   :hidden:
+
+.. container:: projects
+
+   For in-depth documentation for users, administrators  and developers, you may want to visit the subproject-specific documentation pages for:
+
+   :`MySQL backend <https://docs.indiscale.com/caosdb-mysqlbackend>`_: The MySQL/MariaDB components of the LinkAhead server.
+
+   :`WebUI <https://docs.indiscale.com/caosdb-webui>`_: The default web frontend for the LinkAhead server.
+
+   :`PyLinkAhead <https://docs.indiscale.com/caosdb-pylib>`_: The LinkAhead Python library.
+
+   :`Advanced user tools <https://docs.indiscale.com/caosdb-advanced-user-tools>`_: The advanced Python tools for LinkAhead.
+
+   :`LinkAhead Crawler <https://docs.indiscale.com/caosdb-crawler/>`_: The crawler is the main tool for automatic data integration in LinkAhead.
+
+   :`LinkAhead <https://docs.indiscale.com/caosdb-deploy>`_: Your all inclusive LinkAhead software package.
+
+   :`Back to Overview <https://docs.indiscale.com/>`_: LinkAhead Documentation.

src/main/java/org/caosdb/server/database/backend/implementation/MySQL/MySQLListUsers.java

@@ -54,7 +54,7 @@ public class MySQLListUsers extends MySQLTransaction implements ListUsersImpl {
           user.realm = rs.getString("realm");
           user.email = rs.getString("email");
           user.entity = rs.getString("entity");
-          if (user.entity.isBlank() || user.entity.equals("0")) {
+          if (user.entity == null || user.entity.isBlank() || user.entity.equals("0")) {
             user.entity = null;
           }
           user.status = UserStatus.valueOf(rs.getString("status"));

src/main/java/org/caosdb/server/entity/LegacyIds.java

@@ -60,7 +60,6 @@ public class LegacyIds extends EntityIdRegistryStrategy {
     if (!isInit) {
       init();
     }
-    ++currentMaxId;
     return Integer.toString(++currentMaxId);
   }
 

src/test/docker/Dockerfile

@@ -6,7 +6,8 @@ RUN apt-get update && \
     libtiff5-dev libjpeg-dev libopenjp2-7-dev zlib1g-dev \
     libfreetype6-dev liblcms2-dev libwebp-dev tcl8.6-dev tk8.6-dev python3-tk \
     libharfbuzz-dev libfribidi-dev libxcb1-dev \
-    python3-pip screen libpam0g-dev unzip curl shunit2
+    python3-pip screen libpam0g-dev unzip curl shunit2 \
+	python3-lxml libxml2-dev libxslt-dev
 
 RUN apt-get install -y \
   libcairo2-dev