Author: struberg Date: Thu Sep 22 21:32:01 2016 New Revision: 1762001 URL: http://svn.apache.org/viewvc?rev=1762001&view=rev Log: OWB-1150 trying to fix some OSGi import ranges
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-web/pom.xml Modified: openwebbeans/trunk/pom.xml URL: http://svn.apache.org/viewvc/openwebbeans/trunk/pom.xml?rev=1762001&r1=1762000&r2=1762001&view=diff ============================================================================== --- openwebbeans/trunk/pom.xml (original) +++ openwebbeans/trunk/pom.xml Thu Sep 22 21:32:01 2016 @@ -278,6 +278,21 @@ <artifactId>maven-jar-plugin</artifactId> <version>2.6</version> </plugin> + + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>3.0.1</version> + <executions> + <execution> + <id>bundle-manifest</id> + <phase>process-classes</phase> + <goals> + <goal>manifest</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </pluginManagement> @@ -315,16 +330,6 @@ <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> - <version>3.0.1</version> - <executions> - <execution> - <id>bundle-manifest</id> - <phase>process-classes</phase> - <goals> - <goal>manifest</goal> - </goals> - </execution> - </executions> <configuration> <supportedProjectTypes> <supportedProjectType>jar</supportedProjectType> Modified: openwebbeans/trunk/webbeans-el22/pom.xml URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-el22/pom.xml?rev=1762001&r1=1762000&r2=1762001&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-el22/pom.xml (original) +++ openwebbeans/trunk/webbeans-el22/pom.xml Thu Sep 22 21:32:01 2016 @@ -84,4 +84,32 @@ </dependencies> + <build> + <plugins> + <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.el.*;version="[2.2,)", + * + </Import-Package> + </instructions> + </configuration> + </plugin> + + </plugins> + </build> + </project> Modified: openwebbeans/trunk/webbeans-impl/pom.xml URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/pom.xml?rev=1762001&r1=1762000&r2=1762001&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/pom.xml (original) +++ openwebbeans/trunk/webbeans-impl/pom.xml Thu Sep 22 21:32:01 2016 @@ -100,7 +100,32 @@ </execution> </executions> </plugin> - + + <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.decorator.*;version="[1.1,1.2]", + javax.enterprise.*;version="[1.1,1.2]", + javax.el.*;version="[2.2,)", + * + </Import-Package> + </instructions> + </configuration> + </plugin> + + </plugins> </build> Modified: openwebbeans/trunk/webbeans-jsf/pom.xml URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-jsf/pom.xml?rev=1762001&r1=1762000&r2=1762001&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-jsf/pom.xml (original) +++ openwebbeans/trunk/webbeans-jsf/pom.xml Thu Sep 22 21:32:01 2016 @@ -85,16 +85,7 @@ <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> - <version>2.1.0</version> - <executions> - <execution> - <id>bundle-manifest</id> - <phase>process-classes</phase> - <goals> - <goal>manifest</goal> - </goals> - </execution> - </executions> + <configuration> <supportedProjectTypes> <supportedProjectType>jar</supportedProjectType> @@ -107,6 +98,9 @@ <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,)", * </Import-Package> </instructions> Modified: openwebbeans/trunk/webbeans-web/pom.xml URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/pom.xml?rev=1762001&r1=1762000&r2=1762001&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-web/pom.xml (original) +++ openwebbeans/trunk/webbeans-web/pom.xml Thu Sep 22 21:32:01 2016 @@ -112,6 +112,34 @@ </dependencies> + <build> + <plugins> + <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,)", + * + </Import-Package> + </instructions> + </configuration> + </plugin> + + </plugins> + </build> + <profiles> <profile>