Add missing header in pom file.
Modify parent section of pom files to point on the felix pom file.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@642546 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/ipojo/examples/junit4osgi/felix-command/pom.xml b/ipojo/examples/junit4osgi/felix-command/pom.xml
index f810d59..ab8d0ba 100644
--- a/ipojo/examples/junit4osgi/felix-command/pom.xml
+++ b/ipojo/examples/junit4osgi/felix-command/pom.xml
@@ -17,18 +17,14 @@
under the License.
-->
<project>
- <parent>
- <groupId>ipojo.examples</groupId>
- <artifactId>Junit4Osgi</artifactId>
- <version>0.7.6-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
<modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging>
<name>Junit4Osgi-Felix-Command</name>
<artifactId>
org.apache.felix.ipojo.junit4osgi.felix-command
</artifactId>
+ <groupId>ipojo.examples</groupId>
+ <version>0.7.6-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>${pom.groupId}</groupId>
diff --git a/ipojo/examples/junit4osgi/immediate-launcher/pom.xml b/ipojo/examples/junit4osgi/immediate-launcher/pom.xml
index 18cfb31..8d2514d 100644
--- a/ipojo/examples/junit4osgi/immediate-launcher/pom.xml
+++ b/ipojo/examples/junit4osgi/immediate-launcher/pom.xml
@@ -17,18 +17,14 @@
under the License.
-->
<project>
- <parent>
- <groupId>ipojo.examples</groupId>
- <artifactId>Junit4Osgi</artifactId>
- <version>0.7.6-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
<modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging>
<name>Junit4Osgi-Immediate-Runner</name>
<artifactId>
org.apache.felix.ipojo.junit4osgi.immediate-runner
</artifactId>
+ <groupId>ipojo.examples</groupId>
+ <version>0.7.6-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>${pom.groupId}</groupId>
diff --git a/ipojo/examples/junit4osgi/junit4osgi/pom.xml b/ipojo/examples/junit4osgi/junit4osgi/pom.xml
index e4ffbf4..8d0c6db 100644
--- a/ipojo/examples/junit4osgi/junit4osgi/pom.xml
+++ b/ipojo/examples/junit4osgi/junit4osgi/pom.xml
@@ -17,16 +17,12 @@
under the License.
-->
<project>
- <parent>
- <groupId>ipojo.examples</groupId>
- <artifactId>Junit4Osgi</artifactId>
- <version>0.7.6-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
<modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging>
<name>Junit4Osgi</name>
<artifactId>org.apache.felix.ipojo.junit4osgi</artifactId>
+ <groupId>ipojo.examples</groupId>
+ <version>0.7.6-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
diff --git a/ipojo/examples/junit4osgi/metadata.xml b/ipojo/examples/junit4osgi/metadata.xml
deleted file mode 100644
index 29be5f3..0000000
--- a/ipojo/examples/junit4osgi/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<iPOJO xmlns:extender="org.apache.felix.ipojo.extender">
- <Component className="org.apache.felix.ipojo.junit4osgi.impl.JunitExtender">
- <extender:extender extension="Test-Suite" onArrival="onBundleArrival" onDeparture="onBundleDeparture"/>
- <callback transition="invalidate" method="stopping"/>
- <provides/>
- </Component>
- <instance component="org.apache.felix.ipojo.junit4osgi.impl.JunitExtender"/>
-
- <component className="org.apache.felix.ipojo.junit4osgi.command.JunitCommand" factory="false">
- <requires field="runner"/>
- <provides/>
- </component>
- <instance component="org.apache.felix.ipojo.junit4osgi.command.JunitCommand"/>
-</iPOJO>
\ No newline at end of file
diff --git a/ipojo/examples/junit4osgi/pom.xml b/ipojo/examples/junit4osgi/pom.xml
index 4e5a05e..dfb8be8 100644
--- a/ipojo/examples/junit4osgi/pom.xml
+++ b/ipojo/examples/junit4osgi/pom.xml
@@ -1,13 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<project>
- <parent>
- <groupId>ipojo.examples</groupId>
- <artifactId>ipojo.examples</artifactId>
- <version>0.7.6-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>Junit4Osgi</artifactId>
+ <groupId>ipojo.examples</groupId>
+ <version>0.7.6-SNAPSHOT</version>
<name>Apache Felix iPOJO Junit4OSGi</name>
<packaging>pom</packaging>
diff --git a/ipojo/examples/junit4osgi/swing-runner/pom.xml b/ipojo/examples/junit4osgi/swing-runner/pom.xml
index da9bae5..d89c845 100644
--- a/ipojo/examples/junit4osgi/swing-runner/pom.xml
+++ b/ipojo/examples/junit4osgi/swing-runner/pom.xml
@@ -17,16 +17,12 @@
under the License.
-->
<project>
- <parent>
- <groupId>ipojo.examples</groupId>
- <artifactId>Junit4Osgi</artifactId>
- <version>0.7.6-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
<modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging>
<name>Junit4Osgi-Swing-GUI</name>
<artifactId>org.apache.felix.ipojo.junit4osgi.swing-gui</artifactId>
+ <groupId>ipojo.examples</groupId>
+ <version>0.7.6-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>${pom.groupId}</groupId>
diff --git a/ipojo/examples/pom.xml b/ipojo/examples/pom.xml
index 0aef7eb..adc64d4 100644
--- a/ipojo/examples/pom.xml
+++ b/ipojo/examples/pom.xml
@@ -1,14 +1,26 @@
-<project>
- <parent>
- <groupId>org.apache.felix</groupId>
- <artifactId>iPOJO</artifactId>
- <version>0.7.6-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<project>
<modelVersion>4.0.0</modelVersion>
<groupId>ipojo.examples</groupId>
<artifactId>ipojo.examples</artifactId>
+ <version>0.7.6-SNAPSHOT</version>
<name>Apache Felix iPOJO Examples</name>
<packaging>pom</packaging>
<modules>
diff --git a/ipojo/examples/property-handler/PropertyHandler/pom.xml b/ipojo/examples/property-handler/PropertyHandler/pom.xml
index d806ab9..b7dc16b 100644
--- a/ipojo/examples/property-handler/PropertyHandler/pom.xml
+++ b/ipojo/examples/property-handler/PropertyHandler/pom.xml
@@ -17,18 +17,14 @@
under the License.
-->
<project>
- <parent>
- <groupId>ipojo.examples</groupId>
- <artifactId>ipojo.examples.property.handler</artifactId>
- <version>0.7.6-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
<modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging>
<name>Apache Felix iPOJO Property Handler</name>
<artifactId>
org.apache.felix.ipojo.example.handler.property
</artifactId>
+ <groupId>ipojo.examples</groupId>
+ <version>0.7.6-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
diff --git a/ipojo/examples/property-handler/PropertyHandlerTest/pom.xml b/ipojo/examples/property-handler/PropertyHandlerTest/pom.xml
index dc28218..d37caef 100644
--- a/ipojo/examples/property-handler/PropertyHandlerTest/pom.xml
+++ b/ipojo/examples/property-handler/PropertyHandlerTest/pom.xml
@@ -17,18 +17,14 @@
under the License.
-->
<project>
- <parent>
- <groupId>ipojo.examples</groupId>
- <artifactId>ipojo.examples.property.handler</artifactId>
- <version>0.7.6-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
<modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging>
<name>Apache Felix iPOJO Property Handler Test</name>
<artifactId>
org.apache.felix.ipojo.example.handler.property.test
</artifactId>
+ <groupId>ipojo.examples</groupId>
+ <version>0.7.6-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
diff --git a/ipojo/examples/property-handler/pom.xml b/ipojo/examples/property-handler/pom.xml
index 2b9f2df..764c487 100644
--- a/ipojo/examples/property-handler/pom.xml
+++ b/ipojo/examples/property-handler/pom.xml
@@ -1,13 +1,26 @@
-<project>
- <parent>
- <groupId>ipojo.examples</groupId>
- <artifactId>ipojo.examples</artifactId>
- <version>0.7.6-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<project>
<modelVersion>4.0.0</modelVersion>
<artifactId>ipojo.examples.property.handler</artifactId>
+ <groupId>ipojo.examples</groupId>
+ <version>0.7.6-SNAPSHOT</version>
<name>Apache Felix iPOJO Property Handler</name>
<packaging>pom</packaging>
diff --git a/ipojo/examples/tutorial-maven/hello.client.annotation/pom.xml b/ipojo/examples/tutorial-maven/hello.client.annotation/pom.xml
index eee6444..78b5fe3 100644
--- a/ipojo/examples/tutorial-maven/hello.client.annotation/pom.xml
+++ b/ipojo/examples/tutorial-maven/hello.client.annotation/pom.xml
@@ -19,15 +19,21 @@
</dependency>
</dependencies>
- <pluginRepositories>
- <pluginRepository>
- <id>apache.snapshots</id>
- <name>snapshot plugins</name>
- <url>
- http://people.apache.org/repo/m2-snapshot-repository
- </url>
- </pluginRepository>
- </pluginRepositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>apache.snapshots</id>
+ <name>snapshot plugins</name>
+ <url>
+ http://people.apache.org/repo/m2-snapshot-repository
+ </url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
<build>
<plugins>
@@ -53,6 +59,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-ipojo-plugin</artifactId>
+ <version>0.7.6-SNAPSHOT</version>
<executions>
<execution>
<goals>
diff --git a/ipojo/examples/tutorial-maven/hello.impl.annotation/pom.xml b/ipojo/examples/tutorial-maven/hello.impl.annotation/pom.xml
index 2281a57..c3fa987 100644
--- a/ipojo/examples/tutorial-maven/hello.impl.annotation/pom.xml
+++ b/ipojo/examples/tutorial-maven/hello.impl.annotation/pom.xml
@@ -31,6 +31,12 @@
<url>
http://people.apache.org/repo/m2-snapshot-repository
</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
</pluginRepository>
</pluginRepositories>
@@ -75,6 +81,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-ipojo-plugin</artifactId>
+ <version>0.7.6-SNAPSHOT</version>
<executions>
<execution>
<goals>
diff --git a/ipojo/examples/tutorial-maven/pom.xml b/ipojo/examples/tutorial-maven/pom.xml
index 99d12ac..8266daf 100644
--- a/ipojo/examples/tutorial-maven/pom.xml
+++ b/ipojo/examples/tutorial-maven/pom.xml
@@ -1,12 +1,26 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<project>
- <parent>
- <groupId>ipojo.examples</groupId>
- <artifactId>ipojo.examples</artifactId>
- <version>0.7.6-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>ipojo.tutorial</artifactId>
+ <groupId>ipojo.examples</groupId>
+ <version>0.7.6-SNAPSHOT</version>
<name>Apache Felix iPOJO Tutorial</name>
<packaging>pom</packaging>
<modules>