You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by st...@apache.org on 2016/09/23 13:32:22 UTC
svn commit: r1762062 - in /openwebbeans/trunk: pom.xml webbeans-el22/pom.xml
webbeans-impl/pom.xml webbeans-jsf/pom.xml webbeans-osgi/pom.xml
webbeans-spi/pom.xml webbeans-web/pom.xml
Author: struberg
Date: Fri Sep 23 13:32:22 2016
New Revision: 1762062
URL: http://svn.apache.org/viewvc?rev=1762062&view=rev
Log:
OWB-1150 improve OSGi imports
Txs to Moritz Bechler (mbechler) for the patch!
Modified:
openwebbeans/trunk/pom.xml
openwebbeans/trunk/webbeans-el22/pom.xml
openwebbeans/trunk/webbeans-impl/pom.xml
openwebbeans/trunk/webbeans-jsf/pom.xml
openwebbeans/trunk/webbeans-osgi/pom.xml
openwebbeans/trunk/webbeans-spi/pom.xml
openwebbeans/trunk/webbeans-web/pom.xml
Modified: openwebbeans/trunk/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/pom.xml?rev=1762062&r1=1762061&r2=1762062&view=diff
==============================================================================
--- openwebbeans/trunk/pom.xml (original)
+++ openwebbeans/trunk/pom.xml Fri Sep 23 13:32:22 2016
@@ -82,6 +82,9 @@
<arquillian.version>1.1.7.Final</arquillian.version>
<cdi.tck.version>1.2.8.Final</cdi.tck.version>
<httpclient.version>4.5.2</httpclient.version>
+ <osgi.servlet.range>[2.4,)</osgi.servlet.range>
+ <osgi.el.range>[2.2,)</osgi.el.range>
+ <osgi.faces.range>[2.0,)</osgi.faces.range>
</properties>
<mailingLists>
Modified: openwebbeans/trunk/webbeans-el22/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-el22/pom.xml?rev=1762062&r1=1762061&r2=1762062&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-el22/pom.xml (original)
+++ openwebbeans/trunk/webbeans-el22/pom.xml Fri Sep 23 13:32:22 2016
@@ -91,18 +91,9 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
- <supportedProjectTypes>
- <supportedProjectType>jar</supportedProjectType>
- <supportedProjectType>bundle</supportedProjectType>
- <supportedProjectType>war</supportedProjectType>
- </supportedProjectTypes>
<instructions>
- <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
- <Bundle-Version>${project.version}</Bundle-Version>
- <Export-Package>!org.apache.webbeans.internal.*,org.apache.webbeans.*;version="${project.version}"</Export-Package>
- <Private-Package>org.apache.webbeans.internal.*</Private-Package>
<Import-Package>
- javax.el.*;version="[2.2,)",
+ javax.el.*;version="${osgi.el.range}",
*
</Import-Package>
</instructions>
Modified: openwebbeans/trunk/webbeans-impl/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/pom.xml?rev=1762062&r1=1762061&r2=1762062&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/pom.xml (original)
+++ openwebbeans/trunk/webbeans-impl/pom.xml Fri Sep 23 13:32:22 2016
@@ -105,23 +105,14 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
- <supportedProjectTypes>
- <supportedProjectType>jar</supportedProjectType>
- <supportedProjectType>bundle</supportedProjectType>
- <supportedProjectType>war</supportedProjectType>
- </supportedProjectTypes>
<instructions>
- <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
- <Bundle-Version>${project.version}</Bundle-Version>
- <Export-Package>!org.apache.webbeans.internal.*,org.apache.webbeans.*;version="${project.version}"</Export-Package>
- <Private-Package>org.apache.webbeans.internal.*</Private-Package>
<Import-Package>
javax.annotation.*;version="[1.2,)",
javax.inject.*;version="[1.0,)",
javax.decorator.*;version="[1.1,1.2]",
javax.enterprise.*;version="[1.1,1.2]",
javax.interceptor.*;version="[1.2,)",
- javax.el.*;version="[2.2,)",
+ javax.el.*;version="${osgi.el.range}",
*
</Import-Package>
</instructions>
Modified: openwebbeans/trunk/webbeans-jsf/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-jsf/pom.xml?rev=1762062&r1=1762061&r2=1762062&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-jsf/pom.xml (original)
+++ openwebbeans/trunk/webbeans-jsf/pom.xml Fri Sep 23 13:32:22 2016
@@ -85,22 +85,12 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
-
<configuration>
- <supportedProjectTypes>
- <supportedProjectType>jar</supportedProjectType>
- <supportedProjectType>bundle</supportedProjectType>
- <supportedProjectType>war</supportedProjectType>
- </supportedProjectTypes>
<instructions>
- <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
- <Bundle-Version>${project.version}</Bundle-Version>
- <Export-Package>!org.apache.webbeans.internal.*,org.apache.webbeans.*;version="${project.version}"</Export-Package>
- <Private-Package>org.apache.webbeans.internal.*</Private-Package>
<Import-Package>
- javax.servlet.*;version="[2.4,)",
- javax.el.*;version="[2.2,)",
- javax.faces.*;version="[2.0,)",
+ javax.servlet.*;version="${osgi.servlet.range}",
+ javax.el.*;version="${osgi.el.range}",
+ javax.faces.*;version="${osgi.faces.range}",
*
</Import-Package>
</instructions>
Modified: openwebbeans/trunk/webbeans-osgi/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-osgi/pom.xml?rev=1762062&r1=1762061&r2=1762062&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-osgi/pom.xml (original)
+++ openwebbeans/trunk/webbeans-osgi/pom.xml Fri Sep 23 13:32:22 2016
@@ -73,4 +73,21 @@
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Import-Package>
+ javax.servlet.*;version="${osgi.servlet.range}",
+ *
+ </Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+
+ </plugins>
+ </build>
</project>
Modified: openwebbeans/trunk/webbeans-spi/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-spi/pom.xml?rev=1762062&r1=1762061&r2=1762062&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-spi/pom.xml (original)
+++ openwebbeans/trunk/webbeans-spi/pom.xml Fri Sep 23 13:32:22 2016
@@ -53,4 +53,20 @@
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Import-Package>
+ javax.el.*;version="${osgi.el.range}";resolution:=optional,
+ *
+ </Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: openwebbeans/trunk/webbeans-web/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/pom.xml?rev=1762062&r1=1762061&r2=1762062&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-web/pom.xml (original)
+++ openwebbeans/trunk/webbeans-web/pom.xml Fri Sep 23 13:32:22 2016
@@ -118,19 +118,10 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
- <supportedProjectTypes>
- <supportedProjectType>jar</supportedProjectType>
- <supportedProjectType>bundle</supportedProjectType>
- <supportedProjectType>war</supportedProjectType>
- </supportedProjectTypes>
<instructions>
- <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
- <Bundle-Version>${project.version}</Bundle-Version>
- <Export-Package>!org.apache.webbeans.internal.*,org.apache.webbeans.*;version="${project.version}"</Export-Package>
- <Private-Package>org.apache.webbeans.internal.*</Private-Package>
<Import-Package>
- javax.servlet.*;version="[2.4,)",
- javax.el.*;version="[2.2,)",
+ javax.servlet.*;version="${osgi.servlet.range}",
+ javax.el.*;version="${osgi.el.range}",
*
</Import-Package>
</instructions>