Fix FELIX-2308
Fix FELIX-2309
Update versions


git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@939354 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/ipojo/tests/core/annotations/pom.xml b/ipojo/tests/core/annotations/pom.xml
index 1942108..5d091da 100644
--- a/ipojo/tests/core/annotations/pom.xml
+++ b/ipojo/tests/core/annotations/pom.xml
@@ -27,13 +27,13 @@
     <dependency>

       <groupId>org.apache.felix</groupId>

       <artifactId>org.apache.felix.ipojo</artifactId>

-      <version>${pom.version}</version>

+      <version>1.7.0-SNAPSHOT</version>

     </dependency>

     <dependency>

       <groupId>org.apache.felix</groupId>

       <artifactId>org.apache.felix.ipojo.metadata

       </artifactId>

-      <version>${pom.version}</version>

+      <version>1.4.0</version>

     </dependency>

     <dependency>

       <groupId>org.apache.felix</groupId>

@@ -53,21 +53,21 @@
     <dependency>

       <groupId>org.apache.felix</groupId>

       <artifactId>org.apache.felix.ipojo.annotations</artifactId>

-      <version>${pom.version}</version>

+      <version>1.7.0-SNAPSHOT</version>

     </dependency>

     <dependency>

       <groupId>org.apache.felix</groupId>

       <artifactId>org.apache.felix.ipojo.handler.eventadmin</artifactId>

-      <version>${pom.version}</version>

+      <version>1.5.0-SNAPSHOT</version>

     </dependency>

-    

+

      <dependency>

       <groupId>org.apache.felix</groupId>

       <artifactId>org.apache.felix.eventadmin</artifactId>

       <version>1.0.0</version>

       <scope>test</scope>

     </dependency>

-    

+

   </dependencies>

 

   <build>

@@ -105,7 +105,7 @@
       <plugin>

         <groupId>org.apache.felix</groupId>

         <artifactId>maven-ipojo-plugin</artifactId>

-        <version>${pom.version}</version>

+        <version>1.6.0</version>

         <executions>

           <execution>

             <goals>

@@ -114,8 +114,8 @@
           </execution>

         </executions>

       </plugin>

-      

-      

+

+

        <plugin>

         <groupId>org.apache.felix</groupId>

         <artifactId>maven-junit4osgi-plugin</artifactId>