X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=shiro-osgi-bundle%2Fpom.xml;h=228ae3710043e9589c018cb8e71701336b6f9176;hb=refs%2Fheads%2Fmaster;hp=35596b5df341e5831aed23726b2b4d85150e92c1;hpb=85f33095c117ba5b361749746d564e6308a33f14;p=aaf%2Fcadi.git

diff --git a/shiro-osgi-bundle/pom.xml b/shiro-osgi-bundle/pom.xml
index 35596b5..228ae37 100644
--- 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.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>${project.version}</cadi.shiro.version>
 	</properties>
 
 	<build>
@@ -44,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,
@@ -60,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,
@@ -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>${project.version}</version>
-        </dependency>
+           <dependency>
+             <groupId>org.onap.aaf.cadi</groupId>
+             <artifactId>aaf-cadi-shiro</artifactId>
+             <version>${project.version}</version>
+           </dependency>
 	</dependencies>
 </project>