You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cl...@apache.org on 2009/04/30 16:00:42 UTC

svn commit: r770233 - in /felix/trunk/ipojo: ./ annotations/ ant/ api/ arch/ composite/ core/ core/src/main/java/org/apache/felix/ipojo/ handler/eventadmin/ handler/extender/ handler/jmx/ handler/temporal/ handler/whiteboard/ junit4osgi/ junit4osgi/fel...

Author: clement
Date: Thu Apr 30 14:00:40 2009
New Revision: 770233

URL: http://svn.apache.org/viewvc?rev=770233&view=rev
Log:
Use the latest Felix pom

Modified:
    felix/trunk/ipojo/annotations/pom.xml
    felix/trunk/ipojo/ant/pom.xml
    felix/trunk/ipojo/api/pom.xml
    felix/trunk/ipojo/arch/pom.xml
    felix/trunk/ipojo/composite/pom.xml
    felix/trunk/ipojo/core/pom.xml
    felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/InstanceManager.java
    felix/trunk/ipojo/handler/eventadmin/pom.xml
    felix/trunk/ipojo/handler/extender/pom.xml
    felix/trunk/ipojo/handler/jmx/pom.xml
    felix/trunk/ipojo/handler/temporal/pom.xml
    felix/trunk/ipojo/handler/whiteboard/pom.xml
    felix/trunk/ipojo/junit4osgi/felix-command/pom.xml
    felix/trunk/ipojo/junit4osgi/immediate-launcher/pom.xml
    felix/trunk/ipojo/junit4osgi/junit4osgi/pom.xml
    felix/trunk/ipojo/junit4osgi/maven-junit4osgi-plugin/pom.xml
    felix/trunk/ipojo/junit4osgi/pom.xml
    felix/trunk/ipojo/junit4osgi/swing-runner/pom.xml
    felix/trunk/ipojo/manipulator/pom.xml
    felix/trunk/ipojo/metadata/pom.xml
    felix/trunk/ipojo/online-manipulator/pom.xml
    felix/trunk/ipojo/plugin/pom.xml
    felix/trunk/ipojo/pom.xml

Modified: felix/trunk/ipojo/annotations/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/annotations/pom.xml?rev=770233&r1=770232&r2=770233&view=diff
==============================================================================
--- felix/trunk/ipojo/annotations/pom.xml (original)
+++ felix/trunk/ipojo/annotations/pom.xml Thu Apr 30 14:00:40 2009
@@ -19,8 +19,8 @@
 <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/xsd/maven-4.0.0.xsd">
 	<parent>
 		<groupId>org.apache.felix</groupId>
-		<artifactId>felix</artifactId>
-		<version>1.0.4</version>
+		<artifactId>felix-parent</artifactId>
+		<version>1.2.0</version>
 		<relativePath>../../pom/pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

Modified: felix/trunk/ipojo/ant/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/ant/pom.xml?rev=770233&r1=770232&r2=770233&view=diff
==============================================================================
--- felix/trunk/ipojo/ant/pom.xml (original)
+++ felix/trunk/ipojo/ant/pom.xml Thu Apr 30 14:00:40 2009
@@ -19,8 +19,8 @@
 <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/xsd/maven-4.0.0.xsd">
 	<parent>
 		<groupId>org.apache.felix</groupId>
-		<artifactId>felix</artifactId>
-		<version>1.0.4</version>
+		<artifactId>felix-parent</artifactId>
+		<version>1.2.0</version>
 		<relativePath>../../pom/pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

Modified: felix/trunk/ipojo/api/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/api/pom.xml?rev=770233&r1=770232&r2=770233&view=diff
==============================================================================
--- felix/trunk/ipojo/api/pom.xml (original)
+++ felix/trunk/ipojo/api/pom.xml Thu Apr 30 14:00:40 2009
@@ -19,8 +19,8 @@
 <project>
 	<parent>
 		<groupId>org.apache.felix</groupId>
-		<artifactId>felix</artifactId>
-		<version>1.0.4</version>
+		<artifactId>felix-parent</artifactId>
+		<version>1.2.0</version>
 		<relativePath>../../pom/pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

Modified: felix/trunk/ipojo/arch/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/arch/pom.xml?rev=770233&r1=770232&r2=770233&view=diff
==============================================================================
--- felix/trunk/ipojo/arch/pom.xml (original)
+++ felix/trunk/ipojo/arch/pom.xml Thu Apr 30 14:00:40 2009
@@ -19,8 +19,8 @@
 <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.4</version>
