Merge branch 'dev' into f-grpc-f-acm

CHANGELOG.md

@@ -5,6 +5,20 @@ 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).
 
+## [Unreleased]
+
+### Added
+
+### Changed
+
+### Deprecated
+
+### Removed
+
+### Fixed
+
+### Security
+
 ## [v0.6.0] - 2021-11-17
 (Timm Fitschen)
 

pom.xml

@@ -25,7 +25,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.caosdb</groupId>
   <artifactId>caosdb-server</artifactId>
-  <version>0.6.1-SNAPSHOT</version>
+  <version>0.7.0-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>CaosDB Server</name>
   <scm>
@@ -35,7 +35,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.build.testSourceDirectory>src/test/java</project.build.testSourceDirectory>
     <protobuf.version>3.14.0</protobuf.version>
-    <grpc.version>1.38.1</grpc.version>
+    <grpc.version>1.42.1</grpc.version>
     <netty-tcnative.version>2.0.34.Final</netty-tcnative.version>
     <restlet.version>2.4.3</restlet.version>
   </properties>

src/doc/CHANGELOG.md

+../../CHANGELOG.md
\ No newline at end of file

src/doc/conf.py

@@ -25,9 +25,9 @@ copyright = '2020, IndiScale GmbH'
 author = 'Daniel Hornung'
 
 # The short X.Y version
-version = '0.6'
+version = '0.7'
 # The full version, including alpha/beta/rc tags
-release = '0.6.0'
+release = '0.7.0-SNAPSHOT'
 
 
 # -- General configuration ---------------------------------------------------

src/doc/index.rst

@@ -14,6 +14,7 @@ Welcome to caosdb-server's documentation!
    administration
    Development <development/devel>
    Dependencies <DEPENDENCIES>
+   Changelog <CHANGELOG>
    specification/index.rst
    Glossary
    API documentation<_apidoc/packages>