Bump braveVersion to version 5.17.0

build.gradle

@@ -88,7 +88,7 @@ ext {
 
 	contextPropagationVersion = '1.0.0' //optional baseline
 
-	braveVersion = '5.16.0'
+	braveVersion = '5.17.0'
 
 	jsr305Version = '3.0.2'
 

reactor-netty-http-brave/build.gradle

@@ -41,9 +41,10 @@ dependencies {
 	// JSR-305 annotations
 	testCompileOnly "com.google.code.findbugs:jsr305:$jsr305Version"
 
+	testImplementation "org.junit.jupiter:junit-jupiter-api:$junitVersion"
 	testImplementation "io.zipkin.brave:brave-instrumentation-http-tests:$braveVersion"
 
-	testRuntimeOnly "org.junit.vintage:junit-vintage-engine:$junitVersion"
+	testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junitVersion"
 	testRuntimeOnly "ch.qos.logback:logback-classic:$logbackVersion"
 }
 

reactor-netty-http-brave/src/test/java/reactor/netty/http/brave/ITTracingHttpClientDecoratorTest.java

@@ -25,8 +25,8 @@
 import io.netty.handler.codec.http.HttpMethod;
 import io.netty.util.concurrent.DefaultEventExecutor;
 import io.netty.util.concurrent.EventExecutor;
-import org.junit.AfterClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
 import reactor.core.publisher.Mono;
 import reactor.netty.DisposableServer;
 import reactor.netty.http.client.HttpClient;
@@ -49,7 +49,7 @@ public class ITTracingHttpClientDecoratorTest extends ITHttpAsyncClient<HttpClie
 	private ChannelGroup group;
 	private static final EventExecutor executor = new DefaultEventExecutor();
 
-	@AfterClass
+	@AfterAll
 	public static void afterClass() throws Exception {
 		executor.shutdownGracefully()
 		        .get(5, TimeUnit.SECONDS);

reactor-netty-http-brave/src/test/java/reactor/netty/http/brave/ITTracingHttpServerDecoratorTest.java

@@ -20,10 +20,10 @@
 import io.netty.channel.group.DefaultChannelGroup;
 import io.netty.util.concurrent.DefaultEventExecutor;
 import io.netty.util.concurrent.EventExecutor;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 import reactor.core.publisher.Mono;
 import reactor.core.scheduler.Schedulers;
 import reactor.netty.DisposableServer;
@@ -41,13 +41,13 @@ public class ITTracingHttpServerDecoratorTest extends ITHttpServer {
 	private ChannelGroup group;
 	private static final EventExecutor executor = new DefaultEventExecutor();
 
-	@AfterClass
+	@AfterAll
 	public static void afterClass() throws Exception {
 		executor.shutdownGracefully()
 		        .get(5, TimeUnit.SECONDS);
 	}
 
-	@After
+	@AfterEach
 	@Override
 	public void close() throws Exception {
 		if (disposableServer != null) {
@@ -124,13 +124,13 @@ protected String url(String path) {
 	}
 
 	@Override
-	@Ignore
+	@Disabled
 	public void httpStatusCodeSettable_onUncaughtException() {
 		// Reactor Netty always returns 500 ISE when an exception happens
 	}
 
 	@Override
-	@Ignore
+	@Disabled
 	public void httpStatusCodeSettable_onUncaughtException_async() {
 		// Reactor Netty always returns 500 ISE when an exception happens
 	}