+		<artifactId>felix-parent</artifactId>
+		<version>1.2.0</version>
 		<relativePath>../../pom/pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

Modified: felix/trunk/ipojo/composite/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/composite/pom.xml?rev=770233&r1=770232&r2=770233&view=diff
==============================================================================
--- felix/trunk/ipojo/composite/pom.xml (original)
+++ felix/trunk/ipojo/composite/pom.xml Thu Apr 30 14:00:40 2009
@@ -19,8 +19,8 @@
 <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.4</version>
+		<artifactId>felix-parent</artifactId>
+		<version>1.2.0</version>
 		<relativePath>../../pom/pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

Modified: felix/trunk/ipojo/core/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/core/pom.xml?rev=770233&r1=770232&r2=770233&view=diff
==============================================================================
--- felix/trunk/ipojo/core/pom.xml (original)
+++ felix/trunk/ipojo/core/pom.xml Thu Apr 30 14:00:40 2009
@@ -19,8 +19,8 @@
 <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.4</version>
+		<artifactId>felix-parent</artifactId>
+		<version>1.2.0</version>
 		<relativePath>../../pom/pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -50,6 +50,17 @@
 			<artifactId>org.apache.felix.ipojo.metadata</artifactId>
 			<version>1.3.0-SNAPSHOT</version>
 		</dependency>
+		<dependency>
+			<groupId>asm</groupId>
+			<artifactId>asm-all</artifactId>
+			<version>3.0</version>
+			<exclusions>
+				<exclusion>
+					<groupId>asm</groupId>
+					<artifactId>asm-tree</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
 	</dependencies>
 	<build>
 		<plugins>
@@ -82,7 +93,8 @@
 						<Private-Package> 
 							org.apache.felix.ipojo.handlers.architecture,
 							org.apache.felix.ipojo.handlers.lifecycle.callback,
-							org.apache.felix.ipojo.handlers.lifecycle.controller 
+							org.apache.felix.ipojo.handlers.lifecycle.controller,
+							org.objectweb.asm
 						</Private-Package>
 						<Export-Package> 
 							org.apache.felix.ipojo; version="${ipojo.package.version}",
@@ -97,8 +109,10 @@
 							org.osgi.service.cm, 
 							org.osgi.service.log 
 						</Export-Package>
-						<Include-Resource> META-INF/LICENCE=LICENSE,
-							META-INF/NOTICE=NOTICE </Include-Resource>
+						<Include-Resource> 
+							META-INF/LICENCE=LICENSE,
+							META-INF/NOTICE=NOTICE 
+						</Include-Resource>
 						<_donotcopy> (CVS|.svn|.+.bak|~.+|metadata.xml) </_donotcopy>
 					</instructions>
 				</configuration>

Modified: felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/InstanceManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/InstanceManager.java?rev=770233&r1=770232&r2=770233&view=diff
==============================================================================
--- felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/InstanceManager.java (original)
+++ felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/InstanceManager.java Thu Apr 30 14:00:40 2009
@@ -635,6 +635,7 @@
                 m_factory.getLogger().log(Logger.ERROR,
                         "[" + m_name + "] createInstance -> The POJO constructor invocation failed : " + e.getMessage());
                 stop();
