From 011ae68bc8eddda98702e4412a1aaf59b3f24b55 Mon Sep 17 00:00:00 2001
From: Lari Hotari <lhotari@users.noreply.github.com>
Date: Thu, 28 Nov 2024 11:05:13 +0200
Subject: [PATCH] Replace javax.annotations:javax-annotations-api with
 jakarta.annotations:jakarta-annotations-api

---
 client/pom.xml                    | 8 ++++----
 pulsar-metadatastore-oxia/pom.xml | 8 ++++++++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/client/pom.xml b/client/pom.xml
index 3f8c33be..0292ae89 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -32,7 +32,7 @@
     <properties>
         <caffeine.version>3.1.4</caffeine.version>
         <grpc-test.version>1.2.2</grpc-test.version>
-        <javax.annotation.version>1.3.2</javax.annotation.version>
+        <jakarta.annotation.version>1.3.5</jakarta.annotation.version>
         <zah.version>0.16</zah.version>
     </properties>
 
@@ -69,9 +69,9 @@
             <artifactId>opentelemetry-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
-            <version>${javax.annotation.version}</version>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+            <version>${jakarta.annotation.version}</version>
         </dependency>
         <dependency>
             <groupId>net.openhft</groupId>
diff --git a/pulsar-metadatastore-oxia/pom.xml b/pulsar-metadatastore-oxia/pom.xml
index 4fbe26bd..4b40654f 100644
--- a/pulsar-metadatastore-oxia/pom.xml
+++ b/pulsar-metadatastore-oxia/pom.xml
@@ -67,6 +67,10 @@
                     <groupId>io.grpc</groupId>
                     <artifactId>grpc-core</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>javax.annotation</groupId>
+                    <artifactId>javax.annotation-api</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -98,6 +102,10 @@
                     <groupId>io.grpc</groupId>
                     <artifactId>grpc-core</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>javax.annotation</groupId>
+                    <artifactId>javax.annotation-api</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>