signed

Author: wadoon

.github/workflows/publish_test.yml

@@ -32,12 +32,14 @@ jobs:
         run: ./gradlew --parallel assemble javadoc
 
       - name: Upload to SNAPSHOT repository
-        run: ./gradlew --parallel publishMavenJavaPublicationToKEYLABRepository
+        run: |
+            ./gradlew publishAndReleaseToMavenCentral --no-configuration-cache
         env:
           BUILD_NUMBER: "SNAPSHOT"
-          SIGNING_KEY_ID: ${{secrets.SIGNING_KEY_ID}}
-          GPG_PRIVATE_KEY: ${{secrets.GPG_PRIVATE_KEY}}
-          GPG_PASSPHRASE: ${{secrets.GPG_PASSPHRASE}}
+          ORG_GRADLE_PROJECT_signingInMemoryKey: ${{secrets.GPG_PRIVATE_KEY}}
+          ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{secrets.GPG_PASSPHRASE}}
+          ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_USERNAME }}
+          ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_PASSWORD }}
 
       - name: Upload to SNAPSHOT repository
         run: ./gradlew --parallel publishMavenJavaPublicationToKEYLABRepository

build.gradle

@@ -14,9 +14,7 @@ plugins {
     id "org.checkerframework" version "0.6.61"
 
     // Plugin for publishing via the new Nexus API
-    id "io.github.gradle-nexus.publish-plugin" version "2.0.0"
-
-    id "signing"
+    id "com.vanniktech.maven.publish" version "0.36.0"
 }
 
 
@@ -41,8 +39,6 @@ version = "3.0.0$build"
 subprojects {
     apply plugin: "java"
     apply plugin: "java-library"
-    apply plugin: "maven-publish"
-    apply plugin: "signing"       // GPG signing of artifacts, required by maven central
     apply plugin: "idea"
     apply plugin: "eclipse"
 
@@ -81,13 +77,13 @@ subprojects {
         testImplementation("ch.qos.logback:logback-classic:1.5.32")
 
         testImplementation(platform("org.junit:junit-bom:6.0.3"))
-        testImplementation ("org.junit.jupiter:junit-jupiter-api")
-        testImplementation ("org.junit.jupiter:junit-jupiter-params")
-        testRuntimeOnly ("org.junit.jupiter:junit-jupiter-engine")
-        testRuntimeOnly ("org.junit.platform:junit-platform-launcher")
-        testImplementation ("org.assertj:assertj-core:3.27.7")
-        testImplementation (project(':key.util'))
-        testImplementation (testFixtures(project(":key.util")))
+        testImplementation("org.junit.jupiter:junit-jupiter-api")
+        testImplementation("org.junit.jupiter:junit-jupiter-params")
+        testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
+        testRuntimeOnly("org.junit.platform:junit-platform-launcher")
+        testImplementation("org.assertj:assertj-core:3.27.7")
+        testImplementation(project(':key.util'))
+        testImplementation(testFixtures(project(":key.util")))
 
         // test fixtures
         testImplementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.21.3")
@@ -148,10 +144,10 @@ subprojects {
         }
 
         addTestListener(new TestListener() {
-                void afterTest(TestDescriptor desc, TestResult result) {
-                    logger.error("${result.getResultType()}: ${desc.getClassName()}#${desc.getName()}")
-                }
-            })
+            void afterTest(TestDescriptor desc, TestResult result) {
+                logger.error("${result.getResultType()}: ${desc.getClassName()}#${desc.getName()}")
+            }
+        })
 
         addTestListener(new TestListener() {
             void beforeTest(TestDescriptor descriptor) {
@@ -292,120 +288,66 @@ subprojects {
         }
     }
 
-    afterEvaluate { // required so project.description is non-null as set by sub build.gradle
-        publishing {
-            publications {
-                mavenJava(MavenPublication) {
-                    from components.java
-                    artifact sourcesJar
-                    artifact javadocJar
-                    pom {
-                        name = projects.name
-                        description = project.description
-                        url = 'https://key-project.org/'
-
-                        licenses {
-                            license {
-                                name = "GNU General Public License (GPL), Version 2"
-                                url = "https://www.gnu.org/licenses/old-licenses/gpl-2.0.html"
-                            }
-                        }
-
-                        developers {
-                            developer {
-                                id = 'key'
-                                name = 'KeY Developers'
-                                email = 'support@key-project.org'
-                                url = "https://www.key-project.org/about/people/"
-                            }
-                        }
-                        scm {
-                            connection = 'scm:git:git://github.com/keyproject/key.git'
-                            developerConnection = 'scm:git:git://github.com/keyproject/key.git'
-                            url = 'https://github.com/keyproject/key/'
-                        }
-                    }
+    mavenPublishing {
+        publishToMavenCentral(true)
+        signAllPublications()
+
+        pom {
+            name = projects.name
+            description = project.description
+            url = 'https://key-project.org/'
+
+            licenses {
+                license {
+                    name = "GNU General Public License (GPL), Version 2"
+                    url = "https://www.gnu.org/licenses/old-licenses/gpl-2.0.html"
                 }
             }
-            repositories {
-                maven {
-                    name = "LOCAL"
-                    url= uri("$rootDir/local")
-                }
 
-                maven { // deployment to git.key-project.org/key-public/key
-                    name = "KEYLAB"
-                    url = uri("https://git.key-project.org/api/v4/projects/35/packages/maven")
-                    credentials(HttpHeaderCredentials) {
-                        def userToken = envOrPropertyValue("GITLAB_USER_TOKEN")
-                        def deployToken = envOrPropertyValue("GITLAB_DEPLOY_TOKEN")
-                        def ciToken = envOrPropertyValue("GITLAB_CIJOB_TOKEN")
-
-                        if (userToken != "") {
-                            name = 'Private-Token'
-                            value = userToken
-                        } else if(deployToken != "") {
-                            name = 'Deploy-Token'
-                            value = deployToken
-                        }  else {
-                            name = 'Job-Token'
-                            value = ciToken
-                        }
-                    }
-                    authentication {
-                        header(HttpHeaderAuthentication)
-                    }
+            developers {
+                developer {
+                    id = 'key'
+                    name = 'KeY Developers'
+                    email = 'support@key-project.org'
+                    url = "https://www.key-project.org/about/people/"
                 }
             }
+            scm {
+                connection = 'scm:git:git://github.com/keyproject/key.git'
+                developerConnection = 'scm:git:git://github.com/keyproject/key.git'
+                url = 'https://github.com/keyproject/key/'
+            }
         }
-        signing {
-            sign publishing.publications.mavenJava
-        }
-    }
-}
 
-signing {
-    // does not work
-    if(System.getenv("GPG_PRIVATE_KEY") == null) {
-        println("Use useGpgCmd()")
-        useGpgCmd() // works better than the Java implementation, which requires PGP keyrings.
-    } else{
-        println("Useinmem")
-        useInMemoryPgpKeys(
-                System.getenv("SIGNING_KEY_ID"),
-                System.getenv("GPG_PRIVATE_KEY"),
-                System.getenv("GPG_PASSPHRASE")
-        )
-    }
-}
+        repositories {
+            maven {
+                name = "LOCAL"
+                url= uri("$rootDir/local")
+            }
 
-nexusPublishing {
-    repositories {
-        central {
-            nexusUrl = uri("https://ossrh-staging-api.central.sonatype.com/service/local/")
-            snapshotRepositoryUrl = uri("https://central.sonatype.com/repository/maven-snapshots/")
-
-            stagingProfileId.set("org.key-project")
-
-            /**
-             * To be able to publish things on Maven Central, you need two things:
-             *
-             * (1) a JIRA account with permission on group-id `org.key-project`
-             * (2) a keyserver-published GPG (w/o sub-keys)
-             *
-             * Your `$HOME/.gradle/gradle.properties` should like this:
-             * ```
-             * signing.keyId=YourKeyId
-             * signing.password=YourPublicKeyPassword
-             * ossrhUsername=your-jira-id
-             * ossrhPassword=your-jira-password
-             * ```
-             *
-             * You can test signing with `gradle sign`, and publish with `gradle publish`.
-             * https://central.sonatype.org/publish/publish-guide/
-             */
-            username = envOrPropertyValue("ossrhUsername")
-            password = envOrPropertyValue("ossrhPassword")
+            maven { // deployment to git.key-project.org/key-public/key
+                name = "KEYLAB"
+                url = uri("https://git.key-project.org/api/v4/projects/35/packages/maven")
+                credentials(HttpHeaderCredentials) {
+                    def userToken = envOrPropertyValue("GITLAB_USER_TOKEN")
+                    def deployToken = envOrPropertyValue("GITLAB_DEPLOY_TOKEN")
+                    def ciToken = envOrPropertyValue("GITLAB_CIJOB_TOKEN")
+
+                    if (userToken != "") {
+                        name = 'Private-Token'
+                        value = userToken
+                    } else if(deployToken != "") {
+                        name = 'Deploy-Token'
+                        value = deployToken
+                    }  else {
+                        name = 'Job-Token'
+                        value = ciToken
+                    }
+                }
+                authentication {
+                    header(HttpHeaderAuthentication)
+                }
+            }
         }
     }
 }