Refactor the integration-test pom file and fix dependency conflicts.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1524346 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/ipojo/runtime/core-it/pom.xml b/ipojo/runtime/core-it/pom.xml
index e2bf613..8b453df 100644
--- a/ipojo/runtime/core-it/pom.xml
+++ b/ipojo/runtime/core-it/pom.xml
@@ -353,6 +353,12 @@
<version>${knoperflerfish.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <!-- must be after KF -->
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>4.3.1</version>
+ </dependency>
</dependencies>
</profile>
@@ -380,6 +386,12 @@
<version>${equinox.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <!-- must be after equinox -->
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>4.3.1</version>
+ </dependency>
</dependencies>
</profile>