build: update publishing task

Signed-off-by: Andreas Reichel <[email protected]>

Author: manticore-projects

build.gradle

@@ -11,6 +11,7 @@ buildscript {
 
 plugins {
     id 'java'
+    id "com.vanniktech.maven.publish" version "latest.release"
     id 'maven-publish'
     id 'signing'
 
@@ -199,9 +200,6 @@ compileJavacc {
 }
 
 java {
-    withSourcesJar()
-    withJavadocJar()
-
     sourceCompatibility = '11'
     targetCompatibility = '11'
 
@@ -599,89 +597,73 @@ tasks.register('sphinx', Exec) {
     }
 }
 
-publish {
-    dependsOn(check, gitChangelogTask, renderRR, xslt, xmldoc)
-}
-
-publishing {
-    publications {
-        mavenJava(MavenPublication) {
-            artifactId = 'jsqlparser'
-
-            from(components.java)
+mavenPublishing {
+    coordinates(group, "jsqlparser", version)
 
-            versionMapping {
-                usage('java-api') {
-                    fromResolutionOf('runtimeClasspath')
-                }
-                usage('java-runtime') {
-                    fromResolutionResult()
-                }
-            }
-
-            pom {
-                name.set('JSQLParser library')
-                description.set('Parse SQL Statements into Abstract Syntax Trees (AST)')
-                url.set('https://github.com/JSQLParser/JSqlParser')
-
-                licenses {
-                    license {
-                        name.set('GNU Library or Lesser General Public License (LGPL) V2.1')
-                        url.set('http://www.gnu.org/licenses/lgpl-2.1.html')
-                    }
-                    license {
-                        name.set('The Apache Software License, Version 2.0')
-                        url.set('http://www.apache.org/licenses/LICENSE-2.0.txt')
+    publishing {
+        publications {
+            mavenJava(MavenPublication) { publication ->
+                from components.java
+                versionMapping {
+                    usage('java-api') {
+                        fromResolutionOf('runtimeClasspath')
                     }
-                }
-
-                developers {
-                    developer {
-                        id.set('twa')
-                        name.set('Tobias Warneke')
-                        email.set('[email protected]')
+                    usage('java-runtime') {
+                        fromResolutionResult()
                     }
-                    developer {
-                        id.set('are')
-                        name.set('Andreas Reichel')
-                        email.set('[email protected]')
+                    allVariants {
+                        fromResolutionResult()
                     }
                 }
-
-                scm {
-                    connection.set('scm:git:https://github.com/JSQLParser/JSqlParser.git')
-                    developerConnection.set('scm:git:ssh://[email protected]:JSQLParser/JSqlParser.git')
-                    url.set('https://github.com/JSQLParser/JSqlParser.git')
-                }
             }
         }
     }
 
-    repositories {
-        maven {
-            name = "ossrh"
-            def releasesRepoUrl = "https://central.sonatype.com/repository/maven-releases"
-            def snapshotsRepoUrl = "https://central.sonatype.com/repository/maven-snapshots/"
-            url(version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl)
+    pom {
+        name.set('JSQLParser library')
+        description.set('Parse SQL Statements into Abstract Syntax Trees (AST)')
+        url.set('https://github.com/JSQLParser/JSqlParser')
+
+        licenses {
+            license {
+                name.set('GNU Library or Lesser General Public License (LGPL) V2.1')
+                url.set('http://www.gnu.org/licenses/lgpl-2.1.html')
+            }
+            license {
+                name.set('The Apache Software License, Version 2.0')
+                url.set('http://www.apache.org/licenses/LICENSE-2.0.txt')
+            }
+        }
 
-            credentials {
-                username = providers.environmentVariable("ossrhUsername").orNull
-                password = providers.environmentVariable("ossrhPassword").orNull
+        developers {
+            developer {
+                id.set('twa')
+                name.set('Tobias Warneke')
+                email.set('[email protected]')
+            }
+            developer {
+                id.set('are')
+                name.set('Andreas Reichel')
+                email.set('[email protected]')
             }
         }
+
+        scm {
+            connection.set('scm:git:https://github.com/JSQLParser/JSqlParser.git')
+            developerConnection.set('scm:git:ssh://[email protected]:JSQLParser/JSqlParser.git')
+            url.set('https://github.com/JSQLParser/JSqlParser.git')
+        }
     }
 }
 
+// Fix signing task dependencies
+tasks.withType(AbstractPublishToMaven).configureEach {
+    dependsOn(tasks.withType(Sign))
+}
+
 
 signing {
-    //def signingKey = findProperty("signingKey")
-    //def signingPassword = findProperty("signingPassword")
-    //useInMemoryPgpKeys(signingKey, signingPassword)
-
-    // don't sign SNAPSHOTS
-    if (!version.endsWith('SNAPSHOT')) {
-        sign publishing.publications.mavenJava
-    }
+    required { !version.endsWith("SNAPSHOT") && gradle.taskGraph.hasTask("publish") }
 }
 
 tasks.withType(JavaCompile).configureEach {