You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by fp...@apache.org on 2019/01/22 06:08:44 UTC

[shiro] branch master updated: [SHIRO-650] Shiro JAX-RS is not an OSGi bundle

This is an automated email from the ASF dual-hosted git repository.

fpapon pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shiro.git


The following commit(s) were added to refs/heads/master by this push:
     new 234ee76  [SHIRO-650] Shiro JAX-RS is not an OSGi bundle
     new 3a95242  Merge pull request #113 from fpapon/SHIRO-650
234ee76 is described below

commit 234ee768a3f2b36b5a1be78001317f9e976bffd4
Author: Francois Papon <fp...@apache.org>
AuthorDate: Tue Jan 22 09:00:08 2019 +0400

    [SHIRO-650] Shiro JAX-RS is not an OSGi bundle
---
 support/jaxrs/pom.xml | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/support/jaxrs/pom.xml b/support/jaxrs/pom.xml
index 8747f74..c6b82c1 100644
--- a/support/jaxrs/pom.xml
+++ b/support/jaxrs/pom.xml
@@ -23,12 +23,13 @@
         <groupId>org.apache.shiro</groupId>
         <artifactId>shiro-support</artifactId>
         <version>1.4.1-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>shiro-jaxrs</artifactId>
     <name>Apache Shiro :: Support :: JAX-RS</name>
-    <packaging>jar</packaging>
+    <packaging>bundle</packaging>
 
 
     <dependencies>
@@ -57,5 +58,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.web.jaxrs</Bundle-SymbolicName>
+                        <Export-Package>org.apache.shiro.web.jaxrs*;version=${project.version}</Export-Package>
+                        <Import-Package>
+                            org.apache.shiro*;version="${shiro.osgi.importRange}",
+                            *
+                        </Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>