fix gradle plugin publishing

gradle-plugin-asciidoctor/build.gradle

@@ -16,32 +16,27 @@ dependencies {
     testImplementation libs.jsoup
 }
 
+if (project.hasProperty('gradle.publish.key')) {
     gradlePlugin {
         plugins {
             asciidoctorPlugin {
                 id = 'org.xbib.gradle.plugin.asciidoctor'
                 implementationClass = 'org.xbib.gradle.plugin.asciidoctor.AsciidoctorPlugin'
+                version = project.version
+                description = 'Asciidoctor plugin for building documentations'
+                displayName = 'Asciidoctor plugin for building documentations'
             }
         }
     }
-
-if (project.hasProperty('gradle.publish.key')) {
     pluginBundle {
-        mavenCoordinates {
+/*        mavenCoordinates {
             groupId = "org.xbib.gradle.plugin"
             artifactId = "gradle-plugin-asciidoctor"
             version = project.version
         }
+*/
         website = 'https://github.com/jprante/gradle-plugins'
         vcsUrl = 'https://github.com/jprante/gradle-plugins'
-        plugins {
-            asciidoctorPlugin {
-                id = 'org.xbib.gradle.plugin.asciidoctor'
-                version = project.version
-                description = 'Asciidoctor plugin for building documentations'
-                displayName = 'Asciidoctor plugin for building documentations'
         tags = ['asciidoctor']
     }
 }
-    }
-}

gradle-plugin-asciidoctor/gradle.properties

@@ -1 +1,2 @@
+name = gradle-plugin-asciidoctor
 version = 2.5.2.1

gradle-plugin-docker/build.gradle

@@ -13,32 +13,26 @@ dependencies {
     testImplementation gradleTestKit()
 }
 
+if (project.hasProperty('gradle.publish.key')) {
     gradlePlugin {
         plugins {
             dockerPlugin {
                 id = 'org.xbib.gradle.plugin.docker'
                 implementationClass = 'org.xbib.gradle.plugin.docker.DockerPlugin'
-        }
-    }
-}
-
-if (project.hasProperty('gradle.publish.key')) {
-  pluginBundle {
-    mavenCoordinates {
-      groupId = "org.xbib.gradle.plugin"
-      artifactId = "gradle-plugin-docker"
-      version = project.version
-    }
-    website = 'https://github.com/jprante/gradle-plugins'
-    vcsUrl = 'https://github.com/jprante/gradle-plugins'
-    plugins {
-        dockerPlugin {
-            id = 'org.xbib.gradle.plugin.docker'
                 version = project.version
                 description = 'Docker plugin for build and push by Dockerfile'
                 displayName = 'Docker Plugin for build and push by Dockerfile'
+            }
+        }
+    }
+    pluginBundle {
+      /*mavenCoordinates {
+        groupId = "org.xbib.gradle.plugin"
+        artifactId = "gradle-plugin-docker"
+        version = project.version
+      }*/
+      website = 'https://github.com/jprante/gradle-plugins'
+      vcsUrl = 'https://github.com/jprante/gradle-plugins'
       tags = ['docker']
   }
 }
-  }
-}

gradle-plugin-docker/gradle.properties

@@ -1 +1,2 @@
+name = gradle-plugin-docker
 version = 2.4.0

gradle-plugin-git/build.gradle

@@ -16,32 +16,26 @@ dependencies {
     testImplementation libs.junit4
 }
 
+if (project.hasProperty('gradle.publish.key')) {
     gradlePlugin {
         plugins {
             gitPlugin {
                 id = 'org.xbib.gradle.plugin.git'
                 implementationClass = 'org.xbib.gradle.plugin.git.GitPlugin'
-        }
-    }
-}
-
-if (project.hasProperty('gradle.publish.key')) {
-    pluginBundle {
-        mavenCoordinates {
-            groupId = "org.xbib.gradle.plugin"
-            artifactId = "gradle-plugin-git"
-            version = project.version
-        }
-        website = 'https://github.com/jprante/gradle-plugins'
-        vcsUrl = 'https://github.com/jprante/gradle-plugins'
-        plugins {
-            gitPlugin {
-                id = 'org.xbib.gradle.plugin.git'
                 version = project.version
                 description = 'Git client plugin based on JGit'
                 displayName = 'Git client plugin based on JGit'
+            }
+        }
+    }
+    pluginBundle {
+        /*mavenCoordinates {
+            groupId = "org.xbib.gradle.plugin"
+            artifactId = "gradle-plugin-git"
+            version = project.version
+        }*/
+        website = 'https://github.com/jprante/gradle-plugins'
+        vcsUrl = 'https://github.com/jprante/gradle-plugins'
         tags = ['git']
     }
 }
-    }
-}

gradle-plugin-git/gradle.properties

@@ -1 +1,2 @@
+name = gradle-plugin-docker
 version = 2.2.0

gradle-plugin-jacc/build.gradle

@@ -15,27 +15,21 @@ dependencies {
     testImplementation gradleTestKit()
 }
 
+if (project.hasProperty('gradle.publish.key')) {
     gradlePlugin {
         plugins {
             jaccPlugin {
                 id = 'org.xbib.gradle.plugin.jacc'
                 implementationClass = 'org.xbib.gradle.plugin.jacc.JaccPlugin'
-        }
-    }
-}
-
-if (project.hasProperty('gradle.publish.key')) {
-    pluginBundle {
-        website = scmUrl
-        vcsUrl = scmUrl
-        plugins {
-            jaccPlugin {
-                id = 'org.xbib.gradle.plugin.jacc'
                 version = project.version
                 description = 'Gradle Jacc plugin'
                 displayName = 'Gradle Jacc plugin'
+            }
+        }
+    }
+    pluginBundle {
+        website = scmUrl
+        vcsUrl = scmUrl
         tags = ['jacc']
     }
 }
-    }
-}

