DOC: update changelog, fix webui

CHANGELOG.md

@@ -9,6 +9,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+### Changed
+
+### Deprecated
+
+### Removed
+
+### Fixed
+
+### Security
+
+## v0.2 (2020-09-02)
+
+### Added
+
 - Support for deeply nested selectors in SELECT queries.
 - One-time Authentication Tokens for login without credentials and login with
   particular permissions and roles for the course of the session.
@@ -41,8 +55,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Removed
 
-- 
-
 ### Fixed
 
 * #51 - name queries (e.g. `FIND ENTITY WITH name = ...`)
@@ -64,7 +76,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   processes on the same machine.
 - #68 - Shadow sensitive information when logging for debugging purposes.
 
-
 ## [0.1.0] - 2018-10-09
 
 Tag `v0.1` - Commit 3b17b49

caosdb-webui @ 7197378e

-Subproject commit 66026626089e2b514538510a1a6744868f46b661
+Subproject commit 7197378e3df69f3497ed457905ed11180c3c2248

makefile

@@ -23,31 +23,31 @@
 # ** end header
 #
 
-CAOSDB_SERVER_VERSION ?= $(mvn org.apache.maven.plugins:maven-help-plugin:3.1.0:evaluate -Dexpression=project.version -q -DforceStdout)
+CAOSDB_SERVER_VERSION ?= $(shell mvn org.apache.maven.plugins:maven-help-plugin:3.1.0:evaluate -Dexpression=project.version -q -DforceStdout)
 SHELL:=/bin/bash
 JPDA_PORT ?= 9000
 JMX_PORT ?= 9090
 
-echoversion:
-	echo $(CAOSDB_SERVER_VERSION)
-
-compile: easy-units
+compile: print-version easy-units
 	mvn compile
 
-runserver:
+print-version:
+	@echo "This is CaosDB $(CAOSDB_SERVER_VERSION)"
+
+runserver: print-version
 	mvn exec:java@run
 
 run: compile
 	mvn exec:java@run
 
-run-debug: jar
-	java -Xrunjdwp:transport=dt_socket,address=0.0.0.0:$(JPDA_PORT),server=y,suspend=n -Dcaosdb.debug=true -jar target/caosdb-server-0.1-SNAPSHOT-jar-with-dependencies.jar
+run-debug: print-version jar
+	java -Xrunjdwp:transport=dt_socket,address=0.0.0.0:$(JPDA_PORT),server=y,suspend=n -Dcaosdb.debug=true -jar target/caosdb-server-$(CAOSDB_SERVER_VERSION)-jar-with-dependencies.jar
 
-run-debug-single:
-	java -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=$(JMX_PORT) -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false -Xrunjdwp:transport=dt_socket,address=0.0.0.0:$(JPDA_PORT),server=y,suspend=n -Dcaosdb.debug=true -jar target/caosdb-server-0.1-SNAPSHOT-jar-with-dependencies.jar
+run-debug-single: print-version
+	java -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=$(JMX_PORT) -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false -Xrunjdwp:transport=dt_socket,address=0.0.0.0:$(JPDA_PORT),server=y,suspend=n -Dcaosdb.debug=true -jar target/caosdb-server-$(CAOSDB_SERVER_VERSION)-jar-with-dependencies.jar
 
-run-single:
-	java -jar target/caosdb-server-0.1-SNAPSHOT-jar-with-dependencies.jar
+run-single: print-version
+	java -jar target/caosdb-server-$(CAOSDB_SERVER_VERSION)-jar-with-dependencies.jar
 
 formatting:
 	mvn fmt:format
@@ -60,7 +60,7 @@ jar: easy-units
 antlr:
 	mvn antlr4:antlr4
 
-test: easy-units
+test: print-version easy-units
 	MAVEN_DEBUG_OPTS="-Xdebug -Xnoagent -Djava.compiler=NONE -Dcaosdb.debug=true -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=0.0.0.0:9000"
 	mvn test -X
 

pom.xml

@@ -205,7 +205,7 @@
               <transformers>
                 <transformer implementation="com.github.edwgiz.mavenShadePlugin.log4j2CacheTransformer.PluginsCacheFileTransformer"></transformer>
                 <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                  <mainClass>caosdb.server.CaosDBServer</mainClass>
+                  <mainClass>org.caosdb.server.CaosDBServer</mainClass>
                 </transformer>
               </transformers>
             </configuration>
@@ -272,7 +272,7 @@
               <goal>java</goal>
             </goals>
             <configuration>
-              <mainClass>caosdb.server.CaosDBServer</mainClass>
+              <mainClass>org.caosdb.server.CaosDBServer</mainClass>
               <arguments>
                 <argument>silent</argument>
               </arguments>
@@ -284,7 +284,7 @@
               <goal>java</goal>
             </goals>
             <configuration>
-              <mainClass>caosdb.server.CaosDBServer</mainClass>
+              <mainClass>org.caosdb.server.CaosDBServer</mainClass>
               <arguments>
                 <argument>silent</argument>
               </arguments>