From 6afc8e4ff41ae4d492e44f48bd466a50b8e7a44f Mon Sep 17 00:00:00 2001
From: Lari Hotari <lhotari@apache.org>
Date: Fri, 29 Nov 2024 19:53:24 +0200
Subject: [PATCH] [fix][sql][branch-3.0] Fix shading configuration for
 presto-pulsar

(cherry picked from commit 656b9cfb302e3052b794641e3dfea22dbd0b17ce)
---
 pulsar-sql/presto-pulsar/pom.xml                              | 4 ++--
 .../org.apache.pulsar.shade.javax.ws.rs.client.ClientBuilder  | 1 +
 .../org.apache.pulsar.shade.javax.ws.rs.ext.RuntimeDelegate   | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 pulsar-sql/presto-pulsar/src/main/resources/META-INF/services/org.apache.pulsar.shade.javax.ws.rs.client.ClientBuilder
 create mode 100644 pulsar-sql/presto-pulsar/src/main/resources/META-INF/services/org.apache.pulsar.shade.javax.ws.rs.ext.RuntimeDelegate

diff --git a/pulsar-sql/presto-pulsar/pom.xml b/pulsar-sql/presto-pulsar/pom.xml
index 8daca55bfd09c..c8252436e9a08 100644
--- a/pulsar-sql/presto-pulsar/pom.xml
+++ b/pulsar-sql/presto-pulsar/pom.xml
@@ -185,8 +185,8 @@
                                     <include>com.datastax.oss:pulsar-metadata</include>
 
                                     <include>org.glassfish.jersey*:*</include>
-                                    <include>javax.ws.rs:*</include>
-                                    <include>javax.annotation:*</include>
+                                    <include>jakarta.ws.rs:jakarta.ws.rs-api</include>
+                                    <include>jakarta.annotation:*</include>
                                     <include>org.glassfish.hk2*:*</include>
 
                                     <include>org.eclipse.jetty:*</include>
diff --git a/pulsar-sql/presto-pulsar/src/main/resources/META-INF/services/org.apache.pulsar.shade.javax.ws.rs.client.ClientBuilder b/pulsar-sql/presto-pulsar/src/main/resources/META-INF/services/org.apache.pulsar.shade.javax.ws.rs.client.ClientBuilder
new file mode 100644
index 0000000000000..99a08cc8ca4d1
--- /dev/null
+++ b/pulsar-sql/presto-pulsar/src/main/resources/META-INF/services/org.apache.pulsar.shade.javax.ws.rs.client.ClientBuilder
@@ -0,0 +1 @@
+org.apache.pulsar.shade.org.glassfish.jersey.client.JerseyClientBuilder
\ No newline at end of file
diff --git a/pulsar-sql/presto-pulsar/src/main/resources/META-INF/services/org.apache.pulsar.shade.javax.ws.rs.ext.RuntimeDelegate b/pulsar-sql/presto-pulsar/src/main/resources/META-INF/services/org.apache.pulsar.shade.javax.ws.rs.ext.RuntimeDelegate
new file mode 100644
index 0000000000000..0adc919b7f0c2
--- /dev/null
+++ b/pulsar-sql/presto-pulsar/src/main/resources/META-INF/services/org.apache.pulsar.shade.javax.ws.rs.ext.RuntimeDelegate
@@ -0,0 +1 @@
+org.apache.pulsar.shade.org.glassfish.jersey.internal.RuntimeDelegateImpl
\ No newline at end of file