svn commit: r1164385 - in /aries/trunk/blueprint/blueprint-itests: pom.xml src/test/java/org/apache/aries/blueprint/itests/comp/ListFactory.java

[rwonly]

Author: rwonly
Date: Fri Sep  2 08:06:57 2011
New Revision: 1164385

URL: http://svn.apache.org/viewvc?rev=1164385&view=rev
Log:
make blueprint itests work

Modified:
    aries/trunk/blueprint/blueprint-itests/pom.xml
    
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/comp/ListFactory.java

Modified: aries/trunk/blueprint/blueprint-itests/pom.xml
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-itests/pom.xml?rev=1164385&r1=1164384&r2=1164385&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-itests/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-itests/pom.xml Fri Sep  2 08:06:57 2011
@@ -126,6 +126,16 @@
             <artifactId>org.apache.felix.configadmin</artifactId>
             <scope>test</scope>
             <version>1.2.4</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.felix</groupId>
+                    <artifactId>org.osgi.core</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.felix</groupId>
+                    <artifactId>org.osgi.compendium</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.ops4j.pax.logging</groupId>

Modified: 
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/comp/ListFactory.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/comp/ListFactory.java?rev=1164385&r1=1164384&r2=1164385&view=diff
==============================================================================
--- 
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/comp/ListFactory.java
 (original)
+++ 
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/comp/ListFactory.java
 Fri Sep  2 08:06:57 2011
@@ -19,7 +19,6 @@
 package org.apache.aries.blueprint.itests.comp;
 
 import java.util.Arrays;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
 
@@ -30,6 +29,6 @@ public class ListFactory {
             Thread.sleep(new Random().nextInt(100));
         } catch (InterruptedException ie) {}
         System.out.println(Thread.currentThread().getId()+": created");
-        return new ArrayList<Integer>(Arrays.asList(no));
+        return Arrays.asList(no);
     }
 }