felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fmesc...@apache.org
Subject svn commit: r1569365 - /felix/trunk/http/servlet-api/pom.xml
Date Tue, 18 Feb 2014 14:45:46 GMT
Author: fmeschbe
Date: Tue Feb 18 14:45:45 2014
New Revision: 1569365

URL: http://svn.apache.org/r1569365
Log:
FELIX-4427 Fix bundle generation

The exported packages have to be fully listed and then the bundle
plugin is actually able to export the same packages twice with
different versions

Modified:
    felix/trunk/http/servlet-api/pom.xml

Modified: felix/trunk/http/servlet-api/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/http/servlet-api/pom.xml?rev=1569365&r1=1569364&r2=1569365&view=diff
==============================================================================
--- felix/trunk/http/servlet-api/pom.xml (original)
+++ felix/trunk/http/servlet-api/pom.xml Tue Feb 18 14:45:45 2014
@@ -24,11 +24,7 @@
     <description>Provides the Servlet API for use by applications</description>
     <artifactId>org.apache.felix.http.servlet-api</artifactId>
     <version>0.0.1-SNAPSHOT</version>
-    <packaging>jar</packaging>
-
-    <properties>
-        <bundle_version>0.0.1.SNAPSHOT</bundle_version>
-    </properties>
+    <packaging>bundle</packaging>
 
     <scm>
         <connection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/http/servlet-api</connection>
@@ -39,76 +35,24 @@
     <build>
         <plugins>
             <plugin>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>unpack-dependencies</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>unpack-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <includeArtifactIds>tomcat-servlet-api</includeArtifactIds>
-                            <outputDirectory>${project.build.outputDirectory}</outputDirectory>
-                            <includes>
-                                javax/servlet/*.*,
-                                javax/servlet/annotation/*.*,
-                                javax/servlet/descriptor/*.*,
-                                javax/servlet/http/*.*
-                            </includes>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <artifactId>maven-jar-plugin</artifactId>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
                 <configuration>
-                    <archive>
-                        <manifest>
-                            <addDefaultImplementationEntries>false</addDefaultImplementationEntries>
-                            <addDefaultSpecificationEntries>false</addDefaultSpecificationEntries>
-                        </manifest>
-                        <manifestEntries>
-                            <Bundle-ManifestVersion> 2</Bundle-ManifestVersion>
-                            <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                            <Bundle-Version>${bundle_version}</Bundle-Version>
-                            <Bundle-Description>${project.description}</Bundle-Description>
-                            <Bundle-Name>${project.name}</Bundle-Name>
-                            <Bundle-Vendor>${project.organization.name}</Bundle-Vendor>
-                            <Bundle-License>${project.licenses[0].url}</Bundle-License>
-                            <Bundle-DocURL>http://felix.apache.org</Bundle-DocURL>
-
-                            <Export-Package>
-                                javax.servlet;uses:="javax.servlet.annotation,javax.servlet.descriptor";version="2.6",javax.servlet.descriptor;version="2.6",javax.servlet.annotation;uses:="javax.servlet";version="2.6",javax.servlet.http;uses:="javax.servlet";version="2.6",javax.servlet;uses:="javax.servlet.annotation,javax.servlet.descriptor";version="3.0",javax.servlet.descriptor;version="3.0",javax.servlet.annotation;uses:="javax.servlet";version="3.0",javax.servlet.http;uses:="javax.servlet";version="3.0"
-                            </Export-Package>
-                        </manifestEntries>
-
-                        <manifestSections>
-                            <manifestSection>
-                                <name>javax/servlet/</name>
-                                <manifestEntries>
-                                    <Specification-Title>
-                                        Java API for Servlets
-                                    </Specification-Title>
-                                    <Specification-Version>
-                                        3.0
-                                    </Specification-Version>
-                                    <Specification-Vendor>
-                                        Sun Microsystems, Inc.
-                                    </Specification-Vendor>
-                                    <Implementation-Title>
-                                        javax.servlet
-                                    </Implementation-Title>
-                                    <Implementation-Version>
-                                        3.0.FR
-                                    </Implementation-Version>
-                                    <Implementation-Vendor>
-                                        Apache Software Foundation
-                                    </Implementation-Vendor>
-                                </manifestEntries>
-                            </manifestSection>
-                        </manifestSections>
-                    </archive>
+                    <instructions>
+                        <Export-Package>
+                            javax.servlet;
+                            javax.servlet.annotation;
+                            javax.servlet.descriptor;
+                            javax.servlet.http;
+                                version=2.6,
+                            javax.servlet;
+                            javax.servlet.annotation;
+                            javax.servlet.descriptor;
+                            javax.servlet.http;
+                                version=3.0
+                        </Export-Package>
+                    </instructions>
                 </configuration>
             </plugin>
         </plugins>



Mime
View raw message