update bnd to version 0.0.401 and embed dependencies in ivy plugin to avoid need to have extra bnd lib on ivy classpath
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@980701 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/sigil/bldcommon/build.properties b/sigil/bldcommon/build.properties
index 6855bd8..4a1a21b 100644
--- a/sigil/bldcommon/build.properties
+++ b/sigil/bldcommon/build.properties
@@ -33,7 +33,7 @@
repository.pattern = [module]/[revision]/[type]s/[artifact].[ext]
ivy.install.version=2.0.0
-bnd.install.version=0.0.384
+bnd.install.version=0.0.401
equinox.install.version=3.4.0.v20080421-2006
equinox.release=ganymede
diff --git a/sigil/bldcommon/common.xml b/sigil/bldcommon/common.xml
index f260933..ea16331 100644
--- a/sigil/bldcommon/common.xml
+++ b/sigil/bldcommon/common.xml
@@ -320,7 +320,6 @@
<property name="sigil.jar.dir" value="${sigil.home}/lib" />
<property name="ivy.jar.file" value="${sigil.jar.dir}/ivy.jar" />
<property name="sigil.jar.file" value="${sigil.jar.dir}/sigil-ivy-plugin.jar" />
- <property name="bnd.jar.file" value="${sigil.jar.dir}/bndlib.jar" />
<property name="equinox.common.jar.file" value="${sigil.jar.dir}/equinox.common.jar" />
@@ -333,9 +332,6 @@
<!-- sigil -->
<get src="http://people.apache.org/~dsavage/sigil/sigil-ivy-plugin.jar"
dest="${sigil.jar.file}" usetimestamp="true" verbose="true"/>
- <!-- bnd -->
- <get src="http://www.aQute.biz/repo/biz/aQute/bndlib/${bnd.install.version}/bndlib-${bnd.install.version}.jar"
- dest="${bnd.jar.file}" usetimestamp="true" verbose="true"/>
<!-- equinox.common -->
<get src=" http://download.eclipse.org/releases/${equinox.release}/plugins/org.eclipse.equinox.common_${equinox.install.version}.jar"
dest="${equinox.common.jar.file}" usetimestamp="true" verbose="true"/>
diff --git a/sigil/bldcommon/prepare/ivy.xml b/sigil/bldcommon/prepare/ivy.xml
index 38fe7e2..4a6f307 100644
--- a/sigil/bldcommon/prepare/ivy.xml
+++ b/sigil/bldcommon/prepare/ivy.xml
@@ -62,7 +62,7 @@
<artifact name="bcel" type="jar" />
</dependency>
- <dependency org="biz.aQute" name="bndlib" rev="0.0.312">
+ <dependency org="biz.aQute" name="bndlib" rev="0.0.401">
<artifact name="bndlib" type="jar" />
</dependency>
diff --git a/sigil/ivy/resolver/sigil.properties b/sigil/ivy/resolver/sigil.properties
index 52689a7..6739b7d 100644
--- a/sigil/ivy/resolver/sigil.properties
+++ b/sigil/ivy/resolver/sigil.properties
@@ -6,6 +6,9 @@
-contents: \
profiles.*, \
+ aQute.bnd*, \
+ aQute.lib*, \
+ aQute.libg*, \
org.osgi.framework, \
org.apache.felix.sigil.*, \