You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by st...@apache.org on 2022/05/13 19:04:51 UTC

[deltaspike] branch master updated: DELTASPIKE-1434 - Refine relocation patterns for javax -> jakarta + adds service transformer

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 4d733249 DELTASPIKE-1434 - Refine relocation patterns for javax -> jakarta + adds service transformer
4d733249 is described below

commit 4d73324914630f03f03c030738d44a0438818943
Author: Richard Zowalla <rz...@apache.org>
AuthorDate: Wed May 11 20:38:30 2022 +0200

    DELTASPIKE-1434 - Refine relocation patterns for javax -> jakarta + adds service transformer
    
    Signed-off-by: Mark Struberg <st...@apache.org>
---
 deltaspike/parent/code/pom.xml | 30 ++++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/deltaspike/parent/code/pom.xml b/deltaspike/parent/code/pom.xml
index 198ffb84..25f1c01c 100644
--- a/deltaspike/parent/code/pom.xml
+++ b/deltaspike/parent/code/pom.xml
@@ -164,10 +164,36 @@
                             <shadedArtifactAttached>true</shadedArtifactAttached>
                             <shadedClassifierName>jakarta</shadedClassifierName>
                             <createDependencyReducedPom>false</createDependencyReducedPom>
+                            <transformers>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
+                            </transformers>
                             <relocations>
                                 <relocation>
-                                    <pattern>javax</pattern>
-                                    <shadedPattern>jakarta</shadedPattern>
+                                    <pattern>javax.inject</pattern>
+                                    <shadedPattern>jakarta.inject</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>javax.interceptor</pattern>
+                                    <shadedPattern>jakarta.interceptor</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>javax.enterprise</pattern>
+                                    <shadedPattern>jakarta.enterprise</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>javax.resource</pattern>
+                                    <shadedPattern>jakarta.resource</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>javax.transaction</pattern>
+                                    <shadedPattern>jakarta.transaction</shadedPattern>
+                                    <excludes>
+                                        <exclude>javax.transaction.xa.**</exclude>
+                                    </excludes>
+                                </relocation>
+                                <relocation>
+                                    <pattern>javax.validation</pattern>
+                                    <shadedPattern>jakarta.validation</shadedPattern>
                                 </relocation>
                             </relocations>
                         </configuration>