upgrade Virgo util dependencies
diff --git a/build.versions b/build.versions
index fc34ed4..892af9a 100644
--- a/build.versions
+++ b/build.versions
@@ -1,4 +1,4 @@
-org.eclipse.virgo.util=3.0.1.RELEASE
+org.eclipse.virgo.util=3.5.0.RELEASE
org.apache.ant=1.7.0
org.apache.commons.cli=1.2.0
org.osgi.core=4.3.0
diff --git a/org.eclipse.virgo.bundlor.ant/.classpath b/org.eclipse.virgo.bundlor.ant/.classpath
index ac7c2d3..09f8768 100644
--- a/org.eclipse.virgo.bundlor.ant/.classpath
+++ b/org.eclipse.virgo.bundlor.ant/.classpath
@@ -23,8 +23,8 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="var" path="BUNDLOR_IVY_CACHE/org.apache.ant/com.springsource.org.apache.tools.ant/1.7.0/com.springsource.org.apache.tools.ant-1.7.0.jar" sourcepath="/BUNDLOR_IVY_CACHE/org.apache.ant/com.springsource.org.apache.tools.ant/1.7.0/com.springsource.org.apache.tools.ant-sources-1.7.0.jar"/>
<classpathentry kind="var" path="BUNDLOR_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/BUNDLOR_IVY_CACHE/org.junit/com.springsource.org.junit/4.4.0/com.springsource.org.junit-sources-4.4.0.jar"/>
- <classpathentry kind="var" path="BUNDLOR_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.0.1.RELEASE/org.eclipse.virgo.util.osgi-3.0.1.RELEASE.jar" sourcepath="/BUNDLOR_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/2.0.0.RELEASE/org.eclipse.virgo.util.osgi-sources-2.0.0.RELEASE.jar"/>
- <classpathentry kind="var" path="BUNDLOR_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.0.1.RELEASE/org.eclipse.virgo.util.parser.manifest-3.0.1.RELEASE.jar" sourcepath="/BUNDLOR_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/2.0.0.RELEASE/org.eclipse.virgo.util.parser.manifest-sources-2.0.0.RELEASE.jar"/>
+ <classpathentry kind="var" path="BUNDLOR_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.5.0.RELEASE/org.eclipse.virgo.util.osgi-3.5.0.RELEASE.jar" sourcepath="/BUNDLOR_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/2.0.0.RELEASE/org.eclipse.virgo.util.osgi-sources-2.0.0.RELEASE.jar"/>
+ <classpathentry kind="var" path="BUNDLOR_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.5.0.RELEASE/org.eclipse.virgo.util.parser.manifest-3.5.0.RELEASE.jar" sourcepath="/BUNDLOR_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/2.0.0.RELEASE/org.eclipse.virgo.util.parser.manifest-sources-2.0.0.RELEASE.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.bundlor"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.bundlor.blint"/>
<classpathentry kind="output" path="target/classes"/>
diff --git a/org.eclipse.virgo.bundlor.blint/.classpath b/org.eclipse.virgo.bundlor.blint/.classpath
index a52745c..3a8acaa 100644
--- a/org.eclipse.virgo.bundlor.blint/.classpath
+++ b/org.eclipse.virgo.bundlor.blint/.classpath
@@ -22,10 +22,11 @@
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="var" path="BUNDLOR_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/BUNDLOR_IVY_CACHE/org.junit/com.springsource.org.junit/4.4.0/com.springsource.org.junit-sources-4.4.0.jar"/>
- <classpathentry kind="var" path="BUNDLOR_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.0.1.RELEASE/org.eclipse.virgo.util.osgi-3.0.1.RELEASE.jar" sourcepath="/BUNDLOR_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/2.0.0.RELEASE/org.eclipse.virgo.util.osgi-sources-2.0.0.RELEASE.jar"/>
+ <classpathentry kind="var" path="BUNDLOR_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.5.0.RELEASE/org.eclipse.virgo.util.osgi-3.5.0.RELEASE.jar" sourcepath="/BUNDLOR_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/2.0.0.RELEASE/org.eclipse.virgo.util.osgi-sources-2.0.0.RELEASE.jar"/>
<classpathentry kind="var" path="BUNDLOR_IVY_CACHE/org.osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar"/>
- <classpathentry kind="var" path="BUNDLOR_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.0.1.RELEASE/org.eclipse.virgo.util.parser.manifest-3.0.1.RELEASE.jar" sourcepath="/BUNDLOR_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/2.0.0.RELEASE/org.eclipse.virgo.util.parser.manifest-sources-2.0.0.RELEASE.jar"/>
- <classpathentry kind="var" path="BUNDLOR_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.0.1.RELEASE/org.eclipse.virgo.util.math-3.0.1.RELEASE.jar" sourcepath="/BUNDLOR_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/2.0.0.RELEASE/org.eclipse.virgo.util.math-sources-2.0.0.RELEASE.jar"/>
+ <classpathentry kind="var" path="BUNDLOR_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.5.0.RELEASE/org.eclipse.virgo.util.parser.manifest-3.5.0.RELEASE.jar" sourcepath="/BUNDLOR_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/2.0.0.RELEASE/org.eclipse.virgo.util.parser.manifest-sources-2.0.0.RELEASE.jar"/>
+ <classpathentry kind="var" path="BUNDLOR_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.5.0.RELEASE/org.eclipse.virgo.util.math-3.5.0.RELEASE.jar" sourcepath="/BUNDLOR_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/2.0.0.RELEASE/org.eclipse.virgo.util.math-sources-2.0.0.RELEASE.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.bundlor"/>
+ <classpathentry kind="var" path="BUNDLOR_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.5.0.RELEASE/org.eclipse.virgo.util.osgi.manifest-3.5.0.RELEASE.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/org.eclipse.virgo.bundlor.blint/ivy.xml b/org.eclipse.virgo.bundlor.blint/ivy.xml
index 1b64221..8a84042 100644
--- a/org.eclipse.virgo.bundlor.blint/ivy.xml
+++ b/org.eclipse.virgo.bundlor.blint/ivy.xml
@@ -24,6 +24,7 @@
<dependency org="org.eclipse.virgo.bundlor" name="org.eclipse.virgo.bundlor" rev="latest.integration" conf="provided->runtime"/>
<dependency org="org.eclipse.virgo.util" name="org.eclipse.virgo.util.math" rev="${org.eclipse.virgo.util}" conf="compile->runtime"/>
<dependency org="org.eclipse.virgo.util" name="org.eclipse.virgo.util.osgi" rev="${org.eclipse.virgo.util}" conf="compile->runtime"/>
+ <dependency org="org.eclipse.virgo.util" name="org.eclipse.virgo.util.osgi.manifest" rev="${org.eclipse.virgo.util}" conf="compile->runtime"/>
<dependency org="org.eclipse.virgo.util" name="org.eclipse.virgo.util.parser.manifest" rev="${org.eclipse.virgo.util}" conf="compile->runtime"/>
<dependency org="org.slf4j" name="com.springsource.slf4j.api" rev="${org.slf4j}" conf="compile->runtime"/>
diff --git a/org.eclipse.virgo.bundlor.commandline/.classpath b/org.eclipse.virgo.bundlor.commandline/.classpath
index 4d1466a..023d882 100644
--- a/org.eclipse.virgo.bundlor.commandline/.classpath
+++ b/org.eclipse.virgo.bundlor.commandline/.classpath
@@ -22,9 +22,9 @@
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="var" path="BUNDLOR_IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.cli/1.2.0/com.springsource.org.apache.commons.cli-1.2.0.jar" sourcepath="/BUNDLOR_IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.cli/1.2.0/com.springsource.org.apache.commons.cli-sources-1.2.0.jar"/>
- <classpathentry kind="var" path="BUNDLOR_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.0.1.RELEASE/org.eclipse.virgo.util.parser.manifest-3.0.1.RELEASE.jar" sourcepath="/BUNDLOR_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/2.0.0.RELEASE/org.eclipse.virgo.util.parser.manifest-sources-2.0.0.RELEASE.jar"/>
+ <classpathentry kind="var" path="BUNDLOR_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.5.0.RELEASE/org.eclipse.virgo.util.parser.manifest-3.5.0.RELEASE.jar" sourcepath="/BUNDLOR_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/2.0.0.RELEASE/org.eclipse.virgo.util.parser.manifest-sources-2.0.0.RELEASE.jar"/>
<classpathentry kind="var" path="BUNDLOR_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/BUNDLOR_IVY_CACHE/org.junit/com.springsource.org.junit/4.4.0/com.springsource.org.junit-sources-4.4.0.jar"/>
- <classpathentry kind="var" path="BUNDLOR_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.0.1.RELEASE/org.eclipse.virgo.util.osgi-3.0.1.RELEASE.jar" sourcepath="/BUNDLOR_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/2.0.0.RELEASE/org.eclipse.virgo.util.osgi-sources-2.0.0.RELEASE.jar"/>
+ <classpathentry kind="var" path="BUNDLOR_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.5.0.RELEASE/org.eclipse.virgo.util.osgi-3.5.0.RELEASE.jar" sourcepath="/BUNDLOR_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/2.0.0.RELEASE/org.eclipse.virgo.util.osgi-sources-2.0.0.RELEASE.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.bundlor"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.bundlor.blint"/>
<classpathentry kind="output" path="target/classes"/>
diff --git a/org.eclipse.virgo.bundlor.diff/.classpath b/org.eclipse.virgo.bundlor.diff/.classpath
index 298edc3..de96cce 100644
--- a/org.eclipse.virgo.bundlor.diff/.classpath
+++ b/org.eclipse.virgo.bundlor.diff/.classpath
@@ -13,9 +13,10 @@
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="var" path="BUNDLOR_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/BUNDLOR_IVY_CACHE/org.junit/com.springsource.org.junit/4.4.0/com.springsource.org.junit-sources-4.4.0.jar"/>
- <classpathentry kind="var" path="BUNDLOR_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.0.1.RELEASE/org.eclipse.virgo.util.osgi-3.0.1.RELEASE.jar" sourcepath="/BUNDLOR_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.0.1.RELEASE/org.eclipse.virgo.util.osgi-sources-3.0.1.RELEASE.jar"/>
- <classpathentry kind="var" path="BUNDLOR_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.0.1.RELEASE/org.eclipse.virgo.util.parser.manifest-3.0.1.RELEASE.jar" sourcepath="/BUNDLOR_IVY_CACHE/com.springsource.util/com.springsource.util.parser.manifest/2.0.0.RELEASE/com.springsource.util.parser.manifest-sources-2.0.0.RELEASE.jar"/>
- <classpathentry kind="var" path="BUNDLOR_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.0.1.RELEASE/org.eclipse.virgo.util.common-3.0.1.RELEASE.jar" sourcepath="/BUNDLOR_IVY_CACHE/com.springsource.util/com.springsource.util.common/2.0.0.RELEASE/com.springsource.util.common-sources-2.0.0.RELEASE.jar"/>
+ <classpathentry kind="var" path="BUNDLOR_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.5.0.RELEASE/org.eclipse.virgo.util.osgi-3.5.0.RELEASE.jar" sourcepath="/BUNDLOR_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.5.0.RELEASE/org.eclipse.virgo.util.osgi-sources-3.5.0.RELEASE.jar"/>
+ <classpathentry kind="var" path="BUNDLOR_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.5.0.RELEASE/org.eclipse.virgo.util.parser.manifest-3.5.0.RELEASE.jar" sourcepath="/BUNDLOR_IVY_CACHE/com.springsource.util/com.springsource.util.parser.manifest/2.0.0.RELEASE/com.springsource.util.parser.manifest-sources-2.0.0.RELEASE.jar"/>
+ <classpathentry kind="var" path="BUNDLOR_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.5.0.RELEASE/org.eclipse.virgo.util.common-3.5.0.RELEASE.jar" sourcepath="/BUNDLOR_IVY_CACHE/com.springsource.util/com.springsource.util.common/2.0.0.RELEASE/com.springsource.util.common-sources-2.0.0.RELEASE.jar"/>
<classpathentry kind="var" path="BUNDLOR_IVY_CACHE/org.osgi/org.osgi.core/4.3.0/org.osgi.core-4.3.0.jar"/>
+ <classpathentry kind="var" path="BUNDLOR_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.5.0.RELEASE/org.eclipse.virgo.util.osgi.manifest-3.5.0.RELEASE.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/org.eclipse.virgo.bundlor.diff/ivy.xml b/org.eclipse.virgo.bundlor.diff/ivy.xml
index 1b25f07..41882a9 100644
--- a/org.eclipse.virgo.bundlor.diff/ivy.xml
+++ b/org.eclipse.virgo.bundlor.diff/ivy.xml
@@ -21,6 +21,7 @@
<dependencies>
<dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit}" conf="test->runtime"/>
<dependency org="org.eclipse.virgo.util" name="org.eclipse.virgo.util.osgi" rev="${org.eclipse.virgo.util}" conf="compile->runtime"/>
+ <dependency org="org.eclipse.virgo.util" name="org.eclipse.virgo.util.osgi.manifest" rev="${org.eclipse.virgo.util}" conf="compile->runtime"/>
</dependencies>
</ivy-module>
diff --git a/org.eclipse.virgo.bundlor.maven/.classpath b/org.eclipse.virgo.bundlor.maven/.classpath
index 35811ca..d3b791b 100644
--- a/org.eclipse.virgo.bundlor.maven/.classpath
+++ b/org.eclipse.virgo.bundlor.maven/.classpath
@@ -21,7 +21,7 @@
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="BUNDLOR_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.0.1.RELEASE/org.eclipse.virgo.util.parser.manifest-3.0.1.RELEASE.jar" sourcepath="/BUNDLOR_IVY_CACHE/com.springsource.util/com.springsource.util.parser.manifest/2.0.0.RELEASE/com.springsource.util.parser.manifest-sources-2.0.0.RELEASE.jar"/>
+ <classpathentry kind="var" path="BUNDLOR_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.5.0.RELEASE/org.eclipse.virgo.util.parser.manifest-3.5.0.RELEASE.jar" sourcepath="/BUNDLOR_IVY_CACHE/com.springsource.util/com.springsource.util.parser.manifest/2.0.0.RELEASE/com.springsource.util.parser.manifest-sources-2.0.0.RELEASE.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.bundlor"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.bundlor.blint"/>
<classpathentry kind="var" path="BUNDLOR_IVY_CACHE/org.apache.maven/com.springsource.org.apache.maven.plugin-api/3.0.4/com.springsource.org.apache.maven.plugin-api-3.0.4.jar"/>
diff --git a/org.eclipse.virgo.bundlor/.classpath b/org.eclipse.virgo.bundlor/.classpath
index 2aba73e..5f1af79 100644
--- a/org.eclipse.virgo.bundlor/.classpath
+++ b/org.eclipse.virgo.bundlor/.classpath
@@ -24,11 +24,12 @@
<classpathentry kind="var" path="BUNDLOR_IVY_CACHE/org.objectweb.asm/com.springsource.org.objectweb.asm/3.1.0/com.springsource.org.objectweb.asm-3.1.0.jar" sourcepath="/BUNDLOR_IVY_CACHE/org.objectweb.asm/com.springsource.org.objectweb.asm/3.1.0/com.springsource.org.objectweb.asm-sources-3.1.0.jar"/>
<classpathentry kind="var" path="BUNDLOR_IVY_CACHE/org.objectweb.asm/com.springsource.org.objectweb.asm.commons/3.1.0/com.springsource.org.objectweb.asm.commons-3.1.0.jar" sourcepath="/BUNDLOR_IVY_CACHE/org.objectweb.asm/com.springsource.org.objectweb.asm.commons/3.1.0/com.springsource.org.objectweb.asm.commons-sources-3.1.0.jar"/>
<classpathentry kind="var" path="BUNDLOR_IVY_CACHE/org.objectweb.asm/com.springsource.org.objectweb.asm.tree/3.1.0/com.springsource.org.objectweb.asm.tree-3.1.0.jar" sourcepath="/BUNDLOR_IVY_CACHE/org.objectweb.asm/com.springsource.org.objectweb.asm.tree/3.1.0/com.springsource.org.objectweb.asm.tree-sources-3.1.0.jar"/>
- <classpathentry kind="var" path="BUNDLOR_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.0.1.RELEASE/org.eclipse.virgo.util.osgi-3.0.1.RELEASE.jar" sourcepath="/BUNDLOR_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/2.0.0.RELEASE/org.eclipse.virgo.util.osgi-sources-2.0.0.RELEASE.jar"/>
+ <classpathentry kind="var" path="BUNDLOR_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.5.0.RELEASE/org.eclipse.virgo.util.osgi-3.5.0.RELEASE.jar" sourcepath="/BUNDLOR_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/2.0.0.RELEASE/org.eclipse.virgo.util.osgi-sources-2.0.0.RELEASE.jar"/>
<classpathentry kind="var" path="BUNDLOR_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/BUNDLOR_IVY_CACHE/org.junit/com.springsource.org.junit/4.4.0/com.springsource.org.junit-sources-4.4.0.jar"/>
- <classpathentry kind="var" path="BUNDLOR_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.0.1.RELEASE/org.eclipse.virgo.util.common-3.0.1.RELEASE.jar" sourcepath="/BUNDLOR_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/2.0.0.RELEASE/org.eclipse.virgo.util.common-sources-2.0.0.RELEASE.jar"/>
- <classpathentry kind="var" path="BUNDLOR_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.0.1.RELEASE/org.eclipse.virgo.util.math-3.0.1.RELEASE.jar" sourcepath="/BUNDLOR_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/2.0.0.RELEASE/org.eclipse.virgo.util.math-sources-2.0.0.RELEASE.jar"/>
- <classpathentry kind="var" path="BUNDLOR_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.0.1.RELEASE/org.eclipse.virgo.util.parser.manifest-3.0.1.RELEASE.jar" sourcepath="/BUNDLOR_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/2.0.0.RELEASE/org.eclipse.virgo.util.parser.manifest-sources-2.0.0.RELEASE.jar"/>
+ <classpathentry kind="var" path="BUNDLOR_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.5.0.RELEASE/org.eclipse.virgo.util.common-3.5.0.RELEASE.jar" sourcepath="/BUNDLOR_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/2.0.0.RELEASE/org.eclipse.virgo.util.common-sources-2.0.0.RELEASE.jar"/>
+ <classpathentry kind="var" path="BUNDLOR_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.5.0.RELEASE/org.eclipse.virgo.util.math-3.5.0.RELEASE.jar" sourcepath="/BUNDLOR_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/2.0.0.RELEASE/org.eclipse.virgo.util.math-sources-2.0.0.RELEASE.jar"/>
+ <classpathentry kind="var" path="BUNDLOR_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.5.0.RELEASE/org.eclipse.virgo.util.parser.manifest-3.5.0.RELEASE.jar" sourcepath="/BUNDLOR_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/2.0.0.RELEASE/org.eclipse.virgo.util.parser.manifest-sources-2.0.0.RELEASE.jar"/>
<classpathentry kind="var" path="BUNDLOR_IVY_CACHE/org.osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar"/>
+ <classpathentry kind="var" path="BUNDLOR_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.5.0.RELEASE/org.eclipse.virgo.util.osgi.manifest-3.5.0.RELEASE.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/org.eclipse.virgo.bundlor/ivy.xml b/org.eclipse.virgo.bundlor/ivy.xml
index b35ba83..83a0bcc 100644
--- a/org.eclipse.virgo.bundlor/ivy.xml
+++ b/org.eclipse.virgo.bundlor/ivy.xml
@@ -27,6 +27,7 @@
<dependency org="org.eclipse.virgo.util" name="org.eclipse.virgo.util.common" rev="${org.eclipse.virgo.util}" conf="compile->runtime"/>
<dependency org="org.eclipse.virgo.util" name="org.eclipse.virgo.util.math" rev="${org.eclipse.virgo.util}" conf="compile->runtime"/>
<dependency org="org.eclipse.virgo.util" name="org.eclipse.virgo.util.osgi" rev="${org.eclipse.virgo.util}" conf="compile->runtime"/>
+ <dependency org="org.eclipse.virgo.util" name="org.eclipse.virgo.util.osgi.manifest" rev="${org.eclipse.virgo.util}" conf="compile->runtime"/>
<dependency org="org.eclipse.virgo.util" name="org.eclipse.virgo.util.parser.manifest" rev="${org.eclipse.virgo.util}" conf="compile->runtime"/>
</dependencies>
