update sigil to use 2.0.0 artifacts from felix vs local m2 repository (FELIX-1589)
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@814654 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/sigil/bldcommon/prepare/ivy.xml b/sigil/bldcommon/prepare/ivy.xml
index 4ceb388..38fe7e2 100644
--- a/sigil/bldcommon/prepare/ivy.xml
+++ b/sigil/bldcommon/prepare/ivy.xml
@@ -66,7 +66,7 @@
<artifact name="bndlib" type="jar" />
</dependency>
- <dependency org="org.apache" name="felix" rev="1.2.0">
+ <dependency org="org.apache" name="felix" rev="1.4.0">
<artifact name="org.osgi.core" type="jar" />
<artifact name="org.osgi.compendium" type="jar" />
</dependency>
diff --git a/sigil/bldcommon/sigil-repos.properties b/sigil/bldcommon/sigil-repos.properties
index 2344991..a2eb4eb 100644
--- a/sigil/bldcommon/sigil-repos.properties
+++ b/sigil/bldcommon/sigil-repos.properties
@@ -2,7 +2,7 @@
# repository config
--repositories: system, project, bld-ant, bld-common, bld-hack, spring, m2
+-repositories: system, project, bld-ant, bld-common, bld-hack, spring
system;provider: system
system;level: -1
@@ -28,14 +28,8 @@
bld-hack;recurse: true
bld-hack;dir: ${..}/cache/eclipse2
-m2;provider: obr
-m2;level: 4
-m2;url: file:${user.home}/.m2/repository/repository.xml
-m2;index: ${..}/build/m2.obr
-m2;cache: ${..}/build/obr-cache
-
spring;provider: obr
-spring;level: 5
+spring;level: 4
spring;url: http://sigil.codecauldron.org/spring-external.obr
spring;index: ${..}/build/spring-external.obr
spring;cache: ${..}/build/obr-cache
diff --git a/sigil/sigil-defaults.properties b/sigil/sigil-defaults.properties
index e532286..5d29b9f 100644
--- a/sigil/sigil-defaults.properties
+++ b/sigil/sigil-defaults.properties
@@ -102,5 +102,6 @@
# OSGi framework
package;org.osgi.framework: 1.4.0
+package;org.osgi.framework.launch: 1.0.0
package;org.osgi.service.prefs: 1.1.0
package;org.osgi.util.tracker: 1.3.3