Merge pull request #361 from ie3-institute/sp/#0-merge-back

Merge back changes from main

Author: sebastian-peter

.github/workflows/ci.yml

@@ -84,13 +84,17 @@ jobs:
 
       #Deployment
       - name: Deploy
-        if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev'
+        if: github.ref == 'refs/heads/main'
         env:
           ORG_GRADLE_PROJECT_signingKey: ${{ secrets.MAVENCENTRAL_SIGNINGKEY }}
           ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.MAVENCENTRAL_SIGNINGPASS }}
-          ORG_GRADLE_PROJECT_user: ${{ secrets.MAVENCENTRAL_USER }}
-          ORG_GRADLE_PROJECT_password: ${{ secrets.MAVENCENTRAL_PASS }}
+          ORG_GRADLE_PROJECT_mavenCentralUser: ${{ github.actor == 'sebastian-peter' && secrets.MAVENCENTRAL_USER ||
+            github.actor == 'danielfeismann' && secrets.MAVENCENTRAL_DANIEL_USER }}
+          ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ github.actor == 'sebastian-peter' && secrets.MAVENCENTRAL_PASS ||
+            github.actor == 'danielfeismann' && secrets.MAVENCENTRAL_DANIEL_PASS }}
+
         run: |
+          echo "Using MavenCentral Token of GitHub Actor: ${{ github.actor }}"
           if [ "${GITHUB_REF}" == "refs/heads/main" ]; then
             currentVersion=$(./gradlew -q currentVersion)
           else
@@ -100,3 +104,18 @@ jobs:
           echo "currentVersion=$currentVersion"
 
           ./gradlew publish -PdeployVersion=$currentVersion
+
+
+      #MavenCentral Staging
+      - name: MavenCentral Staging
+        if: github.ref == 'refs/heads/main'
+        env:
+          ORG_GRADLE_PROJECT_signingKey: ${{ secrets.MAVENCENTRAL_SIGNINGKEY }}
+          ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.MAVENCENTRAL_SIGNINGPASS }}
+          ORG_GRADLE_PROJECT_mavenCentralUser: ${{ github.actor == 'sebastian-peter' && secrets.MAVENCENTRAL_USER ||
+            github.actor == 'danielfeismann' && secrets.MAVENCENTRAL_DANIEL_USER }}
+          ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ github.actor == 'sebastian-peter' && secrets.MAVENCENTRAL_PASS ||
+            github.actor == 'danielfeismann' && secrets.MAVENCENTRAL_DANIEL_PASS }}
+
+        run: |
+          ./gradlew stagingAtMavenCentralPortal

CHANGELOG.md

