Revert "Fix snapshot build failure related to reactor-netty"

jgrandja · jgrandja · commit 3bc0b8c144f9 · 2020-08-04T14:24:32.000-04:00
This reverts commit f37714a.
diff --git a/config/spring-security-config.gradle b/config/spring-security-config.gradle
@@ -47,7 +47,7 @@ dependencies {
 	testCompile powerMock2Dependencies
 	testCompile 'com.squareup.okhttp3:mockwebserver'
 	testCompile 'ch.qos.logback:logback-classic'
-	testCompile 'io.projectreactor.netty:reactor-netty-http'
+	testCompile 'io.projectreactor.netty:reactor-netty'
 	testCompile 'io.rsocket:rsocket-transport-netty'
 	testCompile 'javax.annotation:jsr250-api:1.0'
 	testCompile 'javax.xml.bind:jaxb-api'
diff --git a/oauth2/oauth2-client/spring-security-oauth2-client.gradle b/oauth2/oauth2-client/spring-security-oauth2-client.gradle
@@ -18,7 +18,7 @@ dependencies {
 	testCompile project(path: ':spring-security-oauth2-jose', configuration: 'tests')
 	testCompile powerMock2Dependencies
 	testCompile 'com.squareup.okhttp3:mockwebserver'
-	testCompile 'io.projectreactor.netty:reactor-netty-http'
+	testCompile 'io.projectreactor.netty:reactor-netty'
 	testCompile 'io.projectreactor:reactor-test'
 	testCompile 'io.projectreactor.tools:blockhound'
 	testCompile 'org.skyscreamer:jsonassert'
diff --git a/oauth2/oauth2-jose/spring-security-oauth2-jose.gradle b/oauth2/oauth2-jose/spring-security-oauth2-jose.gradle
@@ -11,6 +11,6 @@ dependencies {
 
 	testCompile powerMock2Dependencies
 	testCompile 'com.squareup.okhttp3:mockwebserver'
-	testCompile 'io.projectreactor.netty:reactor-netty-http'
+	testCompile 'io.projectreactor.netty:reactor-netty'
 	testCompile 'com.fasterxml.jackson.core:jackson-databind'
 }
diff --git a/oauth2/oauth2-resource-server/spring-security-oauth2-resource-server.gradle b/oauth2/oauth2-resource-server/spring-security-oauth2-resource-server.gradle
@@ -16,6 +16,6 @@ dependencies {
 	testCompile project(path: ':spring-security-oauth2-jose', configuration: 'tests')
 	testCompile 'com.squareup.okhttp3:mockwebserver'
 	testCompile 'com.fasterxml.jackson.core:jackson-databind'
-	testCompile 'io.projectreactor.netty:reactor-netty-http'
+	testCompile 'io.projectreactor.netty:reactor-netty'
 	testCompile 'io.projectreactor:reactor-test'
 }
diff --git a/samples/boot/oauth2webclient-webflux/spring-security-samples-boot-oauth2webclient-webflux.gradle b/samples/boot/oauth2webclient-webflux/spring-security-samples-boot-oauth2webclient-webflux.gradle
@@ -7,7 +7,7 @@ dependencies {
 	compile 'org.springframework.boot:spring-boot-starter-thymeleaf'
 	compile 'org.springframework.boot:spring-boot-starter-webflux'
 	compile 'org.thymeleaf.extras:thymeleaf-extras-springsecurity5'
-	compile 'io.projectreactor.netty:reactor-netty-http'
+	compile 'io.projectreactor.netty:reactor-netty'
 
 	testCompile project(':spring-security-test')
 	testCompile 'org.springframework.boot:spring-boot-starter-test'
diff --git a/samples/boot/oauth2webclient/spring-security-samples-boot-oauth2webclient.gradle b/samples/boot/oauth2webclient/spring-security-samples-boot-oauth2webclient.gradle
@@ -8,7 +8,7 @@ dependencies {
 	compile 'org.springframework.boot:spring-boot-starter-thymeleaf'
 	compile 'org.springframework.boot:spring-boot-starter-web'
 	compile 'org.thymeleaf.extras:thymeleaf-extras-springsecurity5'
-	compile 'io.projectreactor.netty:reactor-netty-http'
+	compile 'io.projectreactor.netty:reactor-netty'
 
 	testCompile project(':spring-security-test')
 	testCompile 'org.springframework.boot:spring-boot-starter-test'

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,6 @@ dependencies {`
`11`	`11`
`12`	`12`	`testCompile powerMock2Dependencies`
`13`	`13`	`testCompile 'com.squareup.okhttp3:mockwebserver'`
`14`		`- testCompile 'io.projectreactor.netty:reactor-netty-http'`
	`14`	`+ testCompile 'io.projectreactor.netty:reactor-netty'`
`15`	`15`	`testCompile 'com.fasterxml.jackson.core:jackson-databind'`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,6 @@ dependencies {`
`16`	`16`	`testCompile project(path: ':spring-security-oauth2-jose', configuration: 'tests')`
`17`	`17`	`testCompile 'com.squareup.okhttp3:mockwebserver'`
`18`	`18`	`testCompile 'com.fasterxml.jackson.core:jackson-databind'`
`19`		`- testCompile 'io.projectreactor.netty:reactor-netty-http'`
	`19`	`+ testCompile 'io.projectreactor.netty:reactor-netty'`
`20`	`20`	`testCompile 'io.projectreactor:reactor-test'`
`21`	`21`	`}`