Skip to content

set version to 2.1.0 #353

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
May 21, 2021
Merged

set version to 2.1.0 #353

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
98f103c
set version to 2.1.0
johanneshiry May 21, 2021
4665871
print passed tests
johanneshiry May 21, 2021
d43a54c
fmt
johanneshiry May 21, 2021
e8c360a
print tests
johanneshiry May 21, 2021
6edcb6a
remove printing again - useless as too many tests are executed
johanneshiry May 21, 2021
d3f88ea
Adapting CHANGELOG
ckittl May 21, 2021
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.0.0] - 2021-05-21

### Added
- definition for a default input file directory structure
- tarball utils to extract and compress files
Expand Down Expand Up @@ -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
5 changes: 2 additions & 3 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)

Expand Down Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion gradle/scripts/tests.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
test {
useJUnitPlatform()
testLogging {
events "skipped", "failed"
events "skipped", "failed", "passed"
}
}

Expand Down
6 changes: 3 additions & 3 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
#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