Skip to content

Commit 741c683

Browse files
Merge branch 'development' into hotfix/2.14.4
2 parents b0e42c7 + 0a2de89 commit 741c683

File tree

3 files changed

+20
-9
lines changed

3 files changed

+20
-9
lines changed

CHANGELOG.rst

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,17 @@ Changelog
44

55
This project adheres to `Semantic Versioning <https://semver.org/>`_.
66

7+
2.15.0-SNAPSHOT (2021-10-27)
8+
----------------------------
9+
10+
**Added**
11+
12+
**Fixed**
13+
14+
**Dependencies**
15+
16+
**Deprecated**
17+
718
2.14.4 (2022-01-04)
819
-------------------
920

docs/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@
5555
# the built documents.
5656
#
5757
# The short X.Y version.
58-
version = '2.14.0'
58+
version = '2.15.0-SNAPSHOT'
5959
# The full version, including alpha/beta/rc tags.
60-
release = '2.14.0'
60+
release = '2.15.0-SNAPSHOT'
6161

6262
# The language for content autogenerated by Sphinx. Refer to documentation
6363
# for a list of supported languages.

pom.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
66
<modelVersion>4.0.0</modelVersion>
77

8-
<groupId>life.qbic</groupId>
9-
<artifactId>data-model-lib</artifactId>
10-
<version>2.14.4</version> <!-- <<QUBE_FORCE_BUMP>> -->
11-
<name>data-model-lib</name>
12-
<url>http://github.com/qbicsoftware/data-model-lib</url>
13-
<description>Data models. A collection of QBiC's central data models and DTOs.</description>
14-
<packaging>jar</packaging>
8+
<groupId>life.qbic</groupId>
9+
<artifactId>data-model-lib</artifactId>
10+
<version>2.15.0-SNAPSHOT</version> <!-- <<QUBE_FORCE_BUMP>> -->
11+
<name>data-model-lib</name>
12+
<url>http://github.com/qbicsoftware/data-model-lib</url>
13+
<description>Data models. A collection of QBiC's central data models and DTOs. </description>
14+
<packaging>jar</packaging>
1515

1616
<properties>
1717
<maven.compiler.source>1.8</maven.compiler.source>

0 commit comments

Comments
 (0)