Reflect the change we did last week on the core integration-tests to the manipulation integration-tests
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1525404 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/ipojo/manipulator/manipulator-it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestNativeMethod.java b/ipojo/manipulator/manipulator-it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestNativeMethod.java
index f832d13..5c9fde2 100644
--- a/ipojo/manipulator/manipulator-it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestNativeMethod.java
+++ b/ipojo/manipulator/manipulator-it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestNativeMethod.java
@@ -72,6 +72,11 @@
@Test
public void testComponentWithNativeMethod() {
+ if (isKnopflerfish()) {
+ System.out.println("Test not supported on knopflerfish");
+ return;
+ }
+
ComponentInstance ci = ipojoHelper.createComponentInstance("org.apache.felix.ipojo.runtime.core.components" +
".nativ.NativeComponent");
diff --git a/ipojo/manipulator/manipulator-it/pom.xml b/ipojo/manipulator/manipulator-it/pom.xml
index 22672d5..1d0b570 100644
--- a/ipojo/manipulator/manipulator-it/pom.xml
+++ b/ipojo/manipulator/manipulator-it/pom.xml
@@ -35,12 +35,12 @@
<!-- Tests are enabled only when the 'test' profile is activated -->
<skipTestExecution>true</skipTestExecution>
- <exam.version>3.0.0</exam.version>
+ <exam.version>3.0.1</exam.version>
<url.version>1.5.1</url.version>
<felix.version>4.2.0</felix.version>
- <equinox.version>3.8.1.v20120830-144521</equinox.version>
- <knoperflerfish.version>5.3.3</knoperflerfish.version>
+ <equinox.version>3.9.0.v20130529-1710</equinox.version>
+ <knoperflerfish.version>6.0.2</knoperflerfish.version>
</properties>
<modules>
@@ -154,13 +154,6 @@
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.framework</artifactId>
- <version>${felix.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
<version>0.9.6</version>
@@ -174,7 +167,6 @@
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -215,12 +207,36 @@
<artifactId>org.apache.felix.ipojo</artifactId>
<!-- To update before the release -->
<version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.manipulator.online</artifactId>
<version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.ipojo</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- End of tested version -->
@@ -243,12 +259,24 @@
<artifactId>osgi-helpers</artifactId>
<version>0.6.2-SNAPSHOT</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.log</artifactId>
<version>1.0.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -256,10 +284,34 @@
<artifactId>pax-url-wrap</artifactId>
<version>1.5.2</version>
</dependency>
+
+ <dependency>
+ <groupId>org.easytesting</groupId>
+ <artifactId>fest-assert</artifactId>
+ <version>1.4</version>
+ </dependency>
</dependencies>
<profiles>
<profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>4.3.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>4.3.1</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
<id>knopflerfish</id>
<activation>
<activeByDefault>false</activeByDefault>
@@ -284,6 +336,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>
@@ -301,11 +359,22 @@
</properties>
<dependencies>
<dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>4.3.0</version>
+ </dependency>
+ <dependency>
<groupId>org.eclipse.tycho</groupId>
<artifactId>org.eclipse.osgi</artifactId>
<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>
@@ -326,7 +395,6 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
<version>${felix.version}</version>
- <scope>test</scope>
</dependency>
</dependencies>
</profile>