Skip to content

Commit f6b4469

Browse files
committed
rollbacks some build.gradle refactoring
Signed-off-by: Oleh Dokuka <[email protected]>
1 parent 274cd08 commit f6b4469

File tree

1 file changed

+6
-42
lines changed

1 file changed

+6
-42
lines changed

build.gradle

Lines changed: 6 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -109,61 +109,25 @@ subprojects {
109109
}
110110

111111
javadoc {
112-
def jdk = JavaVersion.current().majorVersion
113-
def jdkJavadoc = "https://docs.oracle.com/javase/$jdk/docs/api/"
114-
if (JavaVersion.current().isJava11Compatible()) {
115-
jdkJavadoc = "https://docs.oracle.com/en/java/javase/$jdk/docs/api/"
116-
}
117112
options.with {
118-
links jdkJavadoc
113+
links 'https://docs.oracle.com/javase/8/docs/api/'
119114
links 'https://projectreactor.io/docs/core/release/api/'
120115
links 'https://netty.io/4.1/api/'
121116
}
122117
}
123118

124-
tasks.named("javadoc").configure {
125-
onlyIf { System.getenv('SKIP_RELEASE') != "true" }
126-
}
127-
128119
test {
129120
useJUnitPlatform()
130121

131-
systemProperty "io.netty.leakDetection.level", "ADVANCED"
132-
}
133-
134-
//all test tasks will show FAILED for each test method,
135-
// common exclusions, no scanning
136-
project.tasks.withType(Test).all {
137122
testLogging {
138-
events "FAILED"
139-
showExceptions true
140-
exceptionFormat "FULL"
141-
stackTraceFilters "ENTRY_POINT"
142-
maxGranularity 3
123+
events "started", "passed", "skipped", "failed"
143124
}
144125

145-
if (JavaVersion.current().isJava9Compatible()) {
146-
println "Java 9+: lowering MaxGCPauseMillis to 20ms in ${project.name} ${name}"
147-
jvmArgs = ["-XX:MaxGCPauseMillis=20"]
148-
}
126+
systemProperty "io.netty.leakDetection.level", "ADVANCED"
127+
}
149128

150-
systemProperty("java.awt.headless", "true")
151-
systemProperty("reactor.trace.cancel", "true")
152-
systemProperty("reactor.trace.nocapacity", "true")
153-
systemProperty("testGroups", project.properties.get("testGroups"))
154-
scanForTestClasses = false
155-
exclude '**/*Abstract*.*'
156-
157-
//allow re-run of failed tests only without special test tasks failing
158-
// because the filter is too restrictive
159-
filter.setFailOnNoMatchingTests(false)
160-
161-
//display intermediate results for special test tasks
162-
afterSuite { desc, result ->
163-
if (!desc.parent) { // will match the outermost suite
164-
println('\n' + "${desc} Results: ${result.resultType} (${result.testCount} tests, ${result.successfulTestCount} successes, ${result.failedTestCount} failures, ${result.skippedTestCount} skipped)")
165-
}
166-
}
129+
tasks.named("javadoc").configure {
130+
onlyIf { System.getenv('SKIP_RELEASE') != "true" }
167131
}
168132
}
169133

0 commit comments

Comments
 (0)