incubator-aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lin...@apache.org
Subject svn commit: r888492 - in /incubator/aries/trunk/blueprint: blueprint-itests/pom.xml pom.xml
Date Tue, 08 Dec 2009 17:29:26 GMT
Author: linsun
Date: Tue Dec  8 17:29:25 2009
New Revision: 888492

URL: http://svn.apache.org/viewvc?rev=888492&view=rev
Log:
comment out unused felix.main dependency

Modified:
    incubator/aries/trunk/blueprint/blueprint-itests/pom.xml
    incubator/aries/trunk/blueprint/pom.xml

Modified: incubator/aries/trunk/blueprint/blueprint-itests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-itests/pom.xml?rev=888492&r1=888491&r2=888492&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-itests/pom.xml (original)
+++ incubator/aries/trunk/blueprint/blueprint-itests/pom.xml Tue Dec  8 17:29:25 2009
@@ -111,11 +111,11 @@
             <artifactId>pax-url-mvn</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
+        <!--<dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.main</artifactId>
             <scope>provided</scope>
-        </dependency>
+        </dependency>-->
 
     </dependencies>
 

Modified: incubator/aries/trunk/blueprint/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/pom.xml?rev=888492&r1=888491&r2=888492&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/pom.xml (original)
+++ incubator/aries/trunk/blueprint/pom.xml Tue Dec  8 17:29:25 2009
@@ -149,6 +149,13 @@
                 <artifactId>pax-runner-no-jcl</artifactId>
                 <version>1.1.1</version>
             </dependency>
+            <!-- TODO: We need felix 2.0.0 which is not supported by pax exam yet,
+                 so tests are only enabled on equinox for now
+            <dependency>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>org.apache.felix.main</artifactId>
+                <version>2.0.0</version>
+            </dependency>-->
             <dependency>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>org.apache.felix.configadmin</artifactId>
@@ -169,13 +176,6 @@
                 <artifactId>pax-url-mvn</artifactId>
                 <version>1.0.0</version>
             </dependency>
-            <!-- TODO: We need felix 2.0.0 which is not supported by pax exam yet,
-                 so tests are only enabled on equinox for now -->
-            <dependency>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>org.apache.felix.main</artifactId>
-                <version>2.0.0</version>
-            </dependency>
             <dependency>
                 <groupId>org.eclipse</groupId>
                 <artifactId>osgi</artifactId>



Mime
View raw message