Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Philipp Steghöfer2020-05-15 11:25:19 +0000
committerJan-Philipp Steghöfer2020-05-15 11:34:58 +0000
commitb1001769148d22d774b83376b093671ca8b68c27 (patch)
treeb5efd4e6d4ba9bc121f742f2b357e8b910851c26
parent580d9eeda47ce2977ff76c572d7d7675d9a1a704 (diff)
downloadorg.eclipse.capra-b1001769148d22d774b83376b093671ca8b68c27.tar.gz
org.eclipse.capra-b1001769148d22d774b83376b093671ca8b68c27.tar.xz
org.eclipse.capra-b1001769148d22d774b83376b093671ca8b68c27.zip
Fixed issue with UI of Office handler not loading
The plug-ins related to the user interface of the Office handler were not correctly loading. This was due to an unresolvable dependency conflict since both org.eclipse.core.runtime and org.dom4j provide javax.xml.bind, but in different version. This quick workaround addresses the issue by introducing an explicit dependency to javax.xml.bind version 2.2.0 which is the one provided by org.dom4j. Change-Id: I2e4d38b93a0a3a09317b9df1dfbbd9552c246f09
-rw-r--r--bundles/org.eclipse.capra.ui.office/META-INF/MANIFEST.MF3
-rw-r--r--releng/org.eclipse.capra.releng.target/org.eclipse.capra.releng.target.target1
2 files changed, 3 insertions, 1 deletions
diff --git a/bundles/org.eclipse.capra.ui.office/META-INF/MANIFEST.MF b/bundles/org.eclipse.capra.ui.office/META-INF/MANIFEST.MF
index 4c2c0ff9..b5095af7 100644
--- a/bundles/org.eclipse.capra.ui.office/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.capra.ui.office/META-INF/MANIFEST.MF
@@ -18,7 +18,8 @@ Require-Bundle: org.eclipse.emf.edit.ui,
com.google.guava,
org.dom4j,
org.eclipse.core.runtime,
- org.eclipse.core.expressions
+ org.eclipse.core.expressions,
+ javax.xml.bind;bundle-version="2.2.0"
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.capra.ui.office,
org.eclipse.capra.ui.office.exceptions;x-internal:=true,
diff --git a/releng/org.eclipse.capra.releng.target/org.eclipse.capra.releng.target.target b/releng/org.eclipse.capra.releng.target/org.eclipse.capra.releng.target.target
index 38f555d7..a07209bc 100644
--- a/releng/org.eclipse.capra.releng.target/org.eclipse.capra.releng.target.target
+++ b/releng/org.eclipse.capra.releng.target/org.eclipse.capra.releng.target.target
@@ -61,6 +61,7 @@
<unit id="ch.qos.logback.slf4j" version="1.0.7.v201505121915"/>
<unit id="org.apache.poi" version="3.9.0.v201405241750"/>
<unit id="com.fasterxml.jackson.core.jackson-core" version="2.5.0.v201504151636"/>
+<unit id="javax.xml.bind" version="2.2.0.v201105210648"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">

Back to the top