From c88eafcf0adc31adca7c7f68ec15a1a5e43e233a Mon Sep 17 00:00:00 2001 From: Johannes Hiry Date: Fri, 21 May 2021 14:22:08 +0200 Subject: [PATCH 1/3] reset version to 1.1.0 --- version.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/version.properties b/version.properties index 1dc344a4f..4ab68ddba 100644 --- a/version.properties +++ b/version.properties @@ -1,8 +1,8 @@ #Generated by the Semver Plugin for Gradle #Mon Sep 14 12:33:33 CEST 2020 version.buildmeta= -version.major=2 -version.minor=0 +version.major=1 +version.minor=1 version.patch=0 version.prerelease= -version.semver=2.0.0 +version.semver=1.1.0 \ No newline at end of file From 32bbedb2a0671a915d539cd2416f7c44cb9a822b Mon Sep 17 00:00:00 2001 From: Johannes Hiry Date: Fri, 21 May 2021 18:10:46 +0200 Subject: [PATCH 2/3] set version to 2.0.0 --- version.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/version.properties b/version.properties index 4ab68ddba..170e539ba 100644 --- a/version.properties +++ b/version.properties @@ -1,8 +1,8 @@ #Generated by the Semver Plugin for Gradle -#Mon Sep 14 12:33:33 CEST 2020 +#Fri May 21 18:09:22 CEST 2021 version.buildmeta= -version.major=1 -version.minor=1 +version.major=2 +version.minor=0 version.patch=0 version.prerelease= -version.semver=1.1.0 \ No newline at end of file +version.semver=2.0.0 From 5be3283ab096cdf60659a89fe35269d478529ae5 Mon Sep 17 00:00:00 2001 From: Johannes Hiry Date: Fri, 28 May 2021 19:22:27 +0200 Subject: [PATCH 3/3] [LoadInputFactory:55] logger.error(...) -> logger.warn(...) --- .../io/factory/input/participant/LoadInputFactory.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/edu/ie3/datamodel/io/factory/input/participant/LoadInputFactory.java b/src/main/java/edu/ie3/datamodel/io/factory/input/participant/LoadInputFactory.java index 70c2b0e02..5bffdce4a 100644 --- a/src/main/java/edu/ie3/datamodel/io/factory/input/participant/LoadInputFactory.java +++ b/src/main/java/edu/ie3/datamodel/io/factory/input/participant/LoadInputFactory.java @@ -52,7 +52,7 @@ protected LoadInput buildModel( try { slp = StandardLoadProfile.parse(data.getField(SLP)); } catch (ParsingException e) { - logger.error( + logger.warn( "Cannot parse the standard load profile \"{}\" of load \"{}\". Assign no load profile instead.", data.getField(SLP), id);