Merging changes from main, new snapshot version

AUTHORS

@@ -1,4 +1,4 @@
-Copyright (c) 2020, Institute of Energy Systems, Energy Efficiency and Energy Economics (ie3)
+Copyright (c) 2023, Institute of Energy Systems, Energy Efficiency and Energy Economics (ie3)
 All rights reserved.
 
 Lead Developers:
@@ -17,8 +17,6 @@ Main Contributers:
     - Vasilios Zachopoulos - https://github.com/baszach
     - Shubham Bajpai - https://github.com/ahamshubham
     - Thomas Oberließen - https://github.com/t-ober
-
-Coordination:
-    - Chris Kittl
-    - Johannes Hiry
-    - Debopama Sen-Sarma
+    - Marius Staudt - https://github.com/staudtMarius
+    - Lara Roumeliotis - https://github.com/lararou
+    - Vicky Bung - https://github.com/vickybung1

CHANGELOG.md

@@ -6,6 +6,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased/Snapshot]
 
+## [3.0.0] - 2023-02-16
+
 ### Added
 - SQL time series sources (`SqlTimeSeriesSource` and `SqlTimeSeriesMappingSource`) [#467](https://github.com/ie3-institute/PowerSystemDataModel/issues/467)
 - SQL time series have a different structure than CSV counterparts [#545](https://github.com/ie3-institute/PowerSystemDataModel/issues/545)
@@ -193,7 +195,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.1.0...HEAD
+[Unreleased/Snapshot]: https://github.com/ie3-institute/powersystemdatamodel/compare/3.0.0...HEAD
+[3.0.0]: https://github.com/ie3-institute/powersystemdatamodel/compare/2.1.0...3.0.0
 [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

Jenkinsfile

@@ -27,7 +27,7 @@ String sshCredentialsId = '19f16959-8a0d-4a60-bd1f-5adb4572b702' // id that matc
 String sonarqubeProjectKey = 'edu.ie3:PowerSystemDataModel' // sonarqube project key, case-sensitive
 
 /* maven central configuration */
-String mavenCentralCredentialsId = '87bfb2d4-7613-4816-9fe1-70dfd7e6dec2' // id that matches the maven central credentials set as jenkins property
+String mavenCentralCredentialsId = '197ffae7-08b2-4641-aa15-a2351d8011cd' // id that matches the maven central credentials set as jenkins property
 String mavenCentralSignKeyFileId = 'dc96216c-d20a-48ff-98c0-1c7ba096d08d' // id that matches the maven central sign key file set as jenkins property
 String mavenCentralSignKeyId = 'a1357827-1516-4fa2-ab8e-72cdea07a692' // id that matches the maven central sign key id set as jenkins property
 
@@ -145,9 +145,9 @@ node {
 
           // get the sonatype credentials stored in the jenkins secure keychain
           withCredentials([
-            usernamePassword(credentialsId: mavenCentralCredentialsId, usernameVariable: 'mavencentral_username', passwordVariable: 'mavencentral_password'),
-            file(credentialsId: mavenCentralSignKeyFileId, variable: 'mavenCentralKeyFile'),
-            usernamePassword(credentialsId: mavenCentralSignKeyId, passwordVariable: 'signingPassword', usernameVariable: 'signingKeyId')
+            usernamePassword(credentialsId: mavenCentralCredentialsId, usernameVariable: 'MAVENCENTRAL_USER', passwordVariable: 'MAVENCENTRAL_PASS'),
+            file(credentialsId: mavenCentralSignKeyFileId, variable: 'MAVENCENTRAL_KEYFILE'),
+            usernamePassword(credentialsId: mavenCentralSignKeyId, usernameVariable: 'MAVENCENTRAL_SIGNINGKEYID', passwordVariable: 'MAVENCENTRAL_SIGNINGPASS')
           ]) {
 
             /*
@@ -159,17 +159,15 @@ node {
                 returnStdout: true
                 )
 
-            String deployGradleTasks = "--refresh-dependencies test " +
-                "publish -Puser=${env.mavencentral_username} " +
-                "-Ppassword=${env.mavencentral_password} " +
-                "-Psigning.keyId=${env.signingKeyId} " +
-                "-Psigning.password=${env.signingPassword} " +
-                "-Psigning.secretKeyRingFile=${env.mavenCentralKeyFile} " +
+            String deployGradleTasks = '--refresh-dependencies test ' +
+                'publish -Puser=${MAVENCENTRAL_USER} ' +
+                '-Ppassword=${MAVENCENTRAL_PASS} ' +
+                '-Psigning.keyId=${MAVENCENTRAL_SIGNINGKEYID} ' +
+                '-Psigning.password=${MAVENCENTRAL_SIGNINGPASS} ' +
+                '-Psigning.secretKeyRingFile=${MAVENCENTRAL_KEYFILE} ' +
                 "-PdeployVersion='$projectVersion'"
 
-            // see https://docs.gradle.org/6.0.1/release-notes.html "Publication of SHA256 and SHA512 checksums"
-            def preventSHACheckSums = "-Dorg.gradle.internal.publish.checksums.insecure=true"
-            gradle("${deployGradleTasks} $preventSHACheckSums", projectName)
+            gradle(deployGradleTasks, projectName)
           }
 
           if (env.BRANCH_NAME == "main") {
@@ -376,7 +374,7 @@ def gradle(String command, String relativeProjectDir) {
   env.JENKINS_NODE_COOKIE = 'dontKillMe' // this is necessary for the Gradle daemon to be kept alive
 
   // switch directory to be able to use gradle wrapper
-  sh(script: """set +x && cd $relativeProjectDir""" + ''' set +x; ./gradlew ''' + """$command""", returnStdout: true)
+  sh(script: """set +x && cd $relativeProjectDir""" + ''' set +x; ./gradlew ''' + command, returnStdout: true)
 }
 
 def determineSonarqubeGradleCmd(String sonarqubeProjectKey, String currentBranchName, String targetBranchName, String orgName, String projectName, String relativeGitDir) {

build.gradle

@@ -16,7 +16,6 @@ plugins {
 ext {
   //version (changing these should be considered thoroughly!)
   javaVersion = JavaVersion.VERSION_17
-  tscfgVersion = '0.9.9'
   testcontainersVersion = '1.17.6'
 
   scriptsLocation = 'gradle' + File.separator + 'scripts' + File.separator //location of script plugins
@@ -41,27 +40,19 @@ apply from: scriptsLocation + 'semVer.gradle'
 
 repositories {
   mavenCentral() // searches in Sonatype's repository 'Maven Central'
-  maven { url 'https://www.jitpack.io' } // allows github repos as dependencies
 
   // sonatype snapshot repo
-  maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
+  maven { url 'https://s01.oss.sonatype.org/content/repositories/snapshots' }
 
 }
 
 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:2.0'
 
   implementation 'tech.units:indriya:2.1.4'
 
-  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.19.0'){
     exclude group: 'junit', module: 'junit'

docs/readthedocs/gettingstarted.rst

@@ -30,13 +30,13 @@ On `Maven central <https://search.maven.org/artifact/com.github.ie3-institute/Po
 
 Snapshot releases
 =================
-Available on `OSS Sonatype <https://oss.sonatype.org/>`_.
+Available on `OSS Sonatype <https://s01.oss.sonatype.org/>`_.
 Add the correct repository:
 
 .. code-block:: xml
 
    <repositories>
-     <repository>http://oss.sonatype.org/content/repositories/snapshots</repository>
+     <repository>https://s01.oss.sonatype.org/content/repositories/snapshots</repository>
    </repositories>
 
 and add the dependency:

gradle/scripts/mavenCentralPublish.gradle

@@ -40,7 +40,7 @@ if (project.hasProperty('user') && project.hasProperty('password') && project.ha
           url = 'https:github.com/ie3-institute/PowerSystemDatamodel'
           organization {
             name = 'Institute of Energy Systems, Energy Efficiency and Energy Economics (ie3)/TU Dortmund University'
-            url = 'http:www.ie3.tu-dortmund.de/'
+            url = 'https:www.ie3.tu-dortmund.de/'
           }
           issueManagement {
             system = 'GitHub'
@@ -51,31 +51,18 @@ if (project.hasProperty('user') && project.hasProperty('password') && project.ha
               name = 'BSD 3-Clause License'
               url = 'https:github.com/ie3-institute/PowerSystemDataModel/blob/master/LICENSE'
             }
-            scm {
-              connection = 'scm:git:git:github.com/ie3-institute/PowerSystemDataModel.git'
-              developerConnection = 'scm:git:ssh:github.com:ie3-institute/PowerSystemDataModel.git'
-              url = 'https:github.com/ie3-institute/PowerSystemDataModel'
-            }
-            developers {
-              [
-                developer {
-                  id = 'johanneshiry'
-                  name = 'Johannes Hiry'
-                  email = 'johannes.hiry@tu-dortmund.de'
-                },
-                developer {
-                  id = 'ckittl'
-                  name = 'Chris Kittl'
-                  email = 'chris.kittl@tu-dortmund.de'
-                },
-                developer {
-                  id = 'sensarmad'
-                  name = 'Debopama Sen Sarma'
-                  email = 'debopama-sen.sarma@tu-dortmund.de'
-                }
-              ]
+          }
+          developers {
+            developer {
+              organization = "Institute of Energy Systems, Energy Efficiency and Energy Economics (ie3)/TU Dortmund University"
+              organizationUrl = "https:ie3.etit.tu-dortmund.de"
             }
           }
+          scm {
+            connection = 'scm:git:git:github.com/ie3-institute/PowerSystemDataModel.git'
+            developerConnection = 'scm:git:ssh:github.com:ie3-institute/PowerSystemDataModel.git'
+            url = 'https:github.com/ie3-institute/PowerSystemDataModel'
+          }
         }
 
         removeTestDependenciesFromPom(pom)
@@ -91,8 +78,8 @@ if (project.hasProperty('user') && project.hasProperty('password') && project.ha
     }
     repositories {
       maven {
-        def releasesRepoUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
-        def snapshotsRepoUrl = "https://oss.sonatype.org/content/repositories/snapshots/"
+        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
         credentials {
           username project.getProperty('user')

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 #Mon Dec 02 10:39:11 CET 2019
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists