further progress towards self hosting FELIX-1323
* replace require bundle dependency on fragment for local classpath via ivy resolve,
* retrieve versions from parent sigil-defaults.properties
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@800008 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/sigil/common/core.tests/sigil.properties b/sigil/common/core.tests/sigil.properties
index 1f2fe6c..c7a4504 100644
--- a/sigil/common/core.tests/sigil.properties
+++ b/sigil/common/core.tests/sigil.properties
@@ -1,8 +1,6 @@
# sigil project file, saved by plugin.
-version: 0.0.0
-
-bundles: \
org.apache.felix.sigil.common.core.tests, \
@@ -13,6 +11,7 @@
org.apache.felix.sigil.common.core, \
-imports: \
- junit.framework;version=4.4.0, \
+ junit.framework, \
+ org.osgi.framework, \
# end
diff --git a/sigil/common/core/sigil.properties b/sigil/common/core/sigil.properties
index 5744ec1..47725e1 100644
--- a/sigil/common/core/sigil.properties
+++ b/sigil/common/core/sigil.properties
@@ -1,7 +1,7 @@
# sigil project file, saved by plugin.
-version: 0.0.0
+-activator: org.apache.felix.sigil.core.BldCore
-bundles: \
org.apache.felix.sigil.common.core, \
@@ -44,7 +44,9 @@
org.apache.felix.sigil.model.eclipse, \
org.apache.felix.sigil.model.osgi, \
org.apache.felix.sigil.repository, \
- org.eclipse.core.runtime;version=3.4.0, \
- org.osgi.framework;version=1.4.0, \
+ org.eclipse.core.runtime, \
+ org.osgi.framework, \
+
+header;Bundle-ActivationPolicy: lazy
# end
diff --git a/sigil/common/junit/sigil.properties b/sigil/common/junit/sigil.properties
index 1e8241e..c42e689 100644
--- a/sigil/common/junit/sigil.properties
+++ b/sigil/common/junit/sigil.properties
@@ -3,8 +3,6 @@
-activator: org.apache.felix.sigil.junit.activator.Activator
-version: 0.8.0
-
-bundles: \
org.apache.felix.sigil.common.junit, \
@@ -15,9 +13,9 @@
org.apache.felix.sigil.junit.server, \
-imports: \
- junit.framework;version=4.4.0, \
+ junit.framework, \
org.apache.felix.sigil.junit.server, \
- org.osgi.framework;version=1.4.0, \
- org.osgi.util.tracker;version=1.3.3, \
+ org.osgi.framework, \
+ org.osgi.util.tracker, \
# end
diff --git a/sigil/common/obr/.classpath b/sigil/common/obr/.classpath
index d3b9691..094b74d 100644
--- a/sigil/common/obr/.classpath
+++ b/sigil/common/obr/.classpath
@@ -2,6 +2,6 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.cauldron.sigil.core.classpathContainer"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="build/classes"/>
</classpath>
diff --git a/sigil/common/obr/sigil.properties b/sigil/common/obr/sigil.properties
index 87410f3..5ee1f7c 100644
--- a/sigil/common/obr/sigil.properties
+++ b/sigil/common/obr/sigil.properties
@@ -1,8 +1,6 @@
# sigil project file, saved by plugin.
-version: 0.0.0
-
-bundles: \
org.apache.felix.sigil.common.obr, \
@@ -15,7 +13,7 @@
org.apache.felix.sigil.model.eclipse, \
org.apache.felix.sigil.model.osgi, \
org.apache.felix.sigil.repository, \
- org.eclipse.core.runtime;version=3.4.0, \
- org.osgi.framework;version=1.4.0, \
+ org.eclipse.core.runtime, \
+ org.osgi.framework, \
# end