commit c3f669dda43f968aaa201504ed39017af81adf0c
author Gert Vanthienen <gertv@apache.org> Tue Jun 16 11:58:10 2009 +0000
committer Gert Vanthienen <gertv@apache.org> Tue Jun 16 11:58:10 2009 +0000
tree d2fccbf1ffbb5b55d1c5f58cb0412352afec930f
parent f53fd0269d66b42867784beb025399a6023e4b15

Update to felix-parent 1.2.0 and use EasyMock instead of JMock

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@785170 13f79535-47bb-0310-9956-ffa450edef68

karaf/pom.xml

diff --git a/karaf/pom.xml b/karaf/pom.xml
index 2785962..c872ffa 100644
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -23,8 +23,8 @@
 
     <parent>
         <groupId>org.apache.felix</groupId>
-        <artifactId>felix</artifactId>
-        <version>1.0.4</version>
+        <artifactId>felix-parent</artifactId>
+        <version>1.2.0</version>
     </parent>
 
     <groupId>org.apache.felix.karaf</groupId>