Migrate the test suites to the new junit4osgi development model (use getContext() to get the bundle context instead of context).
Add <parent> in pom files
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@722146 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/ipojo/examples/junit4osgi/felix-command/metadata.xml b/ipojo/examples/junit4osgi/felix-command/metadata.xml
index 4021649..b1524c5 100644
--- a/ipojo/examples/junit4osgi/felix-command/metadata.xml
+++ b/ipojo/examples/junit4osgi/felix-command/metadata.xml
@@ -16,7 +16,6 @@
specific language governing permissions and limitations
under the License.
-->
-<?xml version="1.0" encoding="UTF-8"?>
<iPOJO>
<component
className="org.apache.felix.ipojo.junit4osgi.command.JunitCommand"
diff --git a/ipojo/examples/junit4osgi/felix-command/pom.xml b/ipojo/examples/junit4osgi/felix-command/pom.xml
index 6b912ad..0b49f1d 100644
--- a/ipojo/examples/junit4osgi/felix-command/pom.xml
+++ b/ipojo/examples/junit4osgi/felix-command/pom.xml
@@ -17,13 +17,17 @@
under the License.
-->
<project>
+ <parent>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>felix</artifactId>
+ <version>1.0.2</version>
+ </parent>
<modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging>
<name>Junit4Osgi-Felix-Command</name>
<artifactId>
org.apache.felix.ipojo.junit4osgi.felix-command
</artifactId>
- <groupId>org.apache.felix</groupId>
<version>1.1.0-SNAPSHOT</version>
<dependencies>
<dependency>
diff --git a/ipojo/examples/junit4osgi/immediate-launcher/metadata.xml b/ipojo/examples/junit4osgi/immediate-launcher/metadata.xml
index 4d7392a..9f3da35 100644
--- a/ipojo/examples/junit4osgi/immediate-launcher/metadata.xml
+++ b/ipojo/examples/junit4osgi/immediate-launcher/metadata.xml
@@ -16,7 +16,6 @@
specific language governing permissions and limitations
under the License.
-->
-<?xml version="1.0" encoding="UTF-8"?>
<iPOJO>
<component
className="org.apache.felix.ipojo.junit4osgi.command.ImmediateRunner"
diff --git a/ipojo/examples/junit4osgi/immediate-launcher/pom.xml b/ipojo/examples/junit4osgi/immediate-launcher/pom.xml
index 0328d91..c13726a 100644
--- a/ipojo/examples/junit4osgi/immediate-launcher/pom.xml
+++ b/ipojo/examples/junit4osgi/immediate-launcher/pom.xml
@@ -17,13 +17,17 @@
under the License.
-->
<project>
+ <parent>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>felix</artifactId>
+ <version>1.0.2</version>
+ </parent>
<modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging>
<name>Junit4Osgi-Immediate-Runner</name>
<artifactId>
org.apache.felix.ipojo.junit4osgi.immediate-runner
</artifactId>
- <groupId>org.apache.felix</groupId>
<version>1.1.0-SNAPSHOT</version>
<dependencies>
<dependency>
diff --git a/ipojo/examples/junit4osgi/junit4osgi/metadata.xml b/ipojo/examples/junit4osgi/junit4osgi/metadata.xml
index db0dc94..7d59467 100644
--- a/ipojo/examples/junit4osgi/junit4osgi/metadata.xml
+++ b/ipojo/examples/junit4osgi/junit4osgi/metadata.xml
@@ -16,7 +16,6 @@
specific language governing permissions and limitations
under the License.
-->
-<?xml version="1.0" encoding="UTF-8"?>
<ipojo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="org.apache.felix.ipojo http://people.apache.org/~clement/ipojo/schemas/core.xsd
org.apache.felix.ipojo.extender http://people.apache.org/~clement/ipojo/schemas/extender-pattern.xsd"
diff --git a/ipojo/examples/junit4osgi/junit4osgi/pom.xml b/ipojo/examples/junit4osgi/junit4osgi/pom.xml
index 26db137..b7b7774 100644
--- a/ipojo/examples/junit4osgi/junit4osgi/pom.xml
+++ b/ipojo/examples/junit4osgi/junit4osgi/pom.xml
@@ -17,11 +17,15 @@
under the License.
-->
<project>
+ <parent>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>felix</artifactId>
+ <version>1.0.2</version>
+ </parent>
<modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging>
<name>Junit4Osgi</name>
<artifactId>org.apache.felix.ipojo.junit4osgi</artifactId>
- <groupId>org.apache.felix</groupId>
<version>1.1.0-SNAPSHOT</version>
<dependencies>
<dependency>
diff --git a/ipojo/examples/junit4osgi/maven-junit4osgi-plugin/pom.xml b/ipojo/examples/junit4osgi/maven-junit4osgi-plugin/pom.xml
index 729d27d..4e60f93 100644
--- a/ipojo/examples/junit4osgi/maven-junit4osgi-plugin/pom.xml
+++ b/ipojo/examples/junit4osgi/maven-junit4osgi-plugin/pom.xml
@@ -18,8 +18,12 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>felix</artifactId>
+ <version>1.0.2</version>
+ </parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.felix</groupId>
<artifactId>maven-junit4osgi-plugin</artifactId>
<packaging>maven-plugin</packaging>
<version>1.1.0-SNAPSHOT</version>
diff --git a/ipojo/examples/junit4osgi/swing-runner/metadata.xml b/ipojo/examples/junit4osgi/swing-runner/metadata.xml
index 2a5a610..958bfc4 100644
--- a/ipojo/examples/junit4osgi/swing-runner/metadata.xml
+++ b/ipojo/examples/junit4osgi/swing-runner/metadata.xml
@@ -16,7 +16,6 @@
specific language governing permissions and limitations
under the License.
-->
-<?xml version="1.0" encoding="UTF-8"?>
<iPOJO>
<component
classname="org.apache.felix.ipojo.junit4osgi.command.SwingRunner">
diff --git a/ipojo/examples/junit4osgi/swing-runner/pom.xml b/ipojo/examples/junit4osgi/swing-runner/pom.xml
index 4931067..137e93b 100644
--- a/ipojo/examples/junit4osgi/swing-runner/pom.xml
+++ b/ipojo/examples/junit4osgi/swing-runner/pom.xml
@@ -17,11 +17,15 @@
under the License.
-->
<project>
+ <parent>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>felix</artifactId>
+ <version>1.0.2</version>
+ </parent>
<modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging>
<name>Junit4Osgi-Swing-GUI</name>
<artifactId>org.apache.felix.ipojo.junit4osgi.swing-gui</artifactId>
- <groupId>org.apache.felix</groupId>
<version>1.1.0-SNAPSHOT</version>
<dependencies>
<dependency>