diff --git a/gradle.properties b/gradle.properties index a674653..6937a4c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ name = netty-http version = 4.1.72.1 org.gradle.warning.mode = ALL -gradle.wrapper.version = 7.3 +gradle.wrapper.version = 7.3.2 netty.version = 4.1.72.Final tcnative.version = 2.0.46.Final bouncycastle.version = 1.69 @@ -13,4 +13,4 @@ jackson.version = 2.12.5 mockito.version = 3.10.0 xbib.net.version = 2.1.1 xbib-guice.version = 4.4.2 -junit.version = 5.8.1 +junit.version = 5.8.2 diff --git a/gradle/compile/java.gradle b/gradle/compile/java.gradle index d6b52f8..da21de7 100644 --- a/gradle/compile/java.gradle +++ b/gradle/compile/java.gradle @@ -23,12 +23,14 @@ jar { } } -task sourcesJar(type: Jar, dependsOn: classes) { +task sourcesJar(type: Jar) { + dependsOn classes classifier 'sources' from sourceSets.main.allSource } -task javadocJar(type: Jar, dependsOn: javadoc) { +task javadocJar(type: Jar) { + dependsOn javadoc classifier 'javadoc' from javadoc.destinationDir } diff --git a/gradle/documentation/asciidoc.gradle b/gradle/documentation/asciidoc.gradle index 87ba22e..da6dd7e 100644 --- a/gradle/documentation/asciidoc.gradle +++ b/gradle/documentation/asciidoc.gradle @@ -1,14 +1,5 @@ apply plugin: 'org.xbib.gradle.plugin.asciidoctor' -configurations { - asciidoclet -} - -dependencies { - asciidoclet "org.asciidoctor:asciidoclet:${project.property('asciidoclet.version')}" -} - - asciidoctor { backends 'html5' outputDir = file("${rootProject.projectDir}/docs") @@ -26,30 +17,3 @@ asciidoctor { imagesdir: 'img', stylesheet: "${projectDir}/src/docs/asciidoc/css/foundation.css" } - - -/*javadoc { -options.docletpath = configurations.asciidoclet.files.asType(List) -options.doclet = 'org.asciidoctor.Asciidoclet' -//options.overview = "src/docs/asciidoclet/overview.adoc" -options.addStringOption "-base-dir", "${projectDir}" -options.addStringOption "-attribute", - "name=${project.name},version=${project.version},title-link=https://github.com/xbib/${project.name}" -configure(options) { - noTimestamp = true -} -}*/ - - -/*javadoc { - options.docletpath = configurations.asciidoclet.files.asType(List) - options.doclet = 'org.asciidoctor.Asciidoclet' - options.overview = "${rootProject.projectDir}/src/docs/asciidoclet/overview.adoc" - options.addStringOption "-base-dir", "${projectDir}" - options.addStringOption "-attribute", - "name=${project.name},version=${project.version},title-link=https://github.com/xbib/${project.name}" - options.destinationDirectory(file("${projectDir}/docs/javadoc")) - configure(options) { - noTimestamp = true - } -}*/ diff --git a/gradle/ide/idea.gradle b/gradle/ide/idea.gradle index 64e2167..5bd2095 100644 --- a/gradle/ide/idea.gradle +++ b/gradle/ide/idea.gradle @@ -6,8 +6,3 @@ idea { testOutputDir file('build/classes/java/test') } } - -if (project.convention.findPlugin(JavaPluginConvention)) { - //sourceSets.main.output.classesDirs = file("build/classes/java/main") - //sourceSets.test.output.classesDirs = file("build/classes/java/test") -} diff --git a/gradle/test/junit5.gradle b/gradle/test/junit5.gradle index 9777b6a..b7ff276 100644 --- a/gradle/test/junit5.gradle +++ b/gradle/test/junit5.gradle @@ -1,5 +1,5 @@ -def junitVersion = project.hasProperty('junit.version')?project.property('junit.version'):'5.7.1' +def junitVersion = project.hasProperty('junit.version')?project.property('junit.version'):'5.8.2' def hamcrestVersion = project.hasProperty('hamcrest.version')?project.property('hamcrest.version'):'2.2' dependencies { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index fbce071..ac0b842 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists