From 3a759be190e53d90a94a02d082246468296f143f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Prante?= Date: Wed, 24 May 2023 22:42:39 +0200 Subject: [PATCH] fix gradle plugin publishing --- gradle-plugin-asciidoctor/build.gradle | 8 +++----- gradle-plugin-docker/build.gradle | 8 +++----- gradle-plugin-git/build.gradle | 8 +++----- gradle-plugin-jacc/build.gradle | 8 +++----- gradle-plugin-jflex/build.gradle | 8 +++----- gradle-plugin-rpm/build.gradle | 8 +++----- gradle-plugin-shadow/build.gradle | 8 +++----- gradle/compile/java.gradle | 2 +- settings.gradle | 4 ++-- 9 files changed, 24 insertions(+), 38 deletions(-) diff --git a/gradle-plugin-asciidoctor/build.gradle b/gradle-plugin-asciidoctor/build.gradle index ed1239f..f89aae3 100644 --- a/gradle-plugin-asciidoctor/build.gradle +++ b/gradle-plugin-asciidoctor/build.gradle @@ -18,6 +18,8 @@ dependencies { if (project.hasProperty('gradle.publish.key')) { gradlePlugin { + website = 'https://xbib.org/joerg/gradle-plugins/src/branch/main/gradle-plugin-asciidoctor' + vcsUrl = 'https://xbib.org/joerg/gradle-plugins' plugins { asciidoctorPlugin { id = 'org.xbib.gradle.plugin.asciidoctor' @@ -25,12 +27,8 @@ if (project.hasProperty('gradle.publish.key')) { version = project.version description = 'Asciidoctor plugin for building documentations (inofficial xbib fork)' displayName = 'Asciidoctor plugin for building documentations (inofficial xbib fork)' + tags.set(['asciidoctor']) } } } - /*pluginBundle { - website = 'https://github.com/jprante/gradle-plugins' - vcsUrl = 'https://github.com/jprante/gradle-plugins' - tags = ['asciidoctor'] - }*/ } diff --git a/gradle-plugin-docker/build.gradle b/gradle-plugin-docker/build.gradle index b60962d..b9cfaaa 100644 --- a/gradle-plugin-docker/build.gradle +++ b/gradle-plugin-docker/build.gradle @@ -15,6 +15,8 @@ dependencies { if (project.hasProperty('gradle.publish.key')) { gradlePlugin { + website = 'https://xbib.org/joerg/gradle-plugins/src/branch/main/gradle-plugin-docker' + vcsUrl = 'https://xbib.org/joerg/gradle-plugins' plugins { dockerPlugin { id = 'org.xbib.gradle.plugin.docker' @@ -22,12 +24,8 @@ if (project.hasProperty('gradle.publish.key')) { version = project.version description = 'Docker plugin for build and push by Dockerfile' displayName = 'Docker Plugin for build and push by Dockerfile' + tags.set(['docker']) } } } - /*pluginBundle { - website = 'https://github.com/jprante/gradle-plugins' - vcsUrl = 'https://github.com/jprante/gradle-plugins' - tags = ['docker'] - }*/ } diff --git a/gradle-plugin-git/build.gradle b/gradle-plugin-git/build.gradle index e1275ad..2c0a38e 100644 --- a/gradle-plugin-git/build.gradle +++ b/gradle-plugin-git/build.gradle @@ -18,6 +18,8 @@ dependencies { if (project.hasProperty('gradle.publish.key')) { gradlePlugin { + website = 'https://xbib.org/joerg/gradle-plugins/src/branch/main/gradle-plugin-git' + vcsUrl = 'https://xbib.org/joerg/gradle-plugins' plugins { gitPlugin { id = 'org.xbib.gradle.plugin.git' @@ -25,12 +27,8 @@ if (project.hasProperty('gradle.publish.key')) { version = project.version description = 'Git client plugin based on JGit' displayName = 'Git client plugin based on JGit' + tags.set(['git']) } } } - /*pluginBundle { - website = 'https://github.com/jprante/gradle-plugins' - vcsUrl = 'https://github.com/jprante/gradle-plugins' - tags = ['git'] - }*/ } diff --git a/gradle-plugin-jacc/build.gradle b/gradle-plugin-jacc/build.gradle index 7271118..32fc180 100755 --- a/gradle-plugin-jacc/build.gradle +++ b/gradle-plugin-jacc/build.gradle @@ -17,6 +17,8 @@ dependencies { if (project.hasProperty('gradle.publish.key')) { gradlePlugin { + website = 'https://xbib.org/joerg/gradle-plugins/src/branch/main/gradle-plugin-jacc' + vcsUrl = 'https://xbib.org/joerg/gradle-plugins' plugins { jaccPlugin { id = 'org.xbib.gradle.plugin.jacc' @@ -24,12 +26,8 @@ if (project.hasProperty('gradle.publish.key')) { version = project.version description = 'Gradle Jacc plugin' displayName = 'Gradle Jacc plugin' + tags.set(['jacc']) } } } - /*pluginBundle { - website = scmUrl - vcsUrl = scmUrl - tags = ['jacc'] - }*/ } diff --git a/gradle-plugin-jflex/build.gradle b/gradle-plugin-jflex/build.gradle index 3700bc2..2c95c97 100755 --- a/gradle-plugin-jflex/build.gradle +++ b/gradle-plugin-jflex/build.gradle @@ -17,6 +17,8 @@ dependencies { if (project.hasProperty('gradle.publish.key')) { gradlePlugin { + website = 'https://xbib.org/joerg/gradle-plugins/src/branch/main/gradle-plugin-jflex' + vcsUrl = 'https://xbib.org/joerg/gradle-plugins' plugins { jflexPlugin { id = 'org.xbib.gradle.plugin.jflex' @@ -24,12 +26,8 @@ if (project.hasProperty('gradle.publish.key')) { version = project.version description = 'Gradle JFlex plugin' displayName = 'Gradle JFlex plugin' + tags.set(['jflex']) } } } - /*pluginBundle { - website = scmUrl - vcsUrl = scmUrl - tags = ['jflex'] - }*/ } diff --git a/gradle-plugin-rpm/build.gradle b/gradle-plugin-rpm/build.gradle index b0e7f1d..d52c92b 100644 --- a/gradle-plugin-rpm/build.gradle +++ b/gradle-plugin-rpm/build.gradle @@ -25,6 +25,8 @@ publishing { if (project.hasProperty('gradle.publish.key')) { gradlePlugin { + website = 'https://xbib.org/joerg/gradle-plugins/src/branch/main/gradle-plugin-rpm' + vcsUrl = 'https://xbib.org/joerg/gradle-plugins' plugins { rpmPlugin { id = 'org.xbib.gradle.plugin.rpm' @@ -33,12 +35,8 @@ if (project.hasProperty('gradle.publish.key')) { description = 'Java implementation for RPM packaging' displayName = 'Java implementation for RPM packaging' implementationClass = 'org.xbib.gradle.plugin.RpmPlugin' + tags.set(['rpm']) } } } - /*pluginBundle { - website = 'https://github.com/jprante/gradle-plugins' - vcsUrl = 'https://github.com/jprante/gradle-plugins' - tags = [ 'rpm' ] - }*/ } diff --git a/gradle-plugin-shadow/build.gradle b/gradle-plugin-shadow/build.gradle index 0de1bd5..56673fa 100644 --- a/gradle-plugin-shadow/build.gradle +++ b/gradle-plugin-shadow/build.gradle @@ -21,6 +21,8 @@ dependencies { if (project.hasProperty('gradle.publish.key')) { gradlePlugin { + website = 'https://xbib.org/joerg/gradle-plugins/src/branch/main/gradle-plugin-shadow' + vcsUrl = 'https://xbib.org/joerg/gradle-plugins' plugins { shadowPlugin { id = 'org.xbib.gradle.plugin.shadow' @@ -29,12 +31,8 @@ if (project.hasProperty('gradle.publish.key')) { version = project.version description = 'Shadow plugin for Gradle' displayName = 'Shadow plugin for Gradle' + tags.set(['shadow']) } } } - /*pluginBundle { - website = scmUrl - vcsUrl = scmUrl - tags = [ 'shadow' ] - }*/ } diff --git a/gradle/compile/java.gradle b/gradle/compile/java.gradle index dec49b1..523f54d 100644 --- a/gradle/compile/java.gradle +++ b/gradle/compile/java.gradle @@ -4,7 +4,7 @@ apply plugin: 'java-library' java { modularity.inferModulePath.set(true) withSourcesJar() - withJavaDocJar() + withJavadocJar() } compileJava { diff --git a/settings.gradle b/settings.gradle index 25800c4..71bc9e1 100644 --- a/settings.gradle +++ b/settings.gradle @@ -22,10 +22,10 @@ dependencyResolutionManagement { library('jruby', 'org.jruby', 'jruby').version('9.4.2.0') library('jsoup', 'org.jsoup', 'jsoup').version('1.16.1') library('jflex', 'de.jflex', 'jflex').version('1.9.1') - library('jacc', 'org.xbib', 'jacc').version('2.2.0') + library('jacc', 'org.xbib', 'jacc').version('3.0.0') library('groovy-git', 'org.xbib.groovy', 'groovy-git').version('2.1.0') library('rpm', 'org.xbib', 'rpm-core').version('3.0.0') - plugin('publish', 'com.gradle.plugin-publish').version('1.0.0') + plugin('publish', 'com.gradle.plugin-publish').version('1.1.0') } } }