This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git
The following commit(s) were added to refs/heads/master by this push:
new 9df8b4a Relocate dependencies in shaded JAR to avoid clashes when
integrating
9df8b4a is described below
commit 9df8b4ab6cb4e4d747c88eeb4b64d96bbc6ec52f
Author: Mark Thomas <[email protected]>
AuthorDate: Thu Feb 11 17:06:40 2021 +0000
Relocate dependencies in shaded JAR to avoid clashes when integrating
---
CHANGES.md | 1 +
pom.xml | 10 ++++++++++
2 files changed, 11 insertions(+)
diff --git a/CHANGES.md b/CHANGES.md
index baeffb2..928496d 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -26,6 +26,7 @@
- Fix [#3](https://github.com/apache/tomcat-jakartaee-migration/issues/3). Add
support for excluding files from conversion. (markt)
- Fix handling of classes with more than 32768 entries in the constant pool.
(markt)
- Exclude `javax.xml.stream` and `javax.xml.XMLConstants` from the EE profile.
(markt)
+- Relocate dependencies under the `org.apache.tomcat.jakartaee` package to
avoid clashes when integrating the shaded jar. (markt)
## 0.1.0
diff --git a/pom.xml b/pom.xml
index c619b54..203e001 100644
--- a/pom.xml
+++ b/pom.xml
@@ -273,6 +273,16 @@
</excludes>
</filter>
</filters>
+ <relocations>
+ <relocation>
+ <pattern>org.apache.commons</pattern>
+
<shadedPattern>org.apache.tomcat.jakartaee.commons</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>org.apache.bcel</pattern>
+
<shadedPattern>org.apache.tomcat.jakartaee.bcel</shadedPattern>
+ </relocation>
+ </relocations>
</configuration>
</execution>
</executions>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
