Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

With Java toolchain in place AllowRedefinitionToAddDeleteMethods is not needed #2352

Merged
merged 4 commits into from Jul 4, 2022
Merged

With Java toolchain in place AllowRedefinitionToAddDeleteMethods is not needed #2352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d94b2e5
With Java toolchain in place AllowRedefinitionToAddDeleteMethods is n…
violetagg Jul 4, 2022
0f23f3d
Remove all checks for java version in order to generate correct javadoc
violetagg Jul 4, 2022
ec9defa
Remove the dependency to bouncycastle
violetagg Jul 4, 2022
ca354db
In addition to previous commit
violetagg Jul 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 5 additions & 17 deletions build.gradle
View file
Open in desktop
Expand Up @@ -118,15 +118,8 @@ ext {
junitPlatformLauncherVersion = '1.8.2'
mockitoVersion = '4.6.1'
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/",
Expand Down Expand Up @@ -217,12 +210,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'
Expand All @@ -233,9 +224,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")
Expand Down
8 changes: 3 additions & 5 deletions gradle/javadoc.gradle
View file
Open in desktop
Expand Up @@ -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')
Expand Down
7 changes: 0 additions & 7 deletions reactor-netty-core/build.gradle
View file
Open in desktop
Expand Up @@ -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)
Expand Down
8 changes: 0 additions & 8 deletions reactor-netty-http/build.gradle
View file
Open in desktop
Expand Up @@ -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"
Expand Down
7 changes: 0 additions & 7 deletions reactor-netty-incubator-quic/build.gradle
View file
Open in desktop
Expand Up @@ -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 {
Expand Down