diff --git a/gradle-plugin-asciidoctor/build.gradle b/gradle-plugin-asciidoctor/build.gradle index f729333..23752ab 100644 --- a/gradle-plugin-asciidoctor/build.gradle +++ b/gradle-plugin-asciidoctor/build.gradle @@ -12,7 +12,7 @@ dependencies { api gradleApi() implementation libs.asciidoctorj implementation libs.jruby - testImplementation libs.spock.core + testImplementation libs.spock.core testImplementation libs.jsoup } @@ -23,18 +23,12 @@ if (project.hasProperty('gradle.publish.key')) { 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' + description = 'Asciidoctor plugin for building documentations (inofficial xbib fork)' + displayName = 'Asciidoctor plugin for building documentations (inofficial xbib fork)' } } } pluginBundle { -/* 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' tags = ['asciidoctor'] diff --git a/gradle-plugin-asciidoctor/gradle.properties b/gradle-plugin-asciidoctor/gradle.properties index 7040edc..fd8b8cd 100644 --- a/gradle-plugin-asciidoctor/gradle.properties +++ b/gradle-plugin-asciidoctor/gradle.properties @@ -1,2 +1,2 @@ name = gradle-plugin-asciidoctor -version = 2.5.2.1 +version = 2.5.2.2 diff --git a/gradle/compile/java.gradle b/gradle/compile/java.gradle index 019f777..13465b7 100644 --- a/gradle/compile/java.gradle +++ b/gradle/compile/java.gradle @@ -23,8 +23,10 @@ jar { tasks.withType(JavaCompile) { options.compilerArgs.add('-Xlint:all,-fallthrough') + options.encoding = 'UTF-8' } -javadoc { +tasks.withType(Javadoc) { options.addStringOption('Xdoclint:none', '-quiet') + options.encoding = 'UTF-8' } diff --git a/settings.gradle b/settings.gradle index 7cbc160..5c93396 100644 --- a/settings.gradle +++ b/settings.gradle @@ -13,19 +13,19 @@ dependencyResolutionManagement { library('junit-jupiter-api', 'org.junit.jupiter', 'junit-jupiter-api').versionRef('junit') library('junit-jupiter-params', 'org.junit.jupiter', 'junit-jupiter-params').versionRef('junit') library('junit-jupiter-engine', 'org.junit.jupiter', 'junit-jupiter-engine').versionRef('junit') - library('hamcrest', 'org.hamcrest:hamcrest-library:2.2') - library('junit4', 'junit:junit:4.13.2') + library('hamcrest', 'org.hamcrest', 'hamcrest-library').version('2.2') + library('junit4', 'junit', 'junit').version('4.13.2') library('asm', 'org.ow2.asm', 'asm').versionRef('asm') library('asm-commons', 'org.ow2.asm', 'asm-commons').versionRef('asm') library('asm-util', 'org.ow2.asm', 'asm-util').versionRef('asm') - library('asciidoctorj', 'org.asciidoctor:asciidoctorj:2.5.2') - library('jruby', 'org.jruby:jruby:9.3.2.0') - library('jsoup', 'org.jsoup:jsoup:1.11.2') - library('jflex', 'de.jflex:jflex:1.8.2') - library('jacc', 'org.xbib:jacc:2.2.0') + library('asciidoctorj', 'org.asciidoctor', 'asciidoctorj').version('2.5.7') + library('jruby', 'org.jruby', 'jruby').version('9.3.9.0') + library('jsoup', 'org.jsoup', 'jsoup').version('1.15.3') + library('jflex', 'de.jflex', 'jflex').version('1.8.2') + library('jacc', 'org.xbib', 'jacc').version('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('1.0.0-rc-2') + plugin('publish', 'com.gradle.plugin-publish').version('1.0.0') } } }