Skip to content
Snippets Groups Projects
Commit d4e0cb6d authored by Daniel Hornung's avatar Daniel Hornung
Browse files

FIX: Workaround in `make jar` for Debian bug in Maven.

parent 3c2683b2
No related branches found
No related tags found
2 merge requests!119FIX: Workaround in `make jar` for Debian bug in Maven.,!118Debian 12: Workaround in `make jar` for Debian bug in Maven.
Pipeline #55593 passed
...@@ -23,7 +23,9 @@ ...@@ -23,7 +23,9 @@
# ** end header # ** 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 ?= CAOSDB_COMMAND_LINE_OPTIONS ?=
SHELL:=/bin/bash SHELL:=/bin/bash
JPDA_PORT ?= 9000 JPDA_PORT ?= 9000
...@@ -59,7 +61,7 @@ formatting: ...@@ -59,7 +61,7 @@ formatting:
jar: print-version easy-units jar: print-version easy-units
mvn -e package -DskipTests mvn -e package -DskipTests
@pushd target ; \ @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 popd
antlr: antlr:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment