Skip to content

Commit b339022

Browse files
committed
Remove org.apache.tomcat:annotations-api dep
f8700a1 stopped using the dependency in our generated code and removed the dependency the Bazel build. 4f6948f removed mention of the dependency in our README. This deletes it from our Gradle build and the examples.
1 parent 9746bb4 commit b339022

File tree

44 files changed

+5
-100
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+5
-100
lines changed

alts/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ dependencies {
2222
libraries.guava.jre, // JRE required by protobuf-java-util from grpclb
2323
libraries.google.auth.oauth2Http
2424
def nettyDependency = implementation project(':grpc-netty')
25-
compileOnly libraries.javax.annotation
2625

2726
shadow configurations.implementation.getDependencies().minus(nettyDependency)
2827
shadow project(path: ':grpc-netty-shaded', configuration: 'shadow')

android-interop-testing/build.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,6 @@ dependencies {
8383
exclude group: 'com.google.guava'
8484
}
8585

86-
compileOnly libraries.javax.annotation
87-
8886
androidTestImplementation 'androidx.test.ext:junit:1.1.3',
8987
'androidx.test:runner:1.4.0'
9088
}

authz/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ dependencies {
1515
libraries.guava.jre // JRE required by transitive protobuf-java-util
1616

1717
annotationProcessor libraries.auto.value
18-
compileOnly libraries.javax.annotation
1918

2019
testImplementation project(':grpc-testing'),
2120
project(':grpc-testing-proto'),

benchmarks/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ dependencies {
3838
classifier = "linux-x86_64"
3939
}
4040
}
41-
compileOnly libraries.javax.annotation
4241

4342
testImplementation libraries.junit,
4443
libraries.mockito.core

compiler/build.gradle

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -147,11 +147,9 @@ sourceSets {
147147

148148
dependencies {
149149
testImplementation project(':grpc-protobuf'),
150-
project(':grpc-stub'),
151-
libraries.javax.annotation
150+
project(':grpc-stub')
152151
testLiteImplementation project(':grpc-protobuf-lite'),
153-
project(':grpc-stub'),
154-
libraries.javax.annotation
152+
project(':grpc-stub')
155153
}
156154

157155
tasks.named("compileTestJava").configure {

examples/android/clientcache/app/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ dependencies {
5757
implementation 'io.grpc:grpc-okhttp:1.76.0-SNAPSHOT' // CURRENT_GRPC_VERSION
5858
implementation 'io.grpc:grpc-protobuf-lite:1.76.0-SNAPSHOT' // CURRENT_GRPC_VERSION
5959
implementation 'io.grpc:grpc-stub:1.76.0-SNAPSHOT' // CURRENT_GRPC_VERSION
60-
implementation 'org.apache.tomcat:annotations-api:6.0.53'
6160

6261
testImplementation 'junit:junit:4.13.2'
6362
testImplementation 'com.google.truth:truth:1.1.5'

examples/android/helloworld/app/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,5 +55,4 @@ dependencies {
5555
implementation 'io.grpc:grpc-okhttp:1.76.0-SNAPSHOT' // CURRENT_GRPC_VERSION
5656
implementation 'io.grpc:grpc-protobuf-lite:1.76.0-SNAPSHOT' // CURRENT_GRPC_VERSION
5757
implementation 'io.grpc:grpc-stub:1.76.0-SNAPSHOT' // CURRENT_GRPC_VERSION
58-
implementation 'org.apache.tomcat:annotations-api:6.0.53'
5958
}

examples/android/routeguide/app/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,5 +55,4 @@ dependencies {
5555
implementation 'io.grpc:grpc-okhttp:1.76.0-SNAPSHOT' // CURRENT_GRPC_VERSION
5656
implementation 'io.grpc:grpc-protobuf-lite:1.76.0-SNAPSHOT' // CURRENT_GRPC_VERSION
5757
implementation 'io.grpc:grpc-stub:1.76.0-SNAPSHOT' // CURRENT_GRPC_VERSION
58-
implementation 'org.apache.tomcat:annotations-api:6.0.53'
5958
}

examples/android/strictmode/app/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,5 +56,4 @@ dependencies {
5656
implementation 'io.grpc:grpc-okhttp:1.76.0-SNAPSHOT' // CURRENT_GRPC_VERSION
5757
implementation 'io.grpc:grpc-protobuf-lite:1.76.0-SNAPSHOT' // CURRENT_GRPC_VERSION
5858
implementation 'io.grpc:grpc-stub:1.76.0-SNAPSHOT' // CURRENT_GRPC_VERSION
59-
implementation 'org.apache.tomcat:annotations-api:6.0.53'
6059
}

examples/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ dependencies {
2929
implementation "io.grpc:grpc-protobuf:${grpcVersion}"
3030
implementation "io.grpc:grpc-services:${grpcVersion}"
3131
implementation "io.grpc:grpc-stub:${grpcVersion}"
32-
compileOnly "org.apache.tomcat:annotations-api:6.0.53"
3332

3433
// examples/advanced need this for JsonFormat
3534
implementation "com.google.protobuf:protobuf-java-util:${protobufVersion}"

0 commit comments

Comments
 (0)