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 diff --git a/build.gradle b/build.gradle index 3c5e9b2a7..93f421c9e 100644 --- a/build.gradle +++ b/build.gradle @@ -49,13 +49,24 @@ 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.5.3' + implementation 'com.github.ie3-institute:PowerSystemUtils:1.6' 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:jts-core:1.18.2'){ + exclude group: 'junit', module: 'junit' + } + implementation 'org.locationtech.jts.io:jts-io-common:1.18.2' // Graphs @@ -85,10 +96,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 { - gradleVersion = '6.0.1' } tasks.withType(JavaCompile) { 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 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