Add Multi-Realm class handling

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

diff --git a/shiro-osgi-bundle/pom.xml b/shiro-osgi-bundle/pom.xml
index 04d8764..7d90542 100644 (file)
--- a/shiro-osgi-bundle/pom.xml
+++ b/shiro-osgi-bundle/pom.xml
@@ -1,42 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
- * ============LICENSE_START====================================================
- * org.onap.aaf
- * ===========================================================================
- * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
- * ===========================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END====================================================
- *
--->
+<!--* ============LICENSE_START==================================================== 
+    * =========================================================================== 
+    * org.onap.aaf 
+    * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. 
+    * =========================================================================== 
+    * Licensed under the Apache License, Version 2.0 (the "License"); 
+    * you may not use this file except in compliance with the License. 
+    * You may obtain a copy of the License at 
+    * 
+    * http://www.apache.org/licenses/LICENSE-2.0 
+    * 
+    * Unless required by applicable law or agreed to in writing, software 
+    * distributed under the License is distributed on an "AS IS" BASIS, 
+    * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+    * See the License for the specific language governing permissions and 
+    * limitations under the License. 
+    * ============LICENSE_END==================================================== 
+    * -->
 <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.13-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>
@@ -51,7 +47,7 @@
                                                <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,
@@ -64,6 +60,8 @@
                                                        javax.xml.bind,
                                                        javax.xml.transform,
                                                        javax.xml.datatype,
+                                                       javax.ws.rs,
+                                                       javax.xml.ws,
                                                        javax.management,
                                                        javax.security.auth,
                                                        javax.security.auth.login,
@@ -73,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> -->
@@ -88,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>