You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by le...@apache.org on 2008/03/05 09:21:07 UTC
svn commit: r633786 - in /felix/trunk: deploymentadmin/
deploymentadmin/pom.xml org.osgi.foundation/pom.xml pom/pom.xml
Author: lenzi
Date: Wed Mar 5 00:21:06 2008
New Revision: 633786
URL: http://svn.apache.org/viewvc?rev=633786&view=rev
Log:
Updated parent POM to include "deploymentadmin" module
Fixed version number for org.osgi.foundation
FELIX-510: Corrected POM for deploymentadmin and updated svn:ignore
Modified:
felix/trunk/deploymentadmin/ (props changed)
felix/trunk/deploymentadmin/pom.xml
felix/trunk/org.osgi.foundation/pom.xml
felix/trunk/pom/pom.xml
Propchange: felix/trunk/deploymentadmin/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Mar 5 00:21:06 2008
@@ -1,3 +1,20 @@
+.settings
+.classpath
+.project
+bin
+build
+target
+classes
+.wtpmodules
+.deployables
+*.iml
+*.ipr
+*.iws
+*.log
+lib
+bundle
+dist
+
*.patch
.externalToolBuilders
maven-eclipse.xml
Modified: felix/trunk/deploymentadmin/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/deploymentadmin/pom.xml?rev=633786&r1=633785&r2=633786&view=diff
==============================================================================
--- felix/trunk/deploymentadmin/pom.xml (original)
+++ felix/trunk/deploymentadmin/pom.xml Wed Mar 5 00:21:06 2008
@@ -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>
Modified: felix/trunk/org.osgi.foundation/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/org.osgi.foundation/pom.xml?rev=633786&r1=633785&r2=633786&view=diff
==============================================================================
--- felix/trunk/org.osgi.foundation/pom.xml (original)
+++ felix/trunk/org.osgi.foundation/pom.xml Wed Mar 5 00:21:06 2008
@@ -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>
Modified: felix/trunk/pom/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/pom/pom.xml?rev=633786&r1=633785&r2=633786&view=diff
==============================================================================
--- felix/trunk/pom/pom.xml (original)
+++ felix/trunk/pom/pom.xml Wed Mar 5 00:21:06 2008
@@ -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>