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/composite/pom.xml b/ipojo/composite/pom.xml
index 26c3d08..94e52f5 100644
--- a/ipojo/composite/pom.xml
+++ b/ipojo/composite/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
@@ -29,11 +29,11 @@
<artifactId>org.apache.felix.ipojo.composite</artifactId>
<groupId>org.apache.felix</groupId>
<version>1.3.0-SNAPSHOT</version>
-
+
<properties>
- <ipojo.package.version>1.2.0</ipojo.package.version>
+ <ipojo.package.version>1.4.0</ipojo.package.version>
</properties>
-
+
<dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -43,12 +43,12 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.manipulator</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>${pom.version}</version>
</dependency>
</dependencies>
<build>
@@ -63,36 +63,36 @@
<Bundle-Name>Apache Felix iPOJO Composite</Bundle-Name>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Bundle-Vendor> The Apache Software Foundation </Bundle-Vendor>
- <Bundle-Description> iPOJO Composititon Framework
+ <Bundle-Description> iPOJO Composititon Framework
</Bundle-Description>
<Bundle-DocURL>
- http://felix.apache.org/site/apache-felix-ipojo.html
+ http://felix.apache.org/site/apache-felix-ipojo.html
</Bundle-DocURL>
- <Import-Package>
+ <Import-Package>
org.apache.felix.ipojo,
org.apache.felix.ipojo.architecture,
- org.apache.felix.ipojo.context,
+ org.apache.felix.ipojo.context,
org.apache.felix.ipojo.metadata,
- org.apache.felix.ipojo.parser,
+ org.apache.felix.ipojo.parser,
org.apache.felix.ipojo.util,
org.osgi.framework;version=1.3 </Import-Package>
- <Private-Package>
+ <Private-Package>
org.apache.felix.ipojo.composite.architecture,
org.apache.felix.ipojo.composite.service*,
org.apache.felix.ipojo.composite.instance,
org.apache.felix.ipojo.composite.util
</Private-Package>
- <Export-Package>
+ <Export-Package>
org.apache.felix.ipojo.composite; version="${ipojo.package.version}" ,
!org.objectweb.asm.xml*,
org.objectweb.asm*;-split-package:=merge-first ,
org.apache.felix.ipojo.manipulation
</Export-Package>
<Include-Resource> META-INF/LICENSE=LICENSE,
- META-INF/NOTICE=NOTICE, META-INF/LICENSE.asm=LICENSE.asm
+ META-INF/NOTICE=NOTICE, META-INF/LICENSE.asm=LICENSE.asm
</Include-Resource>
<IPOJO-Extension>
- composite:org.apache.felix.ipojo.composite.CompositeFactory
+ composite:org.apache.felix.ipojo.composite.CompositeFactory
</IPOJO-Extension>
<_donotcopy> (CVS|.svn|.+.bak|~.+|metadata.xml) </_donotcopy>
</instructions>
@@ -101,7 +101,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>