This is an automated email from the ASF dual-hosted git repository.

jlmonteiro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/johnzon.git


The following commit(s) were added to refs/heads/master by this push:
     new a1c53d9  Add also a relocation for JAX-RS APIs
a1c53d9 is described below

commit a1c53d99c3280cbfc35b369ac4ce138e12f1d5ff
Author: Jean-Louis Monteiro <jlmonte...@tomitribe.com>
AuthorDate: Tue Feb 22 12:23:16 2022 +0100

    Add also a relocation for JAX-RS APIs
    
    Signed-off-by: Jean-Louis Monteiro <jlmonte...@tomitribe.com>
---
 pom.xml | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6d0cdbb..1675ae5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -125,20 +125,26 @@
                 </artifactSet>
                 <relocations>
                   <relocation>
-                    <pattern>javax.json</pattern>
-                    <shadedPattern>jakarta.json</shadedPattern>
-                  </relocation>
-                  <relocation>
                     <pattern>javax.annotation</pattern>
                     <shadedPattern>jakarta.annotation</shadedPattern>
+                    <excludes>
+                      <exclude>javax.annotation.processing.**</exclude>
+                    </excludes>
+                  </relocation>
+                  <relocation>
+                    <pattern>javax.enterprise</pattern>
+                    <shadedPattern>jakarta.enterprise</shadedPattern>
+                    <excludes>
+                      <exclude>javax.enterprise.deploy.**</exclude>
+                    </excludes>
                   </relocation>
                   <relocation>
                     <pattern>javax.inject</pattern>
                     <shadedPattern>jakarta.inject</shadedPattern>
                   </relocation>
                   <relocation>
-                    <pattern>javax.enterprise</pattern>
-                    <shadedPattern>jakarta.enterprise</shadedPattern>
+                    <pattern>javax.json</pattern>
+                    <shadedPattern>jakarta.json</shadedPattern>
                   </relocation>
                   <relocation>
                     <pattern>javax.servlet</pattern>
@@ -148,6 +154,10 @@
                     <pattern>javax.websocket</pattern>
                     <shadedPattern>jakarta.websocket</shadedPattern>
                   </relocation>
+                  <relocation>
+                    <pattern>javax.ws.rs</pattern>
+                    <shadedPattern>jakarta.ws.rs</shadedPattern>
+                  </relocation>
                 </relocations>
               </configuration>
             </execution>

Reply via email to