From 25a62540266cd743b12b047ded2bd6be48403b8d Mon Sep 17 00:00:00 2001 From: Johannes Hiry Date: Wed, 5 Jan 2022 10:03:26 +0100 Subject: [PATCH 1/6] adapted CHANGELOG.md for release --- CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5978576ae..892c80821 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased/Snapshot] +## [2.1.0] - 2022-01-05 + ### Added - added `EvcsLocationType` support in `EvcsInput` and `EvcsInputFactory` [#406](https://github.com/ie3-institute/PowerSystemDataModel/issues/406) - Opportunity to close writer in `CsvFileSink` @@ -117,7 +119,8 @@ 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/2.0.1...HEAD +[Unreleased/Snapshot]: https://github.com/ie3-institute/powersystemdatamodel/compare/2.1.0...HEAD +[2.1.0]: https://github.com/ie3-institute/powersystemdatamodel/compare/2.0.1...2.1.0 [2.0.1]: https://github.com/ie3-institute/powersystemdatamodel/compare/2.0.0...2.0.1 [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 From 9de69c9c15af819b18c4d13662a29e318981a7af Mon Sep 17 00:00:00 2001 From: Johannes Hiry Date: Wed, 5 Jan 2022 11:45:39 +0100 Subject: [PATCH 2/6] set version to 3.0.0 --- version.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/version.properties b/version.properties index 7bd19cc05..dcf9d3086 100644 --- a/version.properties +++ b/version.properties @@ -1,8 +1,8 @@ #Generated by the Semver Plugin for Gradle -#Fri May 21 09:47:39 CEST 2021 +#Wed Jan 05 11:45:20 CET 2022 version.buildmeta= -version.major=2 -version.minor=1 +version.major=3 +version.minor=0 version.patch=0 version.prerelease= -version.semver=2.1.0 +version.semver=3.0.0 From 20189677846eb5792ff07d56f674d74e0cda45f4 Mon Sep 17 00:00:00 2001 From: Johannes Hiry Date: Wed, 5 Jan 2022 11:58:43 +0100 Subject: [PATCH 3/6] add 'org.apache.commons:commons-lang3:3.12.0' as explicit dependency --- build.gradle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.gradle b/build.gradle index 3c5e9b2a7..f4ca38eba 100644 --- a/build.gradle +++ b/build.gradle @@ -85,6 +85,8 @@ dependencies { implementation 'commons-io:commons-io:2.11.0' // I/O functionalities implementation 'org.apache.commons:commons-compress:1.21' // I/O functionalities + implementation 'org.apache.commons:commons-lang3:3.12.0' + } wrapper { From 3ca0d276bb17d65b34b8367ac403acec95c76895 Mon Sep 17 00:00:00 2001 From: Johannes Hiry Date: Wed, 5 Jan 2022 12:03:54 +0100 Subject: [PATCH 4/6] add 'org.apache.commons:commons-lang3:3.12.0' as explicit dependency + update to PSU v1.6 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index f4ca38eba..619fbcef5 100644 --- a/build.gradle +++ b/build.gradle @@ -50,7 +50,7 @@ repositories { dependencies { // ie³ power system utils - implementation 'com.github.ie3-institute:PowerSystemUtils:1.5.3' + implementation 'com.github.ie3-institute:PowerSystemUtils:1.6' implementation 'tech.units:indriya:2.1.2' From a80b968e9869f8dc44adbd7696a42b2302eccdc4 Mon Sep 17 00:00:00 2001 From: Johannes Hiry Date: Wed, 5 Jan 2022 13:09:57 +0100 Subject: [PATCH 5/6] update gradle to 7.3.3 + legacy osmonau dependency --- build.gradle | 6 ++---- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 619fbcef5..d417a5a3e 100644 --- a/build.gradle +++ b/build.gradle @@ -54,6 +54,8 @@ dependencies { implementation 'tech.units:indriya:2.1.2' + implementation 'com.github.johanneshiry:OSMonaut:v1.1.1' // tmp pbf parse + // JTS Topology Suite for GeoPositions, License: EPL 1.0 / EDL 1.0 implementation 'org.locationtech.jts:jts-core:1.18.2' implementation 'org.locationtech.jts.io:jts-io-common:1.18.2' @@ -89,10 +91,6 @@ dependencies { } -wrapper { - gradleVersion = '6.0.1' -} - tasks.withType(JavaCompile) { options.encoding = 'UTF-8' } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a029b784d..7711ccd1a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ #Mon Dec 02 10:39:11 CET 2019 -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStorePath=wrapper/dists From c7415507259e9ce7307f09c5c7da05164f31371e Mon Sep 17 00:00:00 2001 From: Johannes Hiry Date: Wed, 5 Jan 2022 13:35:51 +0100 Subject: [PATCH 6/6] exclude junit from org.locationtech.jts:jts-core --- build.gradle | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index d417a5a3e..93f421c9e 100644 --- a/build.gradle +++ b/build.gradle @@ -49,6 +49,12 @@ repositories { } dependencies { + constraints { + implementation( 'junit:junit:4.13.2+'){ + because "CVE-2020-15250 - Temporary folder vulnerability - https://github.com/advisories/GHSA-269g-pwp5-87pp" + } + } + // ie³ power system utils implementation 'com.github.ie3-institute:PowerSystemUtils:1.6' @@ -57,7 +63,10 @@ dependencies { implementation 'com.github.johanneshiry:OSMonaut:v1.1.1' // tmp pbf parse // JTS Topology Suite for GeoPositions, License: EPL 1.0 / EDL 1.0 - implementation 'org.locationtech.jts:jts-core:1.18.2' + implementation ('org.locationtech.jts:jts-core:1.18.2'){ + exclude group: 'junit', module: 'junit' + } + implementation 'org.locationtech.jts.io:jts-io-common:1.18.2' // Graphs