You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ds...@apache.org on 2009/09/14 16:17:26 UTC

svn commit: r814654 - in /felix/trunk/sigil: bldcommon/prepare/ivy.xml bldcommon/sigil-repos.properties sigil-defaults.properties

Author: dsavage
Date: Mon Sep 14 14:17:26 2009
New Revision: 814654

URL: http://svn.apache.org/viewvc?rev=814654&view=rev
Log:
update sigil to use 2.0.0 artifacts from felix vs local m2 repository (FELIX-1589)

Modified:
    felix/trunk/sigil/bldcommon/prepare/ivy.xml
    felix/trunk/sigil/bldcommon/sigil-repos.properties
    felix/trunk/sigil/sigil-defaults.properties

Modified: felix/trunk/sigil/bldcommon/prepare/ivy.xml
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/bldcommon/prepare/ivy.xml?rev=814654&r1=814653&r2=814654&view=diff
==============================================================================
--- felix/trunk/sigil/bldcommon/prepare/ivy.xml (original)
+++ felix/trunk/sigil/bldcommon/prepare/ivy.xml Mon Sep 14 14:17:26 2009
@@ -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>

Modified: felix/trunk/sigil/bldcommon/sigil-repos.properties
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/bldcommon/sigil-repos.properties?rev=814654&r1=814653&r2=814654&view=diff
==============================================================================
--- felix/trunk/sigil/bldcommon/sigil-repos.properties (original)
+++ felix/trunk/sigil/bldcommon/sigil-repos.properties Mon Sep 14 14:17:26 2009
@@ -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

Modified: felix/trunk/sigil/sigil-defaults.properties
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/sigil-defaults.properties?rev=814654&r1=814653&r2=814654&view=diff
==============================================================================
--- felix/trunk/sigil/sigil-defaults.properties (original)
+++ felix/trunk/sigil/sigil-defaults.properties Mon Sep 14 14:17:26 2009
@@ -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