refine Jakarta relocate patterns

This commit is contained in:
Jean-Louis Monteiro 2022-02-21 15:42:02 +01:00
parent 68b77e1ae7
commit 6d7ee9ba59

View File

@ -129,48 +129,19 @@
</artifactSet> </artifactSet>
<relocations> <relocations>
<relocation> <relocation>
<pattern>javax.annotation.security</pattern> <pattern>javax.annotation</pattern>
<shadedPattern>jakarta.annotation.security</shadedPattern> <shadedPattern>jakarta.annotation</shadedPattern>
<excludes>
<exclude>javax.annotation.process.**</exclude>
</excludes>
</relocation> </relocation>
<relocation> <relocation>
<pattern>javax.annotation.Generated</pattern> <pattern>javax.jms</pattern>
<shadedPattern>jakarta.annotation.Generated</shadedPattern> <shadedPattern>jakarta.jms</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>javax.annotation.PostConstruct</pattern> <pattern>javax.persistence</pattern>
<shadedPattern>jakarta.annotation.PostConstruct</shadedPattern> <shadedPattern>jakarta.persistence</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>
<shadedPattern>jakarta.el</shadedPattern>
</relocation>
<relocation>
<pattern>javax.enterprise</pattern>
<shadedPattern>jakarta.enterprise</shadedPattern>
</relocation>
<relocation>
<pattern>javax.decorator</pattern>
<shadedPattern>jakarta.decorator</shadedPattern>
</relocation>
<relocation>
<pattern>javax.inject</pattern>
<shadedPattern>jakarta.inject</shadedPattern>
</relocation>
<relocation>
<pattern>javax.interceptor</pattern>
<shadedPattern>jakarta.interceptor</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>javax.servlet</pattern> <pattern>javax.servlet</pattern>
@ -179,34 +150,18 @@
<relocation> <relocation>
<pattern>javax.transaction</pattern> <pattern>javax.transaction</pattern>
<shadedPattern>jakarta.transaction</shadedPattern> <shadedPattern>jakarta.transaction</shadedPattern>
<excludes>
<exclude>javax.transaction.xa.**</exclude>
</excludes>
</relocation> </relocation>
<relocation> <relocation>
<pattern>javax.validation</pattern> <pattern>javax.validation</pattern>
<shadedPattern>jakarta.validation</shadedPattern> <shadedPattern>jakarta.validation</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>javax.persistence</pattern> <pattern>javax.xml.bind</pattern>
<shadedPattern>jakarta.persistence</shadedPattern> <shadedPattern>jakarta.xml.bind</shadedPattern>
</relocation> </relocation>
<relocation>
<pattern>javax.faces</pattern>
<shadedPattern>jakarta.faces</shadedPattern>
</relocation>
<relocation>
<pattern>javax.ejb</pattern>
<shadedPattern>jakarta.ejb</shadedPattern>
</relocation>
<relocation>
<pattern>javax.jms</pattern>
<shadedPattern>jakarta.jms</shadedPattern>
</relocation>
<relocation>
<pattern>javax.transaction</pattern>
<shadedPattern>jakarta.transaction</shadedPattern>
</relocation>
<!--
todo: javax.transaction, it is in the JVM so can have issue repackaging
-->
</relocations> </relocations>
</configuration> </configuration>
</execution> </execution>