Merge pull request #353 from ie3-institute/rel/jh/#351-v-2-1-0-SNAPSHOT

set version to 2.1.0

Author: ckittl

CHANGELOG.md

@@ -6,6 +6,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased/Snapshot]
 
+## [2.0.0] - 2021-05-21
+
 ### Added
 -   definition for a default input file directory structure
 -   tarball utils to extract and compress files
@@ -86,5 +88,6 @@ coordinates or multiple exactly equal coordinates possible
 -   CsvDataSource now stops trying to get an operator for empty operator uuid field in entities
 -   CsvDataSource now parsing multiple geoJson strings correctly
 
-[Unreleased/Snapshot]: https://github.com/ie3-institute/powersystemdatamodel/compare/1.1.0...HEAD
+[Unreleased/Snapshot]: https://github.com/ie3-institute/powersystemdatamodel/compare/2.0.0...HEAD
+[2.0.0]: https://github.com/ie3-institute/powersystemdatamodel/compare/1.1.0...2.0.0
 [1.1.0]: https://github.com/ie3-institute/powersystemdatamodel/compare/6a49bc514be8859ebd29a3595cd58cd000498f1e...1.1.0

Jenkinsfile

@@ -150,7 +150,7 @@ node {
                          */
                         sh(
                                 script: """set +x && cd $projectName""" +
-                                ''' set +x; ./gradlew clean javadoc -Dorg.gradle.java.home=/opt/java/openjdk''',
+                                        ''' set +x; ./gradlew clean javadoc -Dorg.gradle.java.home=/opt/java/openjdk''',
                                 returnStdout: true
                         )
 
@@ -706,8 +706,7 @@ def getBranchType(String branchName) {
     def main_pattern = ".*main"
     if (branchName =~ feature_pattern || branchName =~ dependabot_pattern) {
         return "feature"
-    } else
-    if (branchName =~ release_pattern) {
+    } else if (branchName =~ release_pattern) {
         return "release"
     } else if (branchName =~ main_pattern) {
         return "main"

gradle/scripts/tests.gradle

@@ -1,7 +1,7 @@
 test {
 	useJUnitPlatform()
 	testLogging {
-		events "skipped", "failed"
+		events "skipped", "failed", "passed"
 	}
 }
 

version.properties

@@ -1,8 +1,8 @@
 #Generated by the Semver Plugin for Gradle
-#Mon Sep 14 12:33:33 CEST 2020
+#Fri May 21 09:47:39 CEST 2021
 version.buildmeta=
 version.major=2
-version.minor=0
+version.minor=1
 version.patch=0
 version.prerelease=
-version.semver=2.0.0
+version.semver=2.1.0