You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by lh...@apache.org on 2010/09/09 09:11:59 UTC
svn commit: r995338 - in /incubator/shiro/trunk: all/pom.xml core/pom.xml
pom.xml support/aspectj/pom.xml support/ehcache/pom.xml
support/quartz/pom.xml support/spring/pom.xml web/pom.xml
Author: lhazlewood
Date: Thu Sep 9 07:11:58 2010
New Revision: 995338
URL: http://svn.apache.org/viewvc?rev=995338&view=rev
Log:
SHIRO-189: Added OSGi manifest data via the maven-bundle-plugin for all distributable jars except for the 'all' .jar. Will discuss this last one on the dev list.
Modified:
incubator/shiro/trunk/all/pom.xml
incubator/shiro/trunk/core/pom.xml
incubator/shiro/trunk/pom.xml
incubator/shiro/trunk/support/aspectj/pom.xml
incubator/shiro/trunk/support/ehcache/pom.xml
incubator/shiro/trunk/support/quartz/pom.xml
incubator/shiro/trunk/support/spring/pom.xml
incubator/shiro/trunk/web/pom.xml
Modified: incubator/shiro/trunk/all/pom.xml
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/all/pom.xml?rev=995338&r1=995337&r2=995338&view=diff
==============================================================================
--- incubator/shiro/trunk/all/pom.xml (original)
+++ incubator/shiro/trunk/all/pom.xml Thu Sep 9 07:11:58 2010
@@ -17,7 +17,6 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-<!--suppress osmorcNonOsgiMavenDependency -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
Modified: incubator/shiro/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/core/pom.xml?rev=995338&r1=995337&r2=995338&view=diff
==============================================================================
--- incubator/shiro/trunk/core/pom.xml (original)
+++ incubator/shiro/trunk/core/pom.xml Thu Sep 9 07:11:58 2010
@@ -17,8 +17,8 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-<!--suppress osmorcNonOsgiMavenDependency -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.shiro</groupId>
@@ -29,11 +29,11 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>shiro-core</artifactId>
<name>Apache Shiro :: Core</name>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<build>
<plugins>
- <!-- bundle up the test classes to be referenced by other modules -->
+ <!-- collect the test classes so they can be referenced by other modules -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
@@ -45,6 +45,22 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>org.apache.shiro.core</Bundle-SymbolicName>
+ <Export-Package>org.apache.shiro*;version=${project.version}</Export-Package>
+ <Import-Package>
+ org.apache.shiro*;version="${shiro.osgi.importRange}",
+ org.apache.commons.beanutils*;resolution:=optional,
+ *
+ </Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
</plugins>
</build>
Modified: incubator/shiro/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/pom.xml?rev=995338&r1=995337&r2=995338&view=diff
==============================================================================
--- incubator/shiro/trunk/pom.xml (original)
+++ incubator/shiro/trunk/pom.xml Thu Sep 9 07:11:58 2010
@@ -17,7 +17,6 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-<!--suppress osmorcNonOsgiMavenDependency -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -64,6 +63,7 @@
</distributionManagement>
<properties>
+ <shiro.osgi.importRange>[1.1.0, 2.0.0)</shiro.osgi.importRange>
<jdk.version>1.5</jdk.version>
<slf4j.version>1.5.6</slf4j.version>
<hsqldb.version>1.8.0.7</hsqldb.version>
Modified: incubator/shiro/trunk/support/aspectj/pom.xml
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/support/aspectj/pom.xml?rev=995338&r1=995337&r2=995338&view=diff
==============================================================================
--- incubator/shiro/trunk/support/aspectj/pom.xml (original)
+++ incubator/shiro/trunk/support/aspectj/pom.xml Thu Sep 9 07:11:58 2010
@@ -28,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>shiro-aspectj</artifactId>
<name>Apache Shiro :: Support :: AspectJ</name>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<dependencies>
<dependency>
@@ -81,6 +81,22 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>org.apache.shiro.aspectj</Bundle-SymbolicName>
+ <Export-Package>org.apache.shiro.aspectj*;version=${project.version}</Export-Package>
+ <Import-Package>
+ org.apache.shiro*;version="${shiro.osgi.importRange}",
+ org.aspectj*;version="[1.6.0, 2.0.0)",
+ *
+ </Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
</plugins>
</build>
Modified: incubator/shiro/trunk/support/ehcache/pom.xml
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/support/ehcache/pom.xml?rev=995338&r1=995337&r2=995338&view=diff
==============================================================================
--- incubator/shiro/trunk/support/ehcache/pom.xml (original)
+++ incubator/shiro/trunk/support/ehcache/pom.xml Thu Sep 9 07:11:58 2010
@@ -17,7 +17,6 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-<!--suppress osmorcNonOsgiMavenDependency -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
@@ -29,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>shiro-ehcache</artifactId>
<name>Apache Shiro :: Support :: EHCache</name>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<dependencies>
<dependency>
@@ -55,4 +54,24 @@
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>org.apache.shiro.ehcache</Bundle-SymbolicName>
+ <Export-Package>org.apache.shiro.ehcache*;version=${project.version}</Export-Package>
+ <Import-Package>
+ org.apache.shiro*;version="${shiro.osgi.importRange}",
+ net.sf.ehcache*;version="[1.4.0, 2.0.0)",
+ *</Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: incubator/shiro/trunk/support/quartz/pom.xml
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/support/quartz/pom.xml?rev=995338&r1=995337&r2=995338&view=diff
==============================================================================
--- incubator/shiro/trunk/support/quartz/pom.xml (original)
+++ incubator/shiro/trunk/support/quartz/pom.xml Thu Sep 9 07:11:58 2010
@@ -17,7 +17,6 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-<!--suppress osmorcNonOsgiMavenDependency -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
@@ -29,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>shiro-quartz</artifactId>
<name>Apache Shiro :: Support :: Quartz</name>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<dependencies>
<dependency>
@@ -55,4 +54,25 @@
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>org.apache.shiro.quartz</Bundle-SymbolicName>
+ <Export-Package>org.apache.shiro.quartz*;version=${project.version}</Export-Package>
+ <Import-Package>
+ org.apache.shiro*;version="${shiro.osgi.importRange}",
+ org.quartz*;version="[1.5.0, 1.6.0)",
+ *
+ </Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: incubator/shiro/trunk/support/spring/pom.xml
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/support/spring/pom.xml?rev=995338&r1=995337&r2=995338&view=diff
==============================================================================
--- incubator/shiro/trunk/support/spring/pom.xml (original)
+++ incubator/shiro/trunk/support/spring/pom.xml Thu Sep 9 07:11:58 2010
@@ -17,7 +17,6 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-<!--suppress osmorcNonOsgiMavenDependency -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
@@ -29,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>shiro-spring</artifactId>
<name>Apache Shiro :: Support :: Spring</name>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<dependencies>
<dependency>
@@ -78,4 +77,26 @@
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>org.apache.shiro.spring</Bundle-SymbolicName>
+ <Export-Package>org.apache.shiro.spring*;version=${project.version}</Export-Package>
+ <Import-Package>
+ org.apache.shiro*;version="${shiro.osgi.importRange}",
+ org.aopalliance*;version="[1.0.0, 2.0.0)",
+ org.springframework*;version="[2.5.0, 4.0.0)",
+ *
+ </Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: incubator/shiro/trunk/web/pom.xml
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/web/pom.xml?rev=995338&r1=995337&r2=995338&view=diff
==============================================================================
--- incubator/shiro/trunk/web/pom.xml (original)
+++ incubator/shiro/trunk/web/pom.xml Thu Sep 9 07:11:58 2010
@@ -29,7 +29,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>shiro-web</artifactId>
<name>Apache Shiro :: Web</name>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<dependencies>
<dependency>
@@ -69,4 +69,21 @@
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>org.apache.shiro.web</Bundle-SymbolicName>
+ <Export-Package>org.apache.shiro.web*;version=${project.version}</Export-Package>
+ <Import-Package>org.apache.shiro*;version="${shiro.osgi.importRange}",*</Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>