+                e.printStackTrace();
                 throw new RuntimeException("Cannot create a POJO instance, the POJO constructor invocation has thrown an exception : " + e.getMessage());
             }
         } else {

Modified: felix/trunk/ipojo/handler/eventadmin/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/handler/eventadmin/pom.xml?rev=770233&r1=770232&r2=770233&view=diff
==============================================================================
--- felix/trunk/ipojo/handler/eventadmin/pom.xml (original)
+++ felix/trunk/ipojo/handler/eventadmin/pom.xml Thu Apr 30 14:00:40 2009
@@ -19,8 +19,8 @@
 <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.4</version>
+		<artifactId>felix-parent</artifactId>
+		<version>1.2.0</version>
 		<relativePath>../../pom/pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

Modified: felix/trunk/ipojo/handler/extender/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/handler/extender/pom.xml?rev=770233&r1=770232&r2=770233&view=diff
==============================================================================
--- felix/trunk/ipojo/handler/extender/pom.xml (original)
+++ felix/trunk/ipojo/handler/extender/pom.xml Thu Apr 30 14:00:40 2009
@@ -19,8 +19,8 @@
 <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.4</version>
+		<artifactId>felix-parent</artifactId>
+		<version>1.2.0</version>
 		<relativePath>../../pom/pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

Modified: felix/trunk/ipojo/handler/jmx/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/handler/jmx/pom.xml?rev=770233&r1=770232&r2=770233&view=diff
==============================================================================
--- felix/trunk/ipojo/handler/jmx/pom.xml (original)
+++ felix/trunk/ipojo/handler/jmx/pom.xml Thu Apr 30 14:00:40 2009
@@ -19,8 +19,8 @@
 <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.4</version>
+		<artifactId>felix-parent</artifactId>
+		<version>1.2.0</version>
 		<relativePath>../../pom/pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

Modified: felix/trunk/ipojo/handler/temporal/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/handler/temporal/pom.xml?rev=770233&r1=770232&r2=770233&view=diff
==============================================================================
--- felix/trunk/ipojo/handler/temporal/pom.xml (original)
+++ felix/trunk/ipojo/handler/temporal/pom.xml Thu Apr 30 14:00:40 2009
@@ -19,8 +19,8 @@
 <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.4</version>
+		<artifactId>felix-parent</artifactId>
+		<version>1.2.0</version>
 		<relativePath>../../pom/pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

Modified: felix/trunk/ipojo/handler/whiteboard/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/handler/whiteboard/pom.xml?rev=770233&r1=770232&r2=770233&view=diff
==============================================================================
--- felix/trunk/ipojo/handler/whiteboard/pom.xml (original)
+++ felix/trunk/ipojo/handler/whiteboard/pom.xml Thu Apr 30 14:00:40 2009
@@ -19,8 +19,8 @@
 <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.4</version>
+		<artifactId>felix-parent</artifactId>
+		<version>1.2.0</version>
 		<relativePath>../../pom/pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

Modified: felix/trunk/ipojo/junit4osgi/felix-command/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/junit4osgi/felix-command/pom.xml?rev=770233&r1=770232&r2=770233&view=diff
==============================================================================
--- felix/trunk/ipojo/junit4osgi/felix-command/pom.xml (original)
+++ felix/trunk/ipojo/junit4osgi/felix-command/pom.xml Thu Apr 30 14:00:40 2009
@@ -19,8 +19,8 @@
 <project>
 	<parent>
 		<groupId>org.apache.felix</groupId>
-		<artifactId>felix</artifactId>
-		<version>1.0.4</version>
+		<artifactId>felix-parent</artifactId>
+		<version>1.2.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>bundle</packaging>

Modified: felix/trunk/ipojo/junit4osgi/immediate-launcher/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/junit4osgi/immediate-launcher/pom.xml?rev=770233&r1=770232&r2=770233&view=diff
==============================================================================
--- felix/trunk/ipojo/junit4osgi/immediate-launcher/pom.xml (original)
+++ felix/trunk/ipojo/junit4osgi/immediate-launcher/pom.xml Thu Apr 30 14:00:40 2009
@@ -19,8 +19,8 @@
 <project>
 	<parent>
 		<groupId>org.apache.felix</groupId>
-		<artifactId>felix</artifactId>
-		<version>1.0.4</version>
+		<artifactId>felix-parent</artifactId>
+		<version>1.2.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>bundle</packaging>

Modified: felix/trunk/ipojo/junit4osgi/junit4osgi/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/junit4osgi/junit4osgi/pom.xml?rev=770233&r1=770232&r2=770233&view=diff
==============================================================================
--- felix/trunk/ipojo/junit4osgi/junit4osgi/pom.xml (original)
+++ felix/trunk/ipojo/junit4osgi/junit4osgi/pom.xml Thu Apr 30 14:00:40 2009
@@ -19,8 +19,8 @@
 <project>
 	<parent>
 		<groupId>org.apache.felix</groupId>
-		<artifactId>felix</artifactId>
-		<version>1.0.4</version>
+		<artifactId>felix-parent</artifactId>
+		<version>1.2.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>bundle</packaging>

Modified: felix/trunk/ipojo/junit4osgi/maven-junit4osgi-plugin/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/junit4osgi/maven-junit4osgi-plugin/pom.xml?rev=770233&r1=770232&r2=770233&view=diff
==============================================================================
--- felix/trunk/ipojo/junit4osgi/maven-junit4osgi-plugin/pom.xml (original)
+++ felix/trunk/ipojo/junit4osgi/maven-junit4osgi-plugin/pom.xml Thu Apr 30 14:00:40 2009
@@ -20,8 +20,8 @@
 	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.4</version>
+		<artifactId>felix-parent</artifactId>
+		<version>1.2.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>maven-junit4osgi-plugin</artifactId>

Modified: felix/trunk/ipojo/junit4osgi/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/junit4osgi/pom.xml?rev=770233&r1=770232&r2=770233&view=diff
==============================================================================
--- felix/trunk/ipojo/junit4osgi/pom.xml (original)
+++ felix/trunk/ipojo/junit4osgi/pom.xml Thu Apr 30 14:00:40 2009
@@ -19,8 +19,8 @@
 <project>
 	<parent>
 		<groupId>org.apache.felix</groupId>
-		<artifactId>felix</artifactId>
-		<version>1.0.4</version>
+		<artifactId>felix-parent</artifactId>
+		<version>1.2.0</version>
 	</parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>Junit4OSGi</artifactId>

Modified: felix/trunk/ipojo/junit4osgi/swing-runner/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/junit4osgi/swing-runner/pom.xml?rev=770233&r1=770232&r2=770233&view=diff
==============================================================================
--- felix/trunk/ipojo/junit4osgi/swing-runner/pom.xml (original)
+++ felix/trunk/ipojo/junit4osgi/swing-runner/pom.xml Thu Apr 30 14:00:40 2009
@@ -19,8 +19,8 @@
 <project>
 	<parent>
 		<groupId>org.apache.felix</groupId>
-		<artifactId>felix</artifactId>
-		<version>1.0.4</version>
+		<artifactId>felix-parent</artifactId>
+		<version>1.2.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>bundle</packaging>

Modified: felix/trunk/ipojo/manipulator/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/pom.xml?rev=770233&r1=770232&r2=770233&view=diff
==============================================================================
--- felix/trunk/ipojo/manipulator/pom.xml (original)
+++ felix/trunk/ipojo/manipulator/pom.xml Thu Apr 30 14:00:40 2009
@@ -19,8 +19,8 @@
 <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/xsd/maven-4.0.0.xsd">
 	<parent>
 		<groupId>org.apache.felix</groupId>
-		<artifactId>felix</artifactId>
-		<version>1.0.4</version>
+		<artifactId>felix-parent</artifactId>
+		<version>1.2.0</version>
 		<relativePath>../../pom/pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

Modified: felix/trunk/ipojo/metadata/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/metadata/pom.xml?rev=770233&r1=770232&r2=770233&view=diff
==============================================================================
--- felix/trunk/ipojo/metadata/pom.xml (original)
+++ felix/trunk/ipojo/metadata/pom.xml Thu Apr 30 14:00:40 2009
@@ -19,8 +19,8 @@
 <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.4</version>
+		<artifactId>felix-parent</artifactId>
+		<version>1.2.0</version>
 		<relativePath>../../pom/pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

Modified: felix/trunk/ipojo/online-manipulator/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/online-manipulator/pom.xml?rev=770233&r1=770232&r2=770233&view=diff
==============================================================================
--- felix/trunk/ipojo/online-manipulator/pom.xml (original)
+++ felix/trunk/ipojo/online-manipulator/pom.xml Thu Apr 30 14:00:40 2009
@@ -20,8 +20,8 @@
 	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.4</version>
+		<artifactId>felix-parent</artifactId>
+		<version>1.2.0</version>
 		<relativePath>../../pom/pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

Modified: felix/trunk/ipojo/plugin/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/plugin/pom.xml?rev=770233&r1=770232&r2=770233&view=diff
==============================================================================
--- felix/trunk/ipojo/plugin/pom.xml (original)
+++ felix/trunk/ipojo/plugin/pom.xml Thu Apr 30 14:00:40 2009
@@ -19,8 +19,8 @@
 <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.4</version>
+		<artifactId>felix-parent</artifactId>
+		<version>1.2.0</version>
 		<relativePath>../../pom/pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

Modified: felix/trunk/ipojo/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/pom.xml?rev=770233&r1=770232&r2=770233&view=diff
==============================================================================
--- felix/trunk/ipojo/pom.xml (original)
+++ felix/trunk/ipojo/pom.xml Thu Apr 30 14:00:40 2009
@@ -19,8 +19,8 @@
 <project>
  <parent>
     <groupId>org.apache.felix</groupId>
-    <artifactId>felix</artifactId>
-    <version>1.0.4</version>
+    <artifactId>felix-parent</artifactId>
+    <version>1.2.0</version>
     <relativePath>../pom/pom.xml</relativePath>
   </parent>