Author: jboynes
Date: Sun Oct 31 15:44:45 2010
New Revision: 1029387
URL: http://svn.apache.org/viewvc?rev=1029387&view=rev
Log:
Apply patch from Rex Wang for creating OSGi bundle bug #50064
Modified:
tomcat/taglibs/standard/trunk/compat/pom.xml
tomcat/taglibs/standard/trunk/impl/pom.xml
tomcat/taglibs/standard/trunk/jstlel/pom.xml
tomcat/taglibs/standard/trunk/spec/pom.xml
Modified: tomcat/taglibs/standard/trunk/compat/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/compat/pom.xml?rev=1029387&r1=1029386&r2=1029387&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/compat/pom.xml (original)
+++ tomcat/taglibs/standard/trunk/compat/pom.xml Sun Oct 31 15:44:45 2010
@@ -32,6 +32,8 @@
<artifactId>taglibs-standard-compat</artifactId>
<version>1.2-SNAPSHOT</version>
+ <packaging>bundle</packaging>
+
<name>Apache Standard Taglib - JSTL 1.0 Compatibility</name>
<inceptionYear>2001</inceptionYear>
@@ -123,6 +125,22 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <excludeDependencies>true</excludeDependencies>
+ <instructions>
+ <Export-Package>*;version="1.2"</Export-Package>
+
<Import-Package>org.apache.x*;resolution:=optional,*</Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
<reporting>
<plugins>
<plugin>
Modified: tomcat/taglibs/standard/trunk/impl/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/pom.xml?rev=1029387&r1=1029386&r2=1029387&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/pom.xml (original)
+++ tomcat/taglibs/standard/trunk/impl/pom.xml Sun Oct 31 15:44:45 2010
@@ -32,6 +32,8 @@
<artifactId>taglibs-standard-impl</artifactId>
<version>1.2-SNAPSHOT</version>
+ <packaging>bundle</packaging>
+
<name>Apache Standard Taglib - JSTL Implementation</name>
<inceptionYear>2001</inceptionYear>
@@ -118,7 +120,23 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>
-
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <excludeDependencies>true</excludeDependencies>
+ <instructions>
+ <Export-Package>*;version="1.2"</Export-Package>
+
<Import-Package>org.apache.x*;resolution:=optional,*</Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
<reporting>
<plugins>
<plugin>
Modified: tomcat/taglibs/standard/trunk/jstlel/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/jstlel/pom.xml?rev=1029387&r1=1029386&r2=1029387&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/jstlel/pom.xml (original)
+++ tomcat/taglibs/standard/trunk/jstlel/pom.xml Sun Oct 31 15:44:45 2010
@@ -32,6 +32,8 @@
<artifactId>taglibs-standard-jstlel</artifactId>
<version>1.2-SNAPSHOT</version>
+ <packaging>bundle</packaging>
+
<name>Apache Standard Taglib - JSTL 1.0 EL Support</name>
<inceptionYear>2001</inceptionYear>
@@ -123,6 +125,22 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <excludeDependencies>true</excludeDependencies>
+ <instructions>
+ <Export-Package>*;version="1.2"</Export-Package>
+
<Import-Package>org.apache.x*;resolution:=optional,*</Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
<reporting>
<plugins>
<plugin>
Modified: tomcat/taglibs/standard/trunk/spec/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/spec/pom.xml?rev=1029387&r1=1029386&r2=1029387&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/spec/pom.xml (original)
+++ tomcat/taglibs/standard/trunk/spec/pom.xml Sun Oct 31 15:44:45 2010
@@ -28,6 +28,8 @@
<artifactId>taglibs-standard-spec</artifactId>
<version>1.2-SNAPSHOT</version>
+ <packaging>bundle</packaging>
+
<name>Apache Standard Taglib - JSTL Specification API</name>
<inceptionYear>2001</inceptionYear>
@@ -83,5 +85,22 @@
<scope>provided</scope>
</dependency>
</dependencies>
-
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+
<Bundle-SymbolicName>${groupId}.${artifactId};singleton=true</Bundle-SymbolicName>
+ <Specification-Title>JSR-052 JavaServer Pages Standard Tag Library
Specification</Specification-Title>
+ <Specification-Vendor>Sun Microsystems, Inc.</Specification-Vendor>
+ <Specification-Version>1.2</Specification-Version>
+
<Export-Package>javax.servlet.jsp.jstl*;version=1.2</Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
