prepare release sprint 109 (#2837)

René Reitmann · René Reitmann · commit 2cb1f0b4b875 · 2021-05-03T11:28:50.000+02:00
diff --git a/docs/source/javadoc/eu/dzhw/fdz/metadatamanagement/datasetmanagement/domain/DataFormat.rst b/docs/source/javadoc/eu/dzhw/fdz/metadatamanagement/datasetmanagement/domain/DataFormat.rst
@@ -10,6 +10,12 @@ DataFormat
 
 Enum Constants
 --------------
+CSV
+^^^
+
+.. java:field:: public static final DataFormat CSV
+   :outertype: DataFormat
+
 R
 ^
 
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,10 +1,6 @@
 {
   "name": "Metadatamanagement",
-<<<<<<< HEAD
-  "version": "1.0.108-HOTFIX",
-=======
-  "version": "1.0.109-SNAPSHOT",
->>>>>>> test
+  "version": "1.0.109",
   "description": "Data Search for Higher Education Research and Science Studies",
   "private": true,
   "dependencies": {
diff --git a/pom.xml b/pom.xml
@@ -11,11 +11,7 @@
 
     <groupId>eu.dzhw.fdz</groupId>
     <artifactId>metadatamanagement</artifactId>
-<<<<<<< HEAD
-    <version>1.0.108-HOTFIX</version>
-=======
-    <version>1.0.109-SNAPSHOT</version>
->>>>>>> test
+    <version>1.0.109</version>
     <packaging>war</packaging>
     <name>metadatamanagement</name>
 
diff --git a/src/main/webapp/scripts/app.constants.js b/src/main/webapp/scripts/app.constants.js
@@ -6,11 +6,7 @@ angular.module('metadatamanagementApp')
 
 .constant('ENV', 'local')
 
-<<<<<<< HEAD
-.constant('VERSION', '1.0.108-HOTFIX')
-=======
-.constant('VERSION', '1.0.109-SNAPSHOT')
->>>>>>> test
+.constant('VERSION', '1.0.109')
 
 .constant('ElasticSearchProperties', {apiVersion:'7.x',logLevel:'error',pageSize:10})
 

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,12 @@ DataFormat`
`10`	`10`
`11`	`11`	`Enum Constants`
`12`	`12`	`--------------`
	`13`	`+CSV`
	`14`	`+^^^`
	`15`	`+`
	`16`	`+.. java:field:: public static final DataFormat CSV`
	`17`	`+ :outertype: DataFormat`
	`18`	`+`
`13`	`19`	`R`
`14`	`20`	`^`
`15`	`21`