From 711500865c1be364625e019989e9bdca4711dbc7 Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Fri, 16 Dec 2022 19:30:30 +0000 Subject: [PATCH 1/3] remove html flag remove in newer version of Java --- .../kotlin/org/openmicroscopy/AdditionalArtifactsPlugin.kt | 3 --- 1 file changed, 3 deletions(-) diff --git a/buildSrc/src/main/kotlin/org/openmicroscopy/AdditionalArtifactsPlugin.kt b/buildSrc/src/main/kotlin/org/openmicroscopy/AdditionalArtifactsPlugin.kt index 3529bb2..76215ad 100644 --- a/buildSrc/src/main/kotlin/org/openmicroscopy/AdditionalArtifactsPlugin.kt +++ b/buildSrc/src/main/kotlin/org/openmicroscopy/AdditionalArtifactsPlugin.kt @@ -23,9 +23,6 @@ class AdditionalArtifactsPlugin : Plugin { // Configure java doc options val stdOpts = options as StandardJavadocDocletOptions stdOpts.addStringOption("Xdoclint:none", "-quiet") - if (JavaVersion.current().isJava9Compatible) { - stdOpts.addBooleanOption("html5", true) - } } tasks.register("sourcesJar") { From 840140d5a8f76c0a94c560c23256504372ef5a06 Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Sun, 18 Dec 2022 07:33:27 +0000 Subject: [PATCH 2/3] fix version number --- buildSrc/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index a8256a4..01e1cd2 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -4,7 +4,7 @@ plugins { } group = "org.openmicroscopy" -version = "5.5.4" +version = "5.5.5-SNAPSHOT" kotlinDslPluginOptions { experimentalWarning.set(false) From dc3556990331c1e4193b22452fbc1320bc9fb6ba Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Sun, 18 Dec 2022 14:55:45 +0000 Subject: [PATCH 3/3] remove deprecated option --- .../kotlin/org/openmicroscopy/AdditionalArtifactsPlugin.kt | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/main/kotlin/org/openmicroscopy/AdditionalArtifactsPlugin.kt b/src/main/kotlin/org/openmicroscopy/AdditionalArtifactsPlugin.kt index d105b43..df0f7e3 100644 --- a/src/main/kotlin/org/openmicroscopy/AdditionalArtifactsPlugin.kt +++ b/src/main/kotlin/org/openmicroscopy/AdditionalArtifactsPlugin.kt @@ -44,9 +44,6 @@ class AdditionalArtifactsPlugin : Plugin { // Configure java doc options val stdOpts = options as StandardJavadocDocletOptions stdOpts.addStringOption("Xdoclint:none", "-quiet") - if (JavaVersion.current().isJava9Compatible) { - stdOpts.addBooleanOption("html5", true) - } } tasks.register("sourcesJar") {