You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ri...@apache.org on 2010/04/09 19:46:19 UTC
svn commit: r932527 - /geronimo/specs/trunk/geronimo-servlet_3.0_spec/pom.xml
Author: rickmcguire
Date: Fri Apr 9 17:46:19 2010
New Revision: 932527
URL: http://svn.apache.org/viewvc?rev=932527&view=rev
Log:
fix exports for servlet so Geronimo will build
Modified:
geronimo/specs/trunk/geronimo-servlet_3.0_spec/pom.xml
Modified: geronimo/specs/trunk/geronimo-servlet_3.0_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-servlet_3.0_spec/pom.xml?rev=932527&r1=932526&r2=932527&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_3.0_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-servlet_3.0_spec/pom.xml Fri Apr 9 17:46:19 2010
@@ -64,7 +64,29 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Export-Package>javax.servlet*;version=3.0</Export-Package>
+ <!-- The OSGi Alliance defined package numbers don't match up
+ necessarily with the Java EE versions. Servlet 3.0 needs to
+ be exported as 2.6 -->
+ <Export-Package>
+ javax.servlet;version=2.6,
+ javax.servlet.annotation;version=2.6,
+ javax.servlet.descriptor;version=2.6,
+ javax.servlet.http;version=2.6,
+ javax.servlet.resources;version=2.6,
+ javax.servlet;version=3.0,
+ javax.servlet.annotation;version=3.0,
+ javax.servlet.descriptor;version=3.0,
+ javax.servlet.http;version=3.0,
+ javax.servlet.resources;version=3.0,
+ </Export-Package>
+ <!-- Because of the duplicate exports, explicit imports are required -->
+ <Import-Package>
+ javax.servlet;version=2.6,
+ javax.servlet.annotation;version=2.6,
+ javax.servlet.descriptor;version=2.6,
+ javax.servlet.http;version=2.6,
+ javax.servlet.resources;version=2.6,
+ </Import-Package>
</instructions>
</configuration>
</plugin>