mirror of https://github.com/grpc/grpc-java.git
servlet: Remove unused dependency on grpc-util in tests
Also convert to testFixtures, like we did elsewhere. grpc-testing had previously been listed, but because of the missing comma, it was not an actual dependency.
This commit is contained in:
parent
b526a68622
commit
3f60746a98
|
|
@ -42,8 +42,7 @@ dependencies {
|
||||||
|
|
||||||
itImplementation project(':grpc-servlet'),
|
itImplementation project(':grpc-servlet'),
|
||||||
project(':grpc-netty'),
|
project(':grpc-netty'),
|
||||||
project(':grpc-core').sourceSets.test.runtimeClasspath,
|
testFixtures(project(':grpc-core')),
|
||||||
project(':grpc-util').sourceSets.test.runtimeClasspath,
|
|
||||||
libraries.junit
|
libraries.junit
|
||||||
itImplementation(project(':grpc-interop-testing')) {
|
itImplementation(project(':grpc-interop-testing')) {
|
||||||
// Avoid grpc-netty-shaded dependency
|
// Avoid grpc-netty-shaded dependency
|
||||||
|
|
@ -57,8 +56,10 @@ dependencies {
|
||||||
|
|
||||||
jettyTestImplementation "org.eclipse.jetty:jetty-servlet:${jettyVersion}",
|
jettyTestImplementation "org.eclipse.jetty:jetty-servlet:${jettyVersion}",
|
||||||
"org.eclipse.jetty.http2:http2-server:${jettyVersion}",
|
"org.eclipse.jetty.http2:http2-server:${jettyVersion}",
|
||||||
"org.eclipse.jetty:jetty-client:${jettyVersion}"
|
"org.eclipse.jetty:jetty-client:${jettyVersion}",
|
||||||
project(':grpc-testing')
|
project(':grpc-testing'),
|
||||||
|
libraries.truth,
|
||||||
|
libraries.protobuf.java
|
||||||
}
|
}
|
||||||
|
|
||||||
test {
|
test {
|
||||||
|
|
|
||||||
|
|
@ -79,8 +79,7 @@ dependencies {
|
||||||
|
|
||||||
itImplementation project(':grpc-servlet-jakarta'),
|
itImplementation project(':grpc-servlet-jakarta'),
|
||||||
project(':grpc-netty'),
|
project(':grpc-netty'),
|
||||||
project(':grpc-core').sourceSets.test.runtimeClasspath,
|
testFixtures(project(':grpc-core')),
|
||||||
project(':grpc-util').sourceSets.test.runtimeClasspath,
|
|
||||||
libraries.junit
|
libraries.junit
|
||||||
itImplementation(project(':grpc-interop-testing')) {
|
itImplementation(project(':grpc-interop-testing')) {
|
||||||
// Avoid grpc-netty-shaded dependency
|
// Avoid grpc-netty-shaded dependency
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue