svn commit: r1451120 - in /felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-handler-test/src/test/java/org/apache/felix/ipojo/runtime/core: Common.java DummyHandlerTest.java

[clement]

Author: clement
Date: Thu Feb 28 07:08:17 2013
New Revision: 1451120

URL: http://svn.apache.org/r1451120
Log:
FELIX-3903 : remove old compendium bundle

Modified:
    
felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-handler-test/src/test/java/org/apache/felix/ipojo/runtime/core/Common.java
    
felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-handler-test/src/test/java/org/apache/felix/ipojo/runtime/core/DummyHandlerTest.java

Modified: 
felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-handler-test/src/test/java/org/apache/felix/ipojo/runtime/core/Common.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-handler-test/src/test/java/org/apache/felix/ipojo/runtime/core/Common.java?rev=1451120&r1=1451119&r2=1451120&view=diff
==============================================================================
--- 
felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-handler-test/src/test/java/org/apache/felix/ipojo/runtime/core/Common.java
 (original)
+++ 
felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-handler-test/src/test/java/org/apache/felix/ipojo/runtime/core/Common.java
 Thu Feb 28 07:08:17 2013
@@ -163,9 +163,6 @@ public class Common {
         return new DefaultCompositeOption(
                 mavenBundle("org.apache.felix", 
"org.apache.felix.ipojo").versionAsInProject(),
                 mavenBundle("org.ow2.chameleon.testing", 
"osgi-helpers").versionAsInProject(),
-                // harmcrest-all
-                //mavenBundle("de.twentyeleven.skysail", 
"org.hamcrest.hamcrest-all-osgi").versionAsInProject(),
-                // configuration admin
                 mavenBundle("org.apache.felix",  
"org.apache.felix.configadmin").versionAsInProject()
         );
     }

Modified: 
felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-handler-test/src/test/java/org/apache/felix/ipojo/runtime/core/DummyHandlerTest.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-handler-test/src/test/java/org/apache/felix/ipojo/runtime/core/DummyHandlerTest.java?rev=1451120&r1=1451119&r2=1451120&view=diff
==============================================================================
--- 
felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-handler-test/src/test/java/org/apache/felix/ipojo/runtime/core/DummyHandlerTest.java
 (original)
+++ 
felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-handler-test/src/test/java/org/apache/felix/ipojo/runtime/core/DummyHandlerTest.java
 Thu Feb 28 07:08:17 2013
@@ -28,7 +28,6 @@ import static org.junit.Assert.assertNot
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.ops4j.pax.exam.CoreOptions.bundle;
-import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
 import static org.ops4j.pax.exam.CoreOptions.streamBundle;
 import static org.ops4j.pax.tinybundles.core.TinyBundles.withBnd;
 
@@ -37,13 +36,11 @@ import static org.ops4j.pax.tinybundles.
 public class DummyHandlerTest extends Common {
 
     private static final String DUMMY_TEST_FACTORY = "dummy.test";
-
     /*
      * Number of mock object by test.
      */
     private static final int NB_MOCK = 10;
 
-
     @Configuration
     public Option[] config() throws IOException {
         Option[] options = super.config();
@@ -75,8 +72,8 @@ public class DummyHandlerTest extends Co
                         .build(withBnd())
                 ),
                 bundle(handlerJar.toURI().toURL().toExternalForm()),
-                bundle(dummyJar.toURI().toURL().toExternalForm()),
-                
mavenBundle().groupId("org.apache.felix").artifactId("org.osgi.compendium").version("1.4.0"));
+                bundle(dummyJar.toURI().toURL().toExternalForm())
+        );
     }
 
     /**
@@ -150,7 +147,6 @@ public class DummyHandlerTest extends Co
         }
     }
 
-
     /**
      * Test if the bind and unbind methods when the bind services are 
registered before the instance creation
      */