@@ -97,7 +97,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Renamed messages to ease understanding [#62](https://github.com/ie3-institute/simonaAPI/issues/62)
 - Separating departures and arrivals in message protocol, properly handling exceptions [#77](https://github.com/ie3-institute/simonaAPI/issues/77)
 
-[Unreleased/Snapshot]: https://github.com/ie3-institute/simonaapi/compare/0.9.0...HEAD
+[Unreleased/Snapshot]: https://github.com/ie3-institute/simonaapi/compare/0.10.0...HEAD
+[0.10.0]: https://github.com/ie3-institute/powersystemdatamodel/compare/0.9.0...0.10.0
 [0.9.0]: https://github.com/ie3-institute/powersystemdatamodel/compare/0.8.0...0.9.0
 [0.8.0]: https://github.com/ie3-institute/powersystemdatamodel/compare/0.7.0...0.8.0
 [0.7.0]: https://github.com/ie3-institute/powersystemdatamodel/compare/0.6.0...0.7.0

build.gradle

@@ -36,7 +36,8 @@ apply from: scriptsLocation + 'spotbugs.gradle'
 apply from: scriptsLocation + 'sonarqube.gradle'
 apply from: scriptsLocation + 'checkJavaVersion.gradle'
 apply from: scriptsLocation + 'semVer.gradle'
-apply from: scriptsLocation + 'mavenCentralPublish.gradle'
+apply from: scriptsLocation + 'uploadToMavenCentralPortal.gradle' // upload for deploy
+apply from: scriptsLocation + 'stagingAtMavenCentralPortal.gradle' // stage for deploy
 apply from: scriptsLocation + 'jacoco.gradle'
 apply from: scriptsLocation + 'documentation.gradle'
 apply from: scriptsLocation + 'test.gradle'
@@ -81,6 +82,7 @@ dependencies{
   testImplementation "org.apache.pekko:pekko-actor-testkit-typed_${scalaVersion}:${pekkoVersion}" // pekko typed testkit
 
   // TESTING
+  testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
   testImplementation 'org.apache.groovy:groovy:4.0.28'
   testImplementation 'org.spockframework:spock-core:2.3-groovy-4.0'
 }

gradle/scripts/stagingAtMavenCentralPortal.gradle

@@ -0,0 +1,39 @@
+tasks.register('stagingAtMavenCentralPortal') {
+  group = 'publishing'
+  description = 'Stages uploaded artifacts to Maven Central Portal for manual approval'
+
+  doLast {
+    def username = project.getProperty('mavenCentralUser')
+    def password =  project.getProperty('mavenCentralPassword')
+    def deployVersion = project.findProperty('deployVersion') ?: project.version
+
+    if (!username || !password) {
+      throw new GradleException("Sonatype credentials not found. Set sonatypeUser and sonatypePassword properties or environment variables.")
+    }
+
+    // Request API for repo key
+    def repositoryString = providers.exec {
+      commandLine 'curl',
+          '-u', "${username}:${password}",
+          'https://ossrh-staging-api.central.sonatype.com/manual/search/repositories'
+    }.getStandardOutput().getAsText().get()
+
+    def repositoryGroovy = new groovy.json.JsonSlurper().parseText(repositoryString)
+    def key = repositoryGroovy.repositories[0].key
+
+    // Stage via curl
+    def stageResult = providers.exec {
+      ignoreExitValue true
+      commandLine 'curl',
+          '-u', "${username}:${password}",
+          '-i', '-X', 'POST', "https://ossrh-staging-api.central.sonatype.com/manual/upload/repository/$key"
+    }
+
+    if (stageResult.result.get().exitValue == 0) {
+      println "✓ Staging successful!"
+      println "Check status at: https://central.sonatype.com/publishing/deployments"
+    } else {
+      throw new GradleException("Staging failed")
+    }
+  }
+}

gradle/scripts/mavenCentralPublish.gradle renamed to gradle/scripts/uploadToMavenCentralPortal.gradle

@@ -1,4 +1,5 @@
 /* Maven publish - start */
+
 tasks.register("sourcesJar", Jar) {
   archiveClassifier.set("sources")
   from sourceSets.main.allJava
@@ -10,13 +11,11 @@ tasks.register("javadocJar", Jar) {
   from { tasks.named("javadoc", Javadoc).get().destinationDir }
 }
 
-
-if (project.hasProperty('user') && project.hasProperty('password') && project.hasProperty('deployVersion')) {
+if (project.hasProperty('mavenCentralUser') && project.hasProperty('mavenCentralPassword') && project.hasProperty('deployVersion')) {
 
   // snapshot version differs from normal version
   String versionString = project.getProperty('deployVersion')
 
-
   publishing {
     publications {
       create("mavenJava", MavenPublication) {
@@ -31,8 +30,8 @@ if (project.hasProperty('user') && project.hasProperty('password') && project.ha
           }
         }
         pom {
-          description = 'API of the simona power system simulation model'
-          name = 'Simona API'
+          description = 'API to create modules and add-ons for simona'
+          name = 'simonaAPI'
           url = 'https:github.com/ie3-institute/simonaAPI'
           organization {
             name = 'Institute of Energy Systems, Energy Efficiency and Energy Economics (ie3)/TU Dortmund University'
@@ -67,18 +66,17 @@ if (project.hasProperty('user') && project.hasProperty('password') && project.ha
         version = versionString
 
         from components.java
-        artifact tasks.named("sourcesJar")
-        artifact tasks.named("javadocJar")
+        artifact sourcesJar
+        artifact javadocJar
       }
     }
     repositories {
       maven {
-        def releasesRepoUrl = "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/"
-        def snapshotsRepoUrl = "https://s01.oss.sonatype.org/content/repositories/snapshots/"
-        url = versionString.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl
+        name = "MavenCentral"
+        url = "https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/"
         credentials {
-          username project.getProperty('user')
-          password project.getProperty('password')
+          username = project.findProperty('mavenCentralUser')
+          password = project.findProperty('mavenCentralPassword')
         }
       }
     }
@@ -97,7 +95,6 @@ if (project.hasProperty('user') && project.hasProperty('password') && project.ha
 }
 
 def removeTestDependenciesFromPom(pom) {
-
   pom.withXml {
     def root = asNode()
     // eliminate test-scoped dependencies (no need in maven central POMs)
@@ -107,4 +104,4 @@ def removeTestDependenciesFromPom(pom) {
   }
 }
 
-/* Maven publish - end */
+/* Maven publish - end */

gradle/wrapper/gradle-wrapper.jar

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

gradle/wrapper/gradle-wrapper.properties

@@ -114,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew

@@ -70,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

gradlew.bat

@@ -1,8 +1,8 @@
 #Generated by the Semver Plugin for Gradle
-#Fri May 09 11:28:30 CEST 2025
+#Tue Oct 21 14:53:05 CEST 2025
 version.buildmeta=
 version.major=0
-version.minor=10
+version.minor=11
 version.patch=0
 version.prerelease=
-version.semver=0.10.0
+version.semver=0.11.0