Skip to content

Commit 6b6d98c

Browse files
committed
Merge branch 'dev' into ms/#1292-add-updated-bdew-standard-load-profiles
# Conflicts: # CHANGELOG.md
2 parents b612f00 + c0aade4 commit 6b6d98c

File tree

3 files changed

+69
-3
lines changed

3 files changed

+69
-3
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
88

99
### Added
1010
- Extend Validation to EnergyManagement Systems. [#1356](https://github.com/ie3-institute/PowerSystemDataModel/issues/1356)
11+
- Added `CITATION.cff` [#1380](https://github.com/ie3-institute/PowerSystemDataModel/issues/1380)
1112
- Added updated `BdewStandardLoadProfiles` [#1292](https://github.com/ie3-institute/PowerSystemDataModel/issues/1292)
1213

1314
### Fixed

CITATION.cff

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
cff-version: 1.0.0
2+
title: "PowerSystemDataModel - Provides an elaborated data model to model energy systems with a high granularity."
3+
message: "If you use this software, please cite it as below."
4+
type: software
5+
authors:
6+
- name: "ie³ - Institute of Energy Systems, Energy Efficiency and Energy Economics - TU Dortmund University"
7+
alias: ie³
8+
address: "Martin-Schmeißer-Weg 12"
9+
city: Dortmund
10+
country: DE
11+
post-code: 44227
12+
website: "https://ie3.etit.tu-dortmund.de/"
13+
- family-names: Hiry
14+
given-names: Johannes
15+
orcid: https://orcid.org/0000-0002-1447-0607
16+
- family-names: Kittl
17+
given-names: Chris
18+
orcid: https://orcid.org/0000-0002-1187-0568
19+
- family-names: Sen-Sarma
20+
given-names: Debopama
21+
- family-names: Peter
22+
given-names: Sebastian
23+
orcid: https://orcid.org/0000-0001-6311-6113
24+
- family-names: Oberließen
25+
given-names: Thomas
26+
orcid: https://orcid.org/0000-0001-5805-5408
27+
- family-names: Feismann
28+
given-names: Daniel
29+
orcid: https://orcid.org/0000-0002-3531-9025
30+
- family-names: Bao
31+
given-names: Johannes
32+
orcid: https://orcid.org/0009-0008-3641-6469
33+
- family-names: Hohmann
34+
given-names: Julian
35+
- family-names: Staudt
36+
given-names: Marius
37+
orcid: https://orcid.org/0009-0005-3309-5258
38+
- family-names: Steffan
39+
given-names: Niklas
40+
- family-names: Kraus
41+
given-names: Mia
42+
- family-names: Strehle
43+
given-names: Dennis
44+
- family-names: Mahr
45+
given-names: Christian
46+
- family-names: Zachopoulos
47+
given-names: Vasilios
48+
- family-names: Bajpai
49+
given-names: Shubham
50+
- family-names: Roumeliotis
51+
given-names: Lara
52+
- family-names: Bung
53+
given-names: Vicky
54+
- family-names: Hütte
55+
given-names: Simon
56+
- family-names: Petersmeier
57+
given-names: Pierre
58+
repository-code: https://github.com/ie3-institute/PowerSystemDataModel
59+
keywords:
60+
- power system data model
61+
- power system
62+
- energy system
63+
license: BSD-3-Clause
64+
version: 7.0.0
65+
date-released: 2025-06-05

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44
id 'maven-publish'
55
id 'signing'
66
id 'pmd' // code check, working on source code
7-
id 'com.diffplug.spotless' version '7.1.0' //code format
7+
id 'com.diffplug.spotless' version '7.2.1' //code format
88
id 'com.github.spotbugs' version '6.2.2' // code check, working on byte code
99
id 'de.undercouch.download' version '5.6.0'
1010
id 'kr.motd.sphinx' version '2.10.1' // documentation generation
@@ -101,8 +101,8 @@ dependencies {
101101
implementation 'com.couchbase.client:java-client:3.8.3'
102102
runtimeOnly 'org.postgresql:postgresql:42.7.7' // postgresql jdbc driver required during runtime
103103

104-
implementation 'commons-io:commons-io:2.19.0' // I/O functionalities
105-
implementation 'commons-codec:commons-codec:1.18.0' // needed by commons-compress
104+
implementation 'commons-io:commons-io:2.20.0' // I/O functionalities
105+
implementation 'commons-codec:commons-codec:1.19.0' // needed by commons-compress
106106
implementation 'org.apache.commons:commons-compress:1.27.1' // I/O functionalities
107107
}
108108

0 commit comments

Comments
 (0)