Prepare for release 2.1.19

[aaf/cadi.git] / shiro-osgi-bundle / pom.xml

diff --git a/shiro-osgi-bundle/pom.xml b/shiro-osgi-bundle/pom.xml
index a73d567..228ae37 100644 (file)
--- a/shiro-osgi-bundle/pom.xml
+++ b/shiro-osgi-bundle/pom.xml
@@ -19,22 +19,20 @@
     * -->
 <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/xsd/maven-4.0.0.xsd">
-
        <parent>
                <groupId>org.onap.aaf.cadi</groupId>
-               <artifactId>cadimiscparent</artifactId>
-               <version>2.1.2-SNAPSHOT</version>
+               <artifactId>parent</artifactId>
+               <version>2.1.19-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
-       <modelVersion>4.0.0</modelVersion>
 
-       <name>AAF Shiro CADI Plugin</name>
+       <modelVersion>4.0.0</modelVersion>
+       <name>Shiro OSGI CADI Plugin</name>
        <artifactId>aaf-shiro-aafrealm-osgi-bundle</artifactId>
        <packaging>bundle</packaging>
 
        <properties>
            <sonar.skip>true</sonar.skip>
-           <cadi.shiro.version>2.1.1</cadi.shiro.version>
        </properties>
 
        <build>
@@ -42,14 +40,14 @@
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
-                               <version>2.5.4</version>
+                               <version>4.2.1</version>
                                <extensions>true</extensions>
                                <configuration>
                                        <instructions>
                                                <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                                                <Bundle-Version>${project.version}</Bundle-Version>
                                                <Export-Package>
-                                                       org.onap.aaf.cadi.shiro*;version=${cadi.shiro.version}
+                                                       org.onap.aaf.cadi.shiro*;version=${project.version}
                                                </Export-Package>
                                                <Import-Package>
                                                        javax.servlet,
@@ -58,10 +56,12 @@
                                                        javax.net.ssl,
                                                        javax.crypto,
                                                        javax.crypto.spec,
-                                                       javax.xml.bind.annotation,
-                                                       javax.xml.bind,
+                                                       javax.xml.bind.annotation;version="[2.0,3)",
+                                                       javax.xml.bind;version="[2.0,3)",
                                                        javax.xml.transform,
                                                        javax.xml.datatype,
+                                                       javax.ws.rs,
+                                                       javax.xml.ws,
                                                        javax.management,
                                                        javax.security.auth,
                                                        javax.security.auth.login,
@@ -71,7 +71,8 @@
                                                        javax.xml.namespace,
                                                        org.w3c.dom,
                                                        org.xml.sax,
-                                                       javax.xml.transform.stream
+                                                       javax.xml.transform.stream,
+                                                       org.apache.log4j
                                                </Import-Package>
                                                <Embed-Dependency>*;scope=compile|runtime;inline=false</Embed-Dependency>
                                                <!-- <Embed-Dependency>*;scope=compile|runtime;artifactId=!shiro-core;inline=false</Embed-Dependency> -->
@@ -86,10 +87,10 @@
        </build>
 
        <dependencies>
-               <dependency>
-           <groupId>org.onap.aaf.authz</groupId>
-           <artifactId>aaf-cadi-shiro</artifactId>
-          <version>2.1.1</version>
-        </dependency>
+           <dependency>
+             <groupId>org.onap.aaf.cadi</groupId>
+             <artifactId>aaf-cadi-shiro</artifactId>
+             <version>${project.version}</version>
+           </dependency>
        </dependencies>
 </project>