Fix version number consistently
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@790900 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/ipojo/tests/core/configuration/pom.xml b/ipojo/tests/core/configuration/pom.xml
index 7e1b757..f3ce81d 100644
--- a/ipojo/tests/core/configuration/pom.xml
+++ b/ipojo/tests/core/configuration/pom.xml
@@ -6,9 +6,9 @@
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
@@ -27,12 +27,12 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.metadata</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -77,7 +77,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-ipojo-plugin</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>${pom.version}</version>
<executions>
<execution>
<goals>
@@ -100,7 +100,7 @@
<!-- Test -->
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-junit4osgi-plugin
+ <artifactId>maven-junit4osgi-plugin
</artifactId>
<version>1.1.0-SNAPSHOT</version>
<executions>
diff --git a/ipojo/tests/core/configuration/src/main/resources/metadata.xml b/ipojo/tests/core/configuration/src/main/resources/metadata.xml
index 526dea9..e41d58a 100644
--- a/ipojo/tests/core/configuration/src/main/resources/metadata.xml
+++ b/ipojo/tests/core/configuration/src/main/resources/metadata.xml
@@ -1,5 +1,5 @@
<ipojo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="org.apache.felix.ipojo hhttp://felix.apache.org/ipojo/schemas/1.1.0-SNAPSHOT/core.xsd"
+ xsi:schemaLocation="org.apache.felix.ipojo http://people.apache.org/~clement/ipojo/SCHEMA-DEV/core.xsd"
xmlns="org.apache.felix.ipojo">
<component
classname="org.apache.felix.ipojo.test.scenarios.component.FooProviderTypeDyn"
@@ -14,7 +14,7 @@
<property name="intAProp" field="intAProp" value="{1,2, 3}" />
</properties>
</component>
-
+
<component
classname="org.apache.felix.ipojo.test.scenarios.component.FooProviderTypeDyn"
name="CONFIG-FooProviderType-ConfNoValue" architecture="true">
@@ -27,8 +27,8 @@
<property name="intAProp" field="intAProp"/>
</properties>
</component>
-
-
+
+
<component
classname="org.apache.felix.ipojo.test.scenarios.component.FooProviderType1"
name="CONFIG-FooProviderType-3" architecture="true">
@@ -147,7 +147,7 @@
type="java.lang.String[]" />
</properties>
</component>
-
+
<component
classname="org.apache.felix.ipojo.test.scenarios.component.FooProviderType1"
name="CONFIG-FooProviderType-4" architecture="true">
@@ -161,7 +161,7 @@
<property name="bar" field="m_bar" />
</properties>
</component>
-
+
<component
classname="org.apache.felix.ipojo.test.scenarios.component.ComplexConfiguration">
<provides>
@@ -186,7 +186,7 @@
<property name="dict" field="m_dict"/>
</properties>
</component>
-
+
<instance component="org.apache.felix.ipojo.test.scenarios.component.ComplexConfiguration" name="complex">
<property name="array" type="array">
<property value="a"/>
@@ -238,7 +238,7 @@
<property name="empty-list" type="list"/>
<property name="empty-map" type="map"/>
</instance>
-
+
<component classname="org.apache.felix.ipojo.test.scenarios.component.PropertyModifier">
<provides>
<property field="classes"/>
@@ -247,7 +247,7 @@
<property method="setClasses" name="cls"/>
</properties>
</component>
-
+
<!-- updated -->
<component
classname="org.apache.felix.ipojo.test.scenarios.component.FooProviderTypeDyn"
@@ -262,7 +262,7 @@
<property name="intAProp" field="intAProp" value="{1,2, 3}" />
</properties>
</component>
-
+
<component
classname="org.apache.felix.ipojo.test.scenarios.component.FooProviderTypeDyn"
name="CONFIG-FooProviderType-ConfNoValueUpdated" architecture="true">
@@ -275,7 +275,7 @@
<property name="intAProp" field="intAProp"/>
</properties>
</component>
-
+
<component
classname="org.apache.felix.ipojo.test.scenarios.component.FooProviderType1"
name="CONFIG-FooProviderType-4Updated" architecture="true">
@@ -289,7 +289,7 @@
<property name="bar" field="m_bar" />
</properties>
</component>
-
+
<component
classname="org.apache.felix.ipojo.test.scenarios.component.FooProviderType1"
name="CONFIG-FooProviderType-3Updated" architecture="true">
@@ -303,5 +303,5 @@
<property name="bar" field="m_bar" />
</properties>
</component>
-
+
</ipojo>