Updated parent POM to include "deploymentadmin" module
Fixed version number for org.osgi.foundation
FELIX-510: Corrected POM for deploymentadmin and updated svn:ignore
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@633786 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/deploymentadmin/pom.xml b/deploymentadmin/pom.xml
index b9b5123..0b3d90d 100644
--- a/deploymentadmin/pom.xml
+++ b/deploymentadmin/pom.xml
@@ -21,31 +21,31 @@
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.2</version>
<relativePath>../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging>
<name>Apache Felix Deployment Admin</name>
- <version>1.0.0-SNAPSHOT</version>
+ <version>0.9.0-SNAPSHOT</version>
<artifactId>org.apache.felix.deploymentadmin</artifactId>
<dependencies>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>org.apache.felix.dependencymanager</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
@@ -54,7 +54,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.4.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -64,7 +64,7 @@
<Bundle-Description>A bundle that implements the Deployment Admin.</Bundle-Description>
<Bundle-Vendor>Apache Software Foundation</Bundle-Vendor>
<Private-Package>org.apache.felix.deploymentadmin.spi</Private-Package>
- <Export-Package>org.apache.felix.deploymentadmin,org.osgi.service.deploymentadmin</Export-Package>
+ <Export-Package>org.apache.felix.deploymentadmin,org.osgi.service.deploymentadmin.*;version="1.0.0"</Export-Package>
</instructions>
</configuration>
</plugin>
diff --git a/org.osgi.foundation/pom.xml b/org.osgi.foundation/pom.xml
index e007624..f2d4614 100644
--- a/org.osgi.foundation/pom.xml
+++ b/org.osgi.foundation/pom.xml
@@ -30,5 +30,5 @@
<modelVersion>4.0.0</modelVersion>
<name>OSGi R4 Foundation EE</name>
<artifactId>org.osgi.foundation</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
</project>
diff --git a/pom/pom.xml b/pom/pom.xml
index 49f6b50..27fca52 100644
--- a/pom/pom.xml
+++ b/pom/pom.xml
@@ -143,6 +143,7 @@
<module>../configadmin</module>
<module>../metatype</module>
<module>../dependencymanager</module>
+ <module>../deploymentadmin</module>
<module>../servicebinder</module>
<module>../wireadmin</module>
<module>../prefs</module>