You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by rm...@apache.org on 2021/10/26 14:20:46 UTC

[openjpa] branch master updated: OPENJPA-2884 trying to not relocate javax.annotation.processing

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 3b6a69e  OPENJPA-2884 trying to not relocate javax.annotation.processing
3b6a69e is described below

commit 3b6a69e9f0d041b034ce11d934d7321732d069c8
Author: Romain Manni-Bucau <rm...@gmail.com>
AuthorDate: Tue Oct 26 16:20:43 2021 +0200

    OPENJPA-2884 trying to not relocate javax.annotation.processing
---
 openjpa/pom.xml | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/openjpa/pom.xml b/openjpa/pom.xml
index 4365ed1..3df7d46 100644
--- a/openjpa/pom.xml
+++ b/openjpa/pom.xml
@@ -123,8 +123,28 @@
                             </artifactSet>
                             <relocations>
                                 <relocation>
-                                    <pattern>javax.annotation</pattern>
-                                    <shadedPattern>jakarta.annotation</shadedPattern>
+                                    <pattern>javax.annotation.security</pattern>
+                                    <shadedPattern>jakarta.annotation.security</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>javax.annotation.Generated</pattern>
+                                    <shadedPattern>jakarta.annotation.Generated</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>javax.annotation.PostConstruct</pattern>
+                                    <shadedPattern>jakarta.annotation.PostConstruct</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>javax.annotation.PreDestroy</pattern>
+                                    <shadedPattern>jakarta.annotation.PreDestroy</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>javax.annotation.Resource</pattern>
+                                    <shadedPattern>jakarta.annotation.Resource</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>javax.annotation.Resources</pattern>
+                                    <shadedPattern>jakarta.annotation.Resources</shadedPattern>
                                 </relocation>
                                 <relocation>
                                     <pattern>javax.el</pattern>