This is an automated email from the ASF dual-hosted git repository.
markt-asf pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git
The following commit(s) were added to refs/heads/main by this push:
new 1e10747 Fix BZ 70040. Need to relocate Eclipse OSGI dependency
1e10747 is described below
commit 1e10747857220a4f8e02cbb1d298d3c9a059ec39
Author: Mark Thomas <[email protected]>
AuthorDate: Fri May 29 17:12:36 2026 +0100
Fix BZ 70040. Need to relocate Eclipse OSGI dependency
https://bz.apache.org/bugzilla/show_bug.cgi?id=70040
---
CHANGES.md | 3 ++-
pom.xml | 8 ++++++++
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/CHANGES.md b/CHANGES.md
index 7e53333..529eea0 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,7 +2,8 @@
## 1.0.11
- Update Eclipse OSGI to 3.23.200. (dependabot/remm)
-- [#108](https://github.com/apache/tomcat-jakartaee-migration/issues/108)
possible array exception when using the CLI
+- [#108](https://github.com/apache/tomcat-jakartaee-migration/issues/108)
possible array exception when using the CLI. (remm)
+- Shade the OSGI dependencies to avoid conflicts when migrated applications
use the same libraries. (markt)
## 1.0.10
- When migrating files in place, don't replace the original file if no
conversion has taken place. Based on PR[#78] by Semiao Marco.
diff --git a/pom.xml b/pom.xml
index aa5c67a..c62544e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -305,6 +305,14 @@
<pattern>org.apache.bcel</pattern>
<shadedPattern>org.apache.tomcat.jakartaee.bcel</shadedPattern>
</relocation>
+ <relocation>
+ <pattern>org.eclipse</pattern>
+
<shadedPattern>org.apache.tomcat.jakartaee.eclipse</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>org.osgi</pattern>
+
<shadedPattern>org.apache.tomcat.jakartaee.osgi</shadedPattern>
+ </relocation>
</relocations>
<transformers>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
