From d94b2e5cdc458b55da926de27088c68388510ead Mon Sep 17 00:00:00 2001 From: Violeta Georgieva Date: Mon, 4 Jul 2022 12:27:53 +0300 Subject: [PATCH 1/4] With Java toolchain in place AllowRedefinitionToAddDeleteMethods is not needed The exception below is thrown when Java version specified in the PATH is > 8 Unrecognized VM option 'AllowRedefinitionToAddDeleteMethods' Error: Could not create the Java Virtual Machine. Error: A fatal exception has occurred. Program will exit. Unrecognized VM option 'AllowRedefinitionToAddDeleteMethods' Error: Could not create the Java Virtual Machine. Error: A fatal exception has occurred. Program will exit. Process 'Gradle Test Executor 159' finished with non-zero exit value 1 org.gradle.process.internal.ExecException: Process 'Gradle Test Executor 159' finished with non-zero exit value 1 at org.gradle.process.internal.DefaultExecHandle$ExecResultImpl.assertNormalExitValue(DefaultExecHandle.java:414) at org.gradle.process.internal.worker.DefaultWorkerProcess.onProcessStop(DefaultWorkerProcess.java:141) at org.gradle.process.internal.worker.DefaultWorkerProcess.access$000(DefaultWorkerProcess.java:42) at org.gradle.process.internal.worker.DefaultWorkerProcess$1.executionFinished(DefaultWorkerProcess.java:94) --- build.gradle | 3 --- 1 file changed, 3 deletions(-) diff --git a/build.gradle b/build.gradle index 227347b978..ffde1a046e 100644 --- a/build.gradle +++ b/build.gradle @@ -233,9 +233,6 @@ subprojects { } project.tasks.withType(Test).all { - if (JavaVersion.current() > JavaVersion.VERSION_12) { - jvmArgs += "-XX:+AllowRedefinitionToAddDeleteMethods" - } // run tests with IPv4 only when IPv6 is available if (project.hasProperty('preferIPv4Stack')) { systemProperty("java.net.preferIPv4Stack", "true") From 0f23f3df843dec174b483755443c7815be359e2e Mon Sep 17 00:00:00 2001 From: Violeta Georgieva Date: Mon, 4 Jul 2022 13:19:09 +0300 Subject: [PATCH 2/4] Remove all checks for java version in order to generate correct javadoc Java version is now 8 for compiling, tests and javadoc --- build.gradle | 18 +++++------------- gradle/javadoc.gradle | 8 +++----- 2 files changed, 8 insertions(+), 18 deletions(-) diff --git a/build.gradle b/build.gradle index ffde1a046e..10ab1aeb4f 100644 --- a/build.gradle +++ b/build.gradle @@ -120,13 +120,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/javase/8/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/", @@ -217,12 +211,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' 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') From ec9defa05c42803c73af5f8378c83b4166f3850c Mon Sep 17 00:00:00 2001 From: Violeta Georgieva Date: Mon, 4 Jul 2022 13:22:12 +0300 Subject: [PATCH 3/4] Remove the dependency to bouncycastle --- reactor-netty-core/build.gradle | 7 ------- reactor-netty-http/build.gradle | 8 -------- reactor-netty-incubator-quic/build.gradle | 7 ------- 3 files changed, 22 deletions(-) diff --git a/reactor-netty-core/build.gradle b/reactor-netty-core/build.gradle index 67913b06e6..7437507c85 100644 --- a/reactor-netty-core/build.gradle +++ b/reactor-netty-core/build.gradle @@ -134,13 +134,6 @@ 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" - } - for (dependency in project.configurations.shaded.dependencies) { compileOnly(dependency) testImplementation(dependency) diff --git a/reactor-netty-http/build.gradle b/reactor-netty-http/build.gradle index 4b758ba6cc..f8fb9bba58 100644 --- a/reactor-netty-http/build.gradle +++ b/reactor-netty-http/build.gradle @@ -144,14 +144,6 @@ 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" - } - // noMicrometerTest sourceSet (must not include Micrometer) noMicrometerTestImplementation "org.assertj:assertj-core:$assertJVersion" noMicrometerTestImplementation "org.junit.jupiter:junit-jupiter-api:$junitVersion" diff --git a/reactor-netty-incubator-quic/build.gradle b/reactor-netty-incubator-quic/build.gradle index bcf3778170..99d4f45f0b 100644 --- a/reactor-netty-incubator-quic/build.gradle +++ b/reactor-netty-incubator-quic/build.gradle @@ -48,13 +48,6 @@ 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" - } } jar { From ca354db6753e16e5f8f132c3abc43d82c7ef8036 Mon Sep 17 00:00:00 2001 From: Violeta Georgieva Date: Mon, 4 Jul 2022 13:34:18 +0300 Subject: [PATCH 4/4] In addition to previous commit --- build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/build.gradle b/build.gradle index 10ab1aeb4f..712d69f4f8 100644 --- a/build.gradle +++ b/build.gradle @@ -118,7 +118,6 @@ ext { junitPlatformLauncherVersion = '1.8.2' mockitoVersion = '4.6.1' blockHoundVersion = '1.0.6.RELEASE' - bouncycastleVersion = '1.70' javadocLinks = ["https://docs.oracle.com/javase/8/docs/api/", "https://fasterxml.github.io/jackson-databind/javadoc/2.5/",