gradle-plugin-jacc/gradle.properties

@@ -1 +1,2 @@
+name = gradle-plugin-jacc
 version = 1.4.0

gradle-plugin-jflex/build.gradle

@@ -15,27 +15,21 @@ dependencies {
     testImplementation gradleTestKit()
 }
 
+if (project.hasProperty('gradle.publish.key')) {
     gradlePlugin {
         plugins {
             jflexPlugin {
                 id = 'org.xbib.gradle.plugin.jflex'
                 implementationClass = 'org.xbib.gradle.plugin.jflex.JFlexPlugin'
-        }
-    }
-}
-
-if (project.hasProperty('gradle.publish.key')) {
-    pluginBundle {
-        website = scmUrl
-        vcsUrl = scmUrl
-        plugins {
-            jflexPlugin {
-                id = 'org.xbib.gradle.plugin.jflex'
                 version = project.version
                 description = 'Gradle JFlex plugin'
                 displayName = 'Gradle JFlex plugin'
+            }
+        }
+    }
+    pluginBundle {
+        website = scmUrl
+        vcsUrl = scmUrl
         tags = ['jflex']
     }
 }
-    }
-}

gradle-plugin-jflex/gradle.properties

@@ -1 +1,2 @@
+name = gradle-plugin-jflex
 version = 1.6.0

gradle-plugin-rpm/build.gradle

@@ -14,32 +14,36 @@ dependencies {
     testImplementation gradleTestKit()
 }
 
-gradlePlugin {
+publishing {
-    plugins {
+    repositories {
-        rpmPlugin {
+        maven {
-            id = 'org.xbib.gradle.plugin.rpm'
+            name = 'localRepository'
-            implementationClass = 'org.xbib.gradle.plugin.RpmPlugin'
+            url = 'build/local-repository'
         }
     }
 }
 
 if (project.hasProperty('gradle.publish.key')) {
-    pluginBundle {
+    gradlePlugin {
-        mavenCoordinates {
-            groupId = "org.xbib.gradle.plugin"
-            artifactId = "gradle-plugin-rpm"
-            version = project.version
-        }
-        website = 'https://github.com/jprante/gradle-plugins'
-        vcsUrl = 'https://github.com/jprante/gradle-plugins'
         plugins {
             rpmPlugin {
                 id = 'org.xbib.gradle.plugin.rpm'
+                group = project.group
                 version = project.version
                 description = 'Java implementation for RPM packaging'
                 displayName = 'Java implementation for RPM packaging'
+                implementationClass = 'org.xbib.gradle.plugin.RpmPlugin'
+            }
+        }
+    }
+    pluginBundle {
+        /*mavenCoordinates {
+            groupId = "org.xbib.gradle.plugin"
+            artifactId = "gradle-plugin-rpm"
+            version = project.version
+        }*/
+        website = 'https://github.com/jprante/gradle-plugins'
+        vcsUrl = 'https://github.com/jprante/gradle-plugins'
         tags = [ 'rpm' ]
     }
 }
-    }
-}

gradle-plugin-rpm/gradle.properties

@@ -1 +1,2 @@
-version = 2.3.0
+name = gradle-plugin-rpm
+version = 2.4.0

gradle-plugin-shadow/build.gradle

@@ -19,27 +19,22 @@ dependencies {
     testImplementation libs.spock.junit4
 }
 
+if (project.hasProperty('gradle.publish.key')) {
     gradlePlugin {
         plugins {
             shadowPlugin {
                 id = 'org.xbib.gradle.plugin.shadow'
                 implementationClass = 'org.xbib.gradle.plugin.shadow.ShadowPlugin'
-        }
+                group = project.group
-    }
-}
-
-if (project.hasProperty('gradle.publish.key')) {
-    pluginBundle {
-        website = scmUrl
-        vcsUrl = scmUrl
-        plugins {
-            shadowPlugin {
-                id = 'org.xbib.gradle.plugin.shadow'
                 version = project.version
                 description = 'Shadow plugin for Gradle'
                 displayName = 'Shadow plugin for Gradle'
+            }
+        }
+    }
+    pluginBundle {
+        website = scmUrl
+        vcsUrl = scmUrl
         tags = [ 'shadow' ]
     }
 }
-    }
-}

gradle-plugin-shadow/gradle.properties

@@ -1 +1,2 @@
+name = gradle-plugin-shadow
 version = 2.0.0

gradle.properties

@@ -1,5 +1,5 @@
-group = 'org.xbib.gradle.plugin'
+group = org.xbib.gradle.plugin
-name = 'gradle-plugins'
+name = gradle-plugins
 version = 0.0.2
 
 org.gradle.warning.mode = ALL

settings.gradle

@@ -25,7 +25,7 @@ dependencyResolutionManagement {
             library('jacc', 'org.xbib:jacc:2.2.0')
             library('groovy-git', 'org.xbib.groovy', 'groovy-git').version('2.1.0')
             library('rpm', 'org.xbib', 'rpm-core').version('2.2.0')
-            plugin('publish', 'com.gradle.plugin-publish').version('0.18.0')
+            plugin('publish', 'com.gradle.plugin-publish').version('1.0.0-rc-2')
         }
     }
 }