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/composite/service-providing/pom.xml b/ipojo/tests/composite/service-providing/pom.xml
index 7851282..35d970a 100644
--- a/ipojo/tests/composite/service-providing/pom.xml
+++ b/ipojo/tests/composite/service-providing/pom.xml
@@ -27,17 +27,17 @@
 		<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.composite</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>

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

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

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

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

+				<version>1.6.0</version>

 				<executions>

 					<execution>

 						<goals>