Skip to content

Commit acd6bfe

Browse files
committed
Fix javax vs jakarta dependencies
1 parent 6b5203d commit acd6bfe

File tree

8 files changed

+10
-0
lines changed

8 files changed

+10
-0
lines changed

examples/azure-grpc-ecosystem-example/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ dependencies {
2626
implementation("io.grpc:grpc-netty:$grpcVersion")
2727
implementation("io.grpc:grpc-util:$grpcVersion")
2828
implementation("org.springframework.boot:spring-boot-starter:${springBootVersion}")
29+
implementation("javax.annotation:javax.annotation-api:1.3.2")
2930

3031
testImplementation project(":azure:spring-boot-starter-azure-grpc-ecosystem-test")
3132
testImplementation project(':azure:request-response-spring-boot-starter-azure-grpc-ecosystem-test')

examples/gcp-grpc-ecosystem-example/build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ dependencies {
2727
implementation("io.grpc:grpc-util:$grpcVersion")
2828
implementation("org.springframework.boot:spring-boot-starter:${springBootVersion}")
2929

30+
implementation("javax.annotation:javax.annotation-api:1.3.2")
31+
3032
testImplementation project(":gcp:spring-boot-starter-gcp-grpc-ecosystem-test")
3133
testImplementation project(':gcp:request-response-spring-boot-starter-gcp-grpc-ecosystem-test')
3234
testImplementation("org.springframework.boot:spring-boot-starter-test:${springBootVersion}")

examples/gcp-grpc-ecosystem-without-test-artifacts-example/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ dependencies {
2727
implementation("io.grpc:grpc-netty:$grpcVersion")
2828
implementation("io.grpc:grpc-util:$grpcVersion")
2929
implementation("org.springframework.boot:spring-boot-starter:${springBootVersion}")
30+
implementation("javax.annotation:javax.annotation-api:1.3.2")
3031

3132
testImplementation("org.springframework.boot:spring-boot-starter-test:${springBootVersion}")
3233

examples/gcp-grpc-lognet-example/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ dependencies {
2626
implementation("io.grpc:grpc-netty:$grpcVersion")
2727
implementation("io.grpc:grpc-util:$grpcVersion")
2828
implementation("org.springframework.boot:spring-boot-starter:${springBootVersion}")
29+
implementation("javax.annotation:javax.annotation-api:1.3.2")
2930

3031
testImplementation project(":gcp:spring-boot-starter-gcp-grpc-lognet-test")
3132
testImplementation project(':gcp:request-response-spring-boot-starter-gcp-grpc-lognet-test')

examples/gcp-grpc-lognet-without-test-artifacts-example/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ dependencies {
2727
implementation("io.grpc:grpc-netty:$grpcVersion")
2828
implementation("io.grpc:grpc-util:$grpcVersion")
2929
implementation("org.springframework.boot:spring-boot-starter:${springBootVersion}")
30+
implementation("javax.annotation:javax.annotation-api:1.3.2")
3031

3132
testImplementation("org.springframework.boot:spring-boot-starter-test:${springBootVersion}")
3233

request-response/netty-grpc/build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,12 @@ dependencies {
4141
}
4242
}
4343

44+
4445
api("jakarta.annotation:jakarta.annotation-api:${annotationApiVersion}")
4546
api("com.google.api.grpc:proto-google-common-protos:$grpcCommonsVersion")
4647
api("com.google.protobuf:protobuf-java-util:${grpcProtobufVersion}")
4748

49+
testImplementation("javax.annotation:javax.annotation-api:1.3.2")
4850
testImplementation("com.google.truth:truth:${googleTruthVersion}")
4951
testImplementation("com.google.truth.extensions:truth-java8-extension:${googleTruthVersion}")
5052
}

trace/mdc-context-grpc-netty/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ dependencies {
5151
testImplementation("com.google.truth:truth:${googleTruthVersion}")
5252
testImplementation("com.google.truth.extensions:truth-java8-extension:${googleTruthVersion}")
5353

54+
testImplementation("javax.annotation:javax.annotation-api:1.3.2")
5455
testImplementation project(":api")
5556
testImplementation project(":test:test-logback")
5657
testImplementation project(":test:test-logback-junit")

trace/server/correlation-id-trace-grpc-netty/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ dependencies {
4848
api("com.google.api.grpc:proto-google-common-protos:$grpcCommonsVersion")
4949
api("com.google.protobuf:protobuf-java-util:${grpcProtobufVersion}")
5050

51+
testImplementation("javax.annotation:javax.annotation-api:1.3.2")
5152
testImplementation("com.google.truth:truth:${googleTruthVersion}")
5253
testImplementation("com.google.truth.extensions:truth-java8-extension:${googleTruthVersion}")
5354

0 commit comments

Comments
 (0)