Author: dsavage
Date: Fri Jul 30 09:30:52 2010
New Revision: 980701
URL: http://svn.apache.org/viewvc?rev=980701&view=rev
Log:
update bnd to version 0.0.401 and embed dependencies in ivy plugin to avoid
need to have extra bnd lib on ivy classpath
Modified:
felix/trunk/sigil/bldcommon/build.properties
felix/trunk/sigil/bldcommon/common.xml
felix/trunk/sigil/bldcommon/prepare/ivy.xml
felix/trunk/sigil/ivy/resolver/sigil.properties
Modified: felix/trunk/sigil/bldcommon/build.properties
URL:
http://svn.apache.org/viewvc/felix/trunk/sigil/bldcommon/build.properties?rev=980701&r1=980700&r2=980701&view=diff
==============================================================================
--- felix/trunk/sigil/bldcommon/build.properties (original)
+++ felix/trunk/sigil/bldcommon/build.properties Fri Jul 30 09:30:52 2010
@@ -33,7 +33,7 @@ cache.dir = ${common.dir}/../cache
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
Modified: felix/trunk/sigil/bldcommon/common.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/sigil/bldcommon/common.xml?rev=980701&r1=980700&r2=980701&view=diff
==============================================================================
--- felix/trunk/sigil/bldcommon/common.xml (original)
+++ felix/trunk/sigil/bldcommon/common.xml Fri Jul 30 09:30:52 2010
@@ -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"/>
Modified: felix/trunk/sigil/bldcommon/prepare/ivy.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/sigil/bldcommon/prepare/ivy.xml?rev=980701&r1=980700&r2=980701&view=diff
==============================================================================
--- felix/trunk/sigil/bldcommon/prepare/ivy.xml (original)
+++ felix/trunk/sigil/bldcommon/prepare/ivy.xml Fri Jul 30 09:30:52 2010
@@ -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>
Modified: felix/trunk/sigil/ivy/resolver/sigil.properties
URL:
http://svn.apache.org/viewvc/felix/trunk/sigil/ivy/resolver/sigil.properties?rev=980701&r1=980700&r2=980701&view=diff
==============================================================================
--- felix/trunk/sigil/ivy/resolver/sigil.properties (original)
+++ felix/trunk/sigil/ivy/resolver/sigil.properties Fri Jul 30 09:30:52 2010
@@ -6,6 +6,9 @@
-contents: \
profiles.*, \
+ aQute.bnd*, \
+ aQute.lib*, \
+ aQute.libg*, \
org.osgi.framework, \
org.apache.felix.sigil.*, \
