diff --git a/build.gradle b/build.gradle index a75f98371b..aa3501e6c5 100644 --- a/build.gradle +++ b/build.gradle @@ -124,13 +124,7 @@ ext { blockHoundVersion = '1.0.6.RELEASE' bouncycastleVersion = '1.70' - jdk = JavaVersion.current().majorVersion - jdkJavadoc = "https://docs.oracle.com/javase/${jdk}/docs/api/" - if (JavaVersion.current().isJava11Compatible()) { - jdkJavadoc = "https://docs.oracle.com/en/java/javase/${jdk}/docs/api/" - } - println "JDK Javadoc link for this build is ${jdkJavadoc}" - javadocLinks = [jdkJavadoc, + javadocLinks = ["https://docs.oracle.com/en/java/javase/17/docs/api/", "https://fasterxml.github.io/jackson-databind/javadoc/2.5/", "https://www.reactive-streams.org/reactive-streams-1.0.4-javadoc/", "https://projectreactor.io/docs/core/release/api/", @@ -220,12 +214,10 @@ subprojects { "-Xlint:rawtypes" ] - if (JavaVersion.current().isJava8Compatible()) { - compileTestJava.options.compilerArgs += "-parameters" - tasks.withType(Javadoc) { - options.addStringOption('Xdoclint:none', '-quiet') - options.addStringOption('encoding', 'UTF-8') - } + compileTestJava.options.compilerArgs += "-parameters" + tasks.withType(Javadoc) { + options.addStringOption('Xdoclint:none', '-quiet') + options.addStringOption('encoding', 'UTF-8') } [compileJava, compileTestJava]*.options*.encoding = 'UTF-8' @@ -236,9 +228,7 @@ subprojects { } project.tasks.withType(Test).all { - if (JavaVersion.current() > JavaVersion.VERSION_12) { - jvmArgs += "-XX:+AllowRedefinitionToAddDeleteMethods" - } + jvmArgs += "-XX:+AllowRedefinitionToAddDeleteMethods" // run tests with IPv4 only when IPv6 is available if (project.hasProperty('preferIPv4Stack')) { systemProperty("java.net.preferIPv4Stack", "true") diff --git a/gradle/javadoc.gradle b/gradle/javadoc.gradle index 672b5841e8..ba9a9ffa76 100644 --- a/gradle/javadoc.gradle +++ b/gradle/javadoc.gradle @@ -24,11 +24,9 @@ project.tasks.withType(Javadoc) { description = "Generates aggregated Javadoc API documentation." title = "${project.name} ${version}" - if (JavaVersion.current().isJava8Compatible()) { - compileTestJava.options.compilerArgs += "-parameters" - tasks.withType(Javadoc) { - options.addStringOption('Xdoclint:none', '-quiet') - } + compileTestJava.options.compilerArgs += "-parameters" + tasks.withType(Javadoc) { + options.addStringOption('Xdoclint:none', '-quiet') } options.addStringOption('charSet', 'UTF-8') diff --git a/reactor-netty-core/build.gradle b/reactor-netty-core/build.gradle index 5fae8f4987..6c775163e7 100644 --- a/reactor-netty-core/build.gradle +++ b/reactor-netty-core/build.gradle @@ -140,12 +140,10 @@ dependencies { testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junitVersion" testRuntimeOnly "org.slf4j:jcl-over-slf4j:$slf4jVersion" - if (JavaVersion.current() > JavaVersion.VERSION_14) { - // https://github.com/netty/netty/pull/11487 - // https://github.com/netty/netty/issues/10317 - // Necessary for generating SelfSignedCertificate on Java version >= 15 - testRuntimeOnly "org.bouncycastle:bcpkix-jdk15on:$bouncycastleVersion" - } + // https://github.com/netty/netty/pull/11487 + // https://github.com/netty/netty/issues/10317 + // Necessary for generating SelfSignedCertificate on Java version >= 15 + testRuntimeOnly "org.bouncycastle:bcpkix-jdk15on:$bouncycastleVersion" for (dependency in project.configurations.shaded.dependencies) { compileOnly(dependency) diff --git a/reactor-netty-http/build.gradle b/reactor-netty-http/build.gradle index f2aefb78d0..44d9b7fe37 100644 --- a/reactor-netty-http/build.gradle +++ b/reactor-netty-http/build.gradle @@ -153,13 +153,11 @@ dependencies { // Needed for HTTP/2 testing testRuntimeOnly "io.netty:netty-tcnative-boringssl-static:$boringSslVersion$os_suffix" - if (JavaVersion.current() > JavaVersion.VERSION_14) { - // https://github.com/netty/netty/pull/11487 - // https://github.com/netty/netty/issues/10317 - // Necessary for generating SelfSignedCertificate on Java version >= 15 - testRuntimeOnly "org.bouncycastle:bcpkix-jdk15on:$bouncycastleVersion" - noMicrometerTestRuntimeOnly "org.bouncycastle:bcpkix-jdk15on:$bouncycastleVersion" - } + // https://github.com/netty/netty/pull/11487 + // https://github.com/netty/netty/issues/10317 + // Necessary for generating SelfSignedCertificate on Java version >= 15 + testRuntimeOnly "org.bouncycastle:bcpkix-jdk15on:$bouncycastleVersion" + noMicrometerTestRuntimeOnly "org.bouncycastle:bcpkix-jdk15on:$bouncycastleVersion" // noMicrometerTest sourceSet (must not include Micrometer) noMicrometerTestImplementation "org.assertj:assertj-core:$assertJVersion" diff --git a/reactor-netty-incubator-quic/build.gradle b/reactor-netty-incubator-quic/build.gradle index bcf3778170..676fe08aad 100644 --- a/reactor-netty-incubator-quic/build.gradle +++ b/reactor-netty-incubator-quic/build.gradle @@ -49,12 +49,10 @@ dependencies { testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junitVersion" testRuntimeOnly "ch.qos.logback:logback-classic:$logbackVersion" - if (JavaVersion.current() > JavaVersion.VERSION_14) { - // https://github.com/netty/netty/pull/11487 - // https://github.com/netty/netty/issues/10317 - // Necessary for generating SelfSignedCertificate on Java version >= 15 - testRuntimeOnly "org.bouncycastle:bcpkix-jdk15on:$bouncycastleVersion" - } + // https://github.com/netty/netty/pull/11487 + // https://github.com/netty/netty/issues/10317 + // Necessary for generating SelfSignedCertificate on Java version >= 15 + testRuntimeOnly "org.bouncycastle:bcpkix-jdk15on:$bouncycastleVersion" } jar {