merge bnd lib inside common core bundle to avoid need to install bndlib separately
add commmons.lang jar to core.feature file for same purpose (FELIX-1677)
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@820670 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/sigil/build.xml b/sigil/build.xml
index 067e710..bcf213c 100644
--- a/sigil/build.xml
+++ b/sigil/build.xml
@@ -34,8 +34,7 @@
<subant buildpath="bldcommon/prepare" target="resolve" />
</target>
- <!--target name="dist" depends="build, site" /-->
- <target name="dist" depends="build" />
+ <target name="dist" depends="build, site" />
<target name="clean" depends="clean-list, clean-site, clean-tmp" />
@@ -61,12 +60,8 @@
<ivy:retrieve organisation="org.apache" module="felix.sigil.eclipse.search" revision="latest.integration" inline="true" pattern="${site.dir}/plugins/[artifact]_${buildVersion}.[ext]" transitive="false"/>
<ivy:retrieve organisation="org.apache" module="felix.sigil.eclipse.ui" revision="latest.integration" inline="true" pattern="${site.dir}/plugins/[artifact]_${buildVersion}.[ext]" transitive="false"/>
<ivy:retrieve organisation="org.apache" module="felix.sigil.eclipse.utils" revision="latest.integration" inline="true" pattern="${site.dir}/plugins/[artifact]_${buildVersion}.[ext]" transitive="false"/>
+ <ivy:retrieve organisation="sigil" module="com.springsource.org.apache.commons.lang" revision="2.4.0" inline="true" pattern="${site.dir}/plugins/[artifact]_[revision].[ext]" transitive="false"/>
- <!-- extras -->
- <ivy:retrieve organisation="biz.aQute" module="bndlib" revision="0.0.312" inline="true" pattern="${site.dir}/extras/[artifact]_[revision].[ext]" transitive="false"/>
-
- <ivy:retrieve organisation="sigil" module="com.springsource.org.apache.commons.lang" revision="2.4.0" inline="true" pattern="${site.dir}/extras/[artifact]_[revision].[ext]" transitive="false"/>
-
<!-- ivy -->
<ivy:retrieve organisation="org.apache" module="felix.sigil.ivy.resolver" revision="latest.integration" inline="true" pattern="${site.dir}/ivy/[artifact].[ext]" transitive="false"/>
diff --git a/sigil/common/core/sigil.properties b/sigil/common/core/sigil.properties
index 0d741b9..d496bb7 100644
--- a/sigil/common/core/sigil.properties
+++ b/sigil/common/core/sigil.properties
@@ -19,8 +19,15 @@
profiles/OSGi_Minimum-1.1.profile, \
profiles/profile.list, \
--sourcedirs: \
- src, \
+-contents: \
+ aQute.bnd*, \
+ aQute.lib*, \
+ aQute.libg*, \
+ org.apache.felix.sigil.bnd*, \
+ org.apache.felix.sigil.config*, \
+ org.apache.felix.sigil.core*, \
+ org.apache.felix.sigil.model*, \
+ org.apache.felix.sigil.repository*, \
-exports: \
org.apache.felix.sigil.bnd, \
@@ -34,7 +41,7 @@
org.apache.felix.sigil.repository, \
-imports: \
- aQute.lib.osgi, \
+ aQute.lib.osgi;resolve=compile, \
org.apache.felix.sigil.bnd, \
org.apache.felix.sigil.common.osgi, \
org.apache.felix.sigil.config, \
diff --git a/sigil/eclipse/core.feature/feature.xml b/sigil/eclipse/core.feature/feature.xml
index 1a87b49..df9d26e 100644
--- a/sigil/eclipse/core.feature/feature.xml
+++ b/sigil/eclipse/core.feature/feature.xml
@@ -77,6 +77,13 @@
</requires>
<plugin
+ id="com.springsource.org.apache.commons.lang"
+ download-size="0"
+ install-size="0"
+ version="2.4.0"
+ unpack="false"/>
+
+ <plugin
id="org.apache.felix.sigil.common.core"
download-size="0"
install-size="0"