diff --git a/CHANGELOG.md b/CHANGELOG.md index 1a5ce7c8bc218db5278be5914c111a70f4ba6b1a..2c89bcc0302a6588280f04fbbbe53da7812a9908 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ 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.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 diff --git a/CITATION.cff b/CITATION.cff index 263a87208f2201b2aeb0038fc82019a621b1f3af..136d276351cfaae3bd56c1b7de25a9ce93682e0e 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.12.2 +version: 0.12.3 doi: 10.3390/data4020083 -date-released: 2024-03-18 +date-released: 2024-09-25 diff --git a/Makefile b/Makefile index 29b7d5a51cb110e35f999da0a7c6b366b5bd0d05..aebef7015406900cd566b9dc2298aafb2974805c 100644 --- a/Makefile +++ b/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: diff --git a/pom.xml b/pom.xml index 9fe424c144419a774b53144af2d0f977d7ea50e2..351993fed71b425de6045e49bf4a2b4138eda20f 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.12.2</version> + <version>0.12.3</version> <packaging>jar</packaging> <name>CaosDB Server</name> <scm> diff --git a/src/doc/conf.py b/src/doc/conf.py index a8167d4da6cc24865aba836056f2c5da58eec880..529b5ff9c4152106b869b2f731b6eafd3e031fbf 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.12.2' +version = '0.12.3' # The full version, including alpha/beta/rc tags -release = '0.12.2' +release = '0.12.3' # -- General configuration ---------------------------------------------------