Skip to content

rel/jh/#484-release_v2.1.0 for dev #487

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jan 5, 2022
Merged

rel/jh/#484-release_v2.1.0 for dev #487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
25a6254
adapted CHANGELOG.md for release
johanneshiry Jan 5, 2022
9de69c9
set version to 3.0.0
johanneshiry Jan 5, 2022
2018967
add 'org.apache.commons:commons-lang3:3.12.0' as explicit dependency
johanneshiry Jan 5, 2022
3ca0d27
add 'org.apache.commons:commons-lang3:3.12.0' as explicit dependency …
johanneshiry Jan 5, 2022
a80b968
update gradle to 7.3.3 + legacy osmonau dependency
johanneshiry Jan 5, 2022
c741550
exclude junit from org.locationtech.jts:jts-core
johanneshiry Jan 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand Down Expand Up @@ -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
19 changes: 14 additions & 5 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 4 additions & 4 deletions version.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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