Update junit4osgi to use Felix 2.0
Apply the patch from Felix-1646 (just change some cosmetic stuff)
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@819461 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/ipojo/tests/integration-tests/pom.xml b/ipojo/tests/integration-tests/pom.xml
index cc564e3..38a79f1 100644
--- a/ipojo/tests/integration-tests/pom.xml
+++ b/ipojo/tests/integration-tests/pom.xml
@@ -24,6 +24,7 @@
</goals>
<configuration>
<hideOutputs>true</hideOutputs>
+ <logService>false</logService>
<configuration>
<org.osgi.http.port>8083</org.osgi.http.port>
</configuration>
@@ -239,12 +240,7 @@
<scope>test</scope>
</dependency>
<!-- Utility bundles -->
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.configadmin</artifactId>
- <version>1.2.2</version>
- <scope>test</scope>
- </dependency>
+
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.handler.whiteboard</artifactId>
@@ -287,6 +283,12 @@
<version>${ipojo.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.configadmin</artifactId>
+ <version>1.2.4</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</profile>
</profiles>