Skip to content

Commit 404ad9a

Browse files
committed
Remove BlockHound dependency
Since it is not yet GA Fixes gh-7220
1 parent 23d0653 commit 404ad9a

File tree

3 files changed

+0
-16
lines changed

3 files changed

+0
-16
lines changed

gradle/dependency-management.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ dependencyManagement {
7070
dependency 'commons-lang:commons-lang:2.6'
7171
dependency 'commons-logging:commons-logging:1.2'
7272
dependency 'dom4j:dom4j:1.6.1'
73-
dependency 'io.projectreactor.tools:blockhound:1.0.0.M4'
7473
dependency 'javax.activation:activation:1.1.1'
7574
dependency 'javax.annotation:jsr250-api:1.0'
7675
dependency 'javax.inject:javax.inject:1'

oauth2/oauth2-client/spring-security-oauth2-client.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ dependencies {
1717
testCompile 'com.fasterxml.jackson.core:jackson-databind'
1818
testCompile 'io.projectreactor.netty:reactor-netty'
1919
testCompile 'io.projectreactor:reactor-test'
20-
testCompile 'io.projectreactor.tools:blockhound'
2120

2221
provided 'javax.servlet:javax.servlet-api'
2322
}

oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/reactive/function/client/ServletOAuth2AuthorizedClientExchangeFilterFunctionITests.java

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import okhttp3.mockwebserver.MockWebServer;
2020
import org.junit.After;
2121
import org.junit.Before;
22-
import org.junit.BeforeClass;
2322
import org.junit.Test;
2423
import org.mockito.ArgumentCaptor;
2524
import org.springframework.http.HttpHeaders;
@@ -42,7 +41,6 @@
4241
import org.springframework.web.context.request.RequestContextHolder;
4342
import org.springframework.web.context.request.ServletRequestAttributes;
4443
import org.springframework.web.reactive.function.client.WebClient;
45-
import reactor.blockhound.BlockHound;
4644

4745
import javax.servlet.http.HttpServletRequest;
4846
import javax.servlet.http.HttpServletResponse;
@@ -70,18 +68,6 @@ public class ServletOAuth2AuthorizedClientExchangeFilterFunctionITests {
7068
private MockHttpServletRequest request;
7169
private MockHttpServletResponse response;
7270

73-
@BeforeClass
74-
public static void setUpBlockingChecks() {
75-
// IMPORTANT:
76-
// Before enabling BlockHound, we need to white-list `java.lang.Class.getPackage()`.
77-
// When the JVM loads `java.lang.Package.getSystemPackage()`, it attempts to
78-
// `java.lang.Package.loadManifest()` which is blocking I/O and triggers BlockHound to error.
79-
// NOTE: This is an issue with JDK 8. It's been tested on JDK 10 and works fine w/o this white-list.
80-
BlockHound.builder()
81-
.allowBlockingCallsInside(Class.class.getName(), "getPackage")
82-
.install();
83-
}
84-
8571
@Before
8672
public void setUp() throws Exception {
8773
this.clientRegistrationRepository = mock(ClientRegistrationRepository.class);

0 commit comments

Comments
 (0)