Final steps before the release preparation:
- cosmetic fix
- update to new parent
- remove dependnencies on org.apache.felix osgi core and compendium
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@934873 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/ipojo/tests/api/pom.xml b/ipojo/tests/api/pom.xml
index 1a045b6..895103f 100644
--- a/ipojo/tests/api/pom.xml
+++ b/ipojo/tests/api/pom.xml
@@ -52,6 +52,11 @@
<dependencies>
<dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>4.2.0</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo</artifactId>
<version>${pom.version}</version>
diff --git a/ipojo/tests/bundleAsiPOJO/bundleAsiPOJO/pom.xml b/ipojo/tests/bundleAsiPOJO/bundleAsiPOJO/pom.xml
index b81f645..1cf653b 100644
--- a/ipojo/tests/bundleAsiPOJO/bundleAsiPOJO/pom.xml
+++ b/ipojo/tests/bundleAsiPOJO/bundleAsiPOJO/pom.xml
@@ -11,7 +11,7 @@
<parent>
<artifactId>felix-parent</artifactId>
<groupId>org.apache.felix</groupId>
- <version>1.2.0</version>
+ <version>1.2.1</version>
</parent>
<dependencies>
diff --git a/ipojo/tests/bundleAsiPOJO/helpers/pom.xml b/ipojo/tests/bundleAsiPOJO/helpers/pom.xml
index 647d632..9806443 100644
--- a/ipojo/tests/bundleAsiPOJO/helpers/pom.xml
+++ b/ipojo/tests/bundleAsiPOJO/helpers/pom.xml
@@ -31,7 +31,7 @@
<parent>
<artifactId>felix-parent</artifactId>
<groupId>org.apache.felix</groupId>
- <version>1.2.0</version>
+ <version>1.2.1</version>
</parent>
<build>
diff --git a/ipojo/tests/core/handler/src/test/java/org/apache/felix/ipojo/tests/core/DummyHandlerTest.java b/ipojo/tests/core/handler/src/test/java/org/apache/felix/ipojo/tests/core/DummyHandlerTest.java
index bb59973..880e689 100644
--- a/ipojo/tests/core/handler/src/test/java/org/apache/felix/ipojo/tests/core/DummyHandlerTest.java
+++ b/ipojo/tests/core/handler/src/test/java/org/apache/felix/ipojo/tests/core/DummyHandlerTest.java
@@ -86,7 +86,7 @@
.build(asiPOJOBundle(new File("src/test/resources/dummy-component.xml")))
),
provision(
- mavenBundle().groupId("org.apache.felix").artifactId("org.osgi.compendium").versionAsInProject()
+ mavenBundle().groupId("org.apache.felix").artifactId("org.osgi.compendium").version("1.4.0")
));
Option[] r = OptionUtils.combine(platform, bundles);
diff --git a/ipojo/tests/core/logger/pom.xml b/ipojo/tests/core/logger/pom.xml
index 15e4b0d..03e6cbb 100644
--- a/ipojo/tests/core/logger/pom.xml
+++ b/ipojo/tests/core/logger/pom.xml
@@ -50,6 +50,11 @@
</build>
<dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>4.2.0</version>
+ </dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo</artifactId>
diff --git a/ipojo/tests/core/service-providing-inheritance/pom.xml b/ipojo/tests/core/service-providing-inheritance/pom.xml
index a01b289..5b71205 100644
--- a/ipojo/tests/core/service-providing-inheritance/pom.xml
+++ b/ipojo/tests/core/service-providing-inheritance/pom.xml
@@ -55,6 +55,11 @@
<artifactId>org.apache.felix.ipojo</artifactId>
<version>${pom.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>4.2.0</version>
+ </dependency>
<!-- Pax Exam API: -->
<dependency>