Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlyn Normington2011-07-29 11:05:02 -0400
committerGlyn Normington2011-07-29 11:05:02 -0400
commit4a8622fdc652f447749f67a084e21fc7448055d0 (patch)
tree4244f3effb96c2c7bf88e3dae31113c31c77947d
parent1de30246a502e085edc5a366d74e08fa8df1de30 (diff)
downloadorg.eclipse.virgo.kernel-bug353122.tar.gz
org.eclipse.virgo.kernel-bug353122.tar.xz
org.eclipse.virgo.kernel-bug353122.zip
bug 353122: prevent Equinox being duplicated in lib and lib/kernel. Ivy <exclude> does not work properly so used <delete>.bug353122
-rw-r--r--build-kernel/build.xml2
-rw-r--r--build-kernel/kernel-ivy.xml2
2 files changed, 3 insertions, 1 deletions
diff --git a/build-kernel/build.xml b/build-kernel/build.xml
index 1fab0548..f1b8ad8f 100644
--- a/build-kernel/build.xml
+++ b/build-kernel/build.xml
@@ -54,6 +54,8 @@
<ivy:resolve resolveId="copy.path" file="${basedir}/kernel-ivy.xml" transitive="true"/>
<ivy:retrieve resolveId="copy.path" pattern="${package.output.dir}/lib/kernel/[artifact]-[revision].[ext]" conf="lib-kernel" type="jar"/>
+ <!-- Workaround for the issue that exclude does not work properly for Equinox in kernel-ivy.xml -->
+ <delete file="${package.output.dir}/lib/kernel/org.eclipse.osgi-${org.eclipse.osgi}.jar"/>
<ivy:resolve resolveId="copy.path" file="${basedir}/kernel-ivy.xml" transitive="true"/>
<ivy:retrieve resolveId="copy.path" pattern="${package.output.dir}/repository/ext/[artifact]-[revision].[ext]" conf="repository-ext" type="jar"/>
diff --git a/build-kernel/kernel-ivy.xml b/build-kernel/kernel-ivy.xml
index 0292ac2d..7b21c37c 100644
--- a/build-kernel/kernel-ivy.xml
+++ b/build-kernel/kernel-ivy.xml
@@ -36,7 +36,7 @@
<dependency org="org.eclipse.osgi" name="org.eclipse.equinox.util" rev="${org.eclipse.equinox.util}" conf="repository-ext->runtime"/>
<dependency org="org.eclipse.osgi" name="org.eclipse.osgi.services" rev="${org.eclipse.osgi.services}" conf="repository-ext->runtime"/>
-
+ <!-- The exclude of Equinox (org="org.eclipse.osgi" module="org.eclipse.osgi") does not work. See build.xml for a workaround. -->
<exclude org="org.eclipse.osgi" module="org.eclipse.osgi"/>
<exclude org="org.eclipse.virgo.util" conf="repository-ext"/>
<exclude org="org.eclipse.virgo.osgi" module="org.eclipse.virgo.osgi.extensions.equinox"/>

Back to the top