Upgrade plugins from maven to maven-publish

mperry · mperry · commit 02a35cd493ab · 2022-02-13T22:02:39.000+10:00
diff --git a/build.gradle b/build.gradle
@@ -58,12 +58,20 @@ allprojects {
         projectUrl = "http://functionaljava.org/"
         scmUrl = "git://github.com/functionaljava/functionaljava.git"
         scmGitFile = "scm:git@github.com:functionaljava/functionaljava.git"
+        scmSshGitFile = "scm:git:ssh://git@github.com/functionaljava/functionaljava.git"
+        licenseUrl = "https://github.com/functionaljava/functionaljava/blob/master/etc/LICENCE"
+        licenseName = "The BSD3 License"
+
+        issueUrl = "https://github.com/functionaljava/functionaljava/issues"
+        githubUrl = "https://github.com/functionaljava/functionaljava"
 
         sonatypeBaseUrl = "https://oss.sonatype.org"
         sonatypeSnapshotUrl = "$sonatypeBaseUrl/content/repositories/snapshots/"
         sonatypeRepositoryUrl = "$sonatypeBaseUrl/content/groups/public"
         sonatypeReleaseUrl = "$sonatypeBaseUrl/service/local/staging/deploy/maven2/"
+
         sonatypeUploadUrl = isSnapshot ? sonatypeSnapshotUrl : sonatypeReleaseUrl
+
         primaryEmail = "functionaljava@googlegroups.com"
 
         junitCompile = "junit:junit:4.13.2"
@@ -139,7 +147,7 @@ task coverage(type: org.gradle.testing.jacoco.tasks.JacocoReport) {
 
 configure(subprojects.findAll { it.name != "props-core" }) {
 
-    apply plugin: "maven"
+    apply plugin: "maven-publish"
     apply plugin: "signing"
     apply plugin: "biz.aQute.bnd.builder"
     sourceCompatibility = "1.8"
diff --git a/lib.gradle b/lib.gradle
@@ -20,7 +20,7 @@ String findJavaCommand(String command) {
 
 Boolean doSigning(String signingAllowed, Boolean doModule) {
     def b = signingAllowed.trim() == "true" && doModule
-//    println("signModule: ${project.name} signingEnabled: $signingAllowed module: $doModule")
+//    println("signModule: ${project.name} signingAllowed: $signingAllowed doModule: $doModule")
     b
 }
 
@@ -31,50 +31,118 @@ void performSigning(String signingAllowed, Boolean doModule) {
     }
 }
 
-void configureUpload(String signingEnabled, Boolean signModule) {
+def customisePom(pom, gradleProject) {
+    pom.withXml {
+        def root = asNode()
 
-    uploadArchives {
-        enabled = false
-        repositories {
-            mavenDeployer {
-                if (doSigning(signingEnabled, signModule)) {
-                    beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
-                }
+        // add all items necessary for maven central publication
+        root.children().last() + {
+            resolveStrategy = Closure.DELEGATE_FIRST
 
-                repository(url: sonatypeUploadUrl) {
-                    authentication(userName: sonatypeUsername, password: sonatypePassword)
+            name project.pomProjectName
+            description project.projectDescription
+            url project.projectUrl
+            organization {
+                name project.pomOrganisation
+                url project.projectUrl
+            }
+            issueManagement {
+                system 'GitHub'
+                url project.issueUrl
+            }
+            licenses {
+                license {
+                    name project.licenseName
+                    url project.licenseUrl
+                    distribution 'repo'
                 }
-                pom {
-                    groupId = project.group
-                    project {
-                        name pomProjectName
-                        packaging 'jar'
-                        description projectDescription
-                        url projectUrl
-                        organization {
-                            name pomOrganisation
-                            url projectUrl
-                        }
-                        scm {
-                            url scmUrl
-                        }
-                        licenses {
-                            license {
-                                name "The BSD3 License"
-                                url "https://github.com/functionaljava/functionaljava/blob/master/etc/LICENCE"
-                                distribution 'repo'
-                            }
+            }
+            scm {
+                url project.githubUrl
+                connection project.scmGitFile
+                developerConnection project.scmSshGitFile
+            }
+        }
+    }
+}
+
+
+void configureUpload(String signingEnabled, Boolean signModule) {
+    publishing {
+
+        publications {
+
+            mavenJava(MavenPublication) {
+                groupId project.group
+                artifactId project.name
+                version project.version
+
+                from components.java
+
+                customisePom(pom, rootProject)
+
+                artifact sourcesJar
+                artifact javadocJar
+
+                if (doSigning(signingEnabled, signModule)) {
+                    // sign the pom
+                    pom.withXml {
+                        def pomFile = file("${project.buildDir}/generated-pom.xml.asc")
+                        writeTo(pomFile)
+                        def pomAscFile = signing.sign(pomFile).signatureFiles[0]
+                        artifact(pomAscFile) {
+                            classifier = null
+                            extension = 'pom.asc'
                         }
-                        developers {
-                            developer {
-                                email primaryEmail
+                        pomFile.delete()
+                    }
+
+                    // sign the artifacts
+                    project.tasks.signArchives.signatureFiles.each {
+                        artifact(it) {
+                            def matcher = it.file =~ /-(sources|javadoc|jre8|jre9)\.jar\.asc$/
+                            if (matcher.find()) {
+                                classifier = matcher.group(1)
+                            } else {
+                                classifier = null
                             }
+                            extension = 'jar.asc'
                         }
                     }
                 }
+
+            }
+
+        }
+
+        repositories {
+            maven {
+                url project.sonatypeUploadUrl
+                credentials {
+                    username sonatypeUsername
+                    password sonatypePassword
+                }
             }
         }
+
+    }
+
+
+    model {
+        tasks.publishMavenJavaPublicationToMavenLocal {
+            dependsOn(project.tasks.signArchives)
+        }
+        tasks.publishMavenJavaPublicationToMavenRepository {
+            dependsOn(project.tasks.signArchives)
+        }
+        tasks.publish {
+            dependsOn(project.tasks.build)
+        }
+//        tasks.install {
+//            dependsOn(project.tasks.build)
+//        }
     }
+
 }
 
 ext {
