felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fmesc...@apache.org
Subject svn commit: r523603 - /incubator/felix/trunk/scr/pom.xml
Date Thu, 29 Mar 2007 07:43:19 GMT
Author: fmeschbe
Date: Thu Mar 29 00:43:17 2007
New Revision: 523603

URL: http://svn.apache.org/viewvc?view=rev&rev=523603
Log:
FELIX-258 Update pom to use new bundle plugin

Modified:
    incubator/felix/trunk/scr/pom.xml

Modified: incubator/felix/trunk/scr/pom.xml
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/scr/pom.xml?view=diff&rev=523603&r1=523602&r2=523603
==============================================================================
--- incubator/felix/trunk/scr/pom.xml (original)
+++ incubator/felix/trunk/scr/pom.xml Thu Mar 29 00:43:17 2007
@@ -5,52 +5,49 @@
     <version>0.9.0-incubator-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <packaging>osgi-bundle</packaging>
+  <packaging>bundle</packaging>
   <name>Apache Felix Declarative Services</name>
+  <description>Implementation of the Declarative Services specification 1.0</description>
   <artifactId>org.apache.felix.scr</artifactId>
   <dependencies>
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.osgi.core</artifactId>
       <version>${pom.version}</version>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.osgi.compendium</artifactId>
       <version>${pom.version}</version>
-      <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>kxml2</groupId>
+      <groupId>net.sf.kxml</groupId>
       <artifactId>kxml2</artifactId>
       <version>2.2.2</version>
-    </dependency>  </dependencies>
+    </dependency>
+  </dependencies>
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.felix.plugins</groupId>
-        <artifactId>maven-osgi-plugin</artifactId>
-        <version>${pom.version}</version>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
         <extensions>true</extensions>
         <configuration>
-          <osgiManifest>
-            <bundleName>Service Component Runtime</bundleName>
-            <bundleVendor>Apache Software Foundation</bundleVendor>
-            <bundleDescription>
-              Implementation of the Declarative Services specification.
-            </bundleDescription>
-            <bundleActivator>
+          <instructions>
+            <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
+            <Bundle-Vendor>Apache Software Foundation</Bundle-Vendor>
+            <Bundle-Activator>
               org.apache.felix.scr.Activator
-            </bundleActivator>
-            <bundleSymbolicName>org.apache.felix.scr</bundleSymbolicName>
-            <exportPackage>
-              org.apache.felix.scr
-            </exportPackage>
-            <importPackage>
-              org.osgi.service.log, org.osgi.service.component, org.osgi.framework
-            </importPackage>			
-          </osgiManifest>
+            </Bundle-Activator>
+            <Export-Package>
+                org.osgi.service.component; version=1.0
+            </Export-Package>
+            <Private-Package>
+              org.apache.felix.scr.*,
+              org.kxml2.io,
+              org.xmlpull.v1
+            </Private-Package>
+          </instructions>
         </configuration>
       </plugin>
     </plugins>



Mime
View raw message