Merge pull request #1321 from ie3-institute/sp/#000-merge-back-changes

Merging back changes from 7.0 release

Author: sebastian-peter

CHANGELOG.md

@@ -6,6 +6,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased/Snapshot]
 
+## [7.0.0] - 2025-05-08
+
 ### Added
 - Implemented GitHub Actions for automatic code integration. [#1237](https://github.com/ie3-institute/PowerSystemDataModel/issues/1237)
 - Added `CopyBuilders` to `Line-/Transformer2W-/Tranformer3WTypeInput` [#1275](https://github.com/ie3-institute/PowerSystemDataModel/issues/1275)
@@ -20,6 +22,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Removed Jenkinsfile [#1315](https://github.com/ie3-institute/PowerSystemDataModel/issues/1315)
 - Updated readthedocs config [#1317](https://github.com/ie3-institute/PowerSystemDataModel/issues/1317)
 
+### Updates
+- Updated gradle to v8.14
+- Updated PSU to 3.1.0
+
 ## [6.0.0] - 2025-02-27
 
 ### Added
@@ -351,7 +357,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/6.0.0...HEAD
+[Unreleased/Snapshot]: https://github.com/ie3-institute/powersystemdatamodel/compare/7.0.0...HEAD
+[7.0.0]: https://github.com/ie3-institute/powersystemdatamodel/compare/6.0.0...7.0.0
 [6.0.0]: https://github.com/ie3-institute/powersystemdatamodel/compare/5.1.0...6.0.0
 [5.1.0]: https://github.com/ie3-institute/powersystemdatamodel/compare/5.0.1...5.1.0
 [5.0.1]: https://github.com/ie3-institute/powersystemdatamodel/compare/5.0.0...5.0.1

gradle/scripts/mavenCentralPublish.gradle

@@ -1,29 +1,25 @@
 /* Maven publish - start */
-task sourcesJar(type: Jar) {
+
+tasks.register("sourcesJar", Jar) {
   archiveClassifier.set("sources")
   from sourceSets.main.allJava
 }
 
-task javadocJar(type: Jar, dependsOn: javadoc) {
+tasks.register("javadocJar", Jar) {
+  dependsOn tasks.named("javadoc", Javadoc)
   archiveClassifier.set("javadoc")
-  from javadoc.destinationDir
+  from { tasks.named("javadoc", Javadoc).get().destinationDir }
 }
 
-
 if (project.hasProperty('user') && project.hasProperty('password') && project.hasProperty('deployVersion')) {
 
   // snapshot version differs from normal version
   String versionString = project.getProperty('deployVersion')
 
-  signing {
-    required { !versionString.endsWith('SNAPSHOT') }
-    if (required)
-      sign(publishing.publications)
-  }
 
   publishing {
     publications {
-      mavenJava(MavenPublication) {
+      create("mavenJava", MavenPublication) {
 
         versionMapping {
           // resolves dynamic versioning to current version number
@@ -66,9 +62,9 @@ if (project.hasProperty('user') && project.hasProperty('password') && project.ha
         }
 
         removeTestDependenciesFromPom(pom)
-        groupId group
-        artifactId 'PowerSystemDataModel'
-        version versionString
+        groupId = group
+        artifactId = 'PowerSystemDataModel'
+        version = versionString
 
         from components.java
         artifact sourcesJar
@@ -86,18 +82,21 @@ if (project.hasProperty('user') && project.hasProperty('password') && project.ha
         }
       }
     }
+    signing {
+      useInMemoryPgpKeys(
+          findProperty('signingKey') as String,
+          findProperty('signingPassword') as String
+          )
+      sign publications.mavenJava
+    }
   }
 
-
-  model {
-    tasks.generatePomFileForMavenJavaPublication {
-      destination = file("$rootDir/generated-pom.xml")
-    }
+  tasks.named("generatePomFileForMavenJavaPublication") {
+    destination = layout.buildDirectory.file("generated-pom.xml").get().asFile
   }
 }
 
 def removeTestDependenciesFromPom(pom) {
-
   pom.withXml {
     def root = asNode()
     // eliminate test-scoped dependencies (no need in maven central POMs)

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -84,7 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -203,7 +205,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.

gradlew

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################

gradlew.bat

@@ -1,8 +1,8 @@
 #Generated by the Semver Plugin for Gradle
-#Thu May 08 14:54:26 CEST 2025
+#Thu May 08 17:03:55 CEST 2025
 version.buildmeta=
 version.major=7
-version.minor=0
+version.minor=1
 version.patch=0
 version.prerelease=
-version.semver=7.0.0
+version.semver=7.1.0