X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=appc-adapters%2Fappc-rest-adapter%2Fappc-rest-adapter-bundle%2Fpom.xml;h=ce2894ab84a5b4598286af4e6b18944919149555;hb=32eeb6048b6fbf61f9326207c14e3aeb1c347668;hp=29dc9820a8f4e5962bc010b396f8c56f8d8bb4ca;hpb=6536799456cd99ee80d6a7ce0621fb8539df7a81;p=appc.git

diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/pom.xml b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/pom.xml
index 29dc9820a..ce2894ab8 100644
--- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/pom.xml
+++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/pom.xml
@@ -1,12 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ============LICENSE_START=======================================================
+  ONAP : APPC
+  ================================================================================
+  Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
+  Copyright (C) 2017 Amdocs
+  ================================================================================
+  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">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.openecomp.appc</groupId>
-		<artifactId>appc-rest-adapter</artifactId>
-		<version>1.3.0-SNAPSHOT</version>
+		<groupId>org.onap.appc.parent</groupId>
+		<artifactId>binding-parent</artifactId>
+		<version>2.6.0-SNAPSHOT</version>
+                <relativePath />
 	</parent>
 
+        <groupId>org.onap.appc</groupId>
 	<artifactId>appc-rest-adapter-bundle</artifactId>
 	<packaging>bundle</packaging>
 	<name>rest Adapter - bundle</name>
@@ -23,24 +45,9 @@
 			<version>4.4.4</version>
 		</dependency>
 		<dependency>
-			<groupId>org.bouncycastle</groupId>
-			<artifactId>bcpkix-jdk15on</artifactId>
-			</dependency>
-		<dependency>
-			<groupId>org.bouncycastle</groupId>
-			<artifactId>bcprov-jdk15on</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.openecomp.appc</groupId>
-			<artifactId>appc-common</artifactId>
+			<groupId>org.onap.appc</groupId>
+			<artifactId>appc-common-bundle</artifactId>
 			<version>${project.version}</version>
-		</dependency>
-			<dependency>
-			<groupId>org.openecomp.appc</groupId>
-			<artifactId>appc-common</artifactId>
-			<version>${project.version}</version>
-			<classifier>jar-with-dependencies</classifier>
-			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>javax</groupId>
@@ -58,12 +65,26 @@
 			<groupId>com.att.cdp</groupId>
 			<artifactId>cdp-pal-common</artifactId>
 			<scope>compile</scope>
+                        <version>${cdp.pal.version}</version>
+                        <exclusions>
+                            <exclusion>
+                                 <groupId>ch.qos.logback</groupId>
+                                 <artifactId>logback-classic</artifactId>
+                            </exclusion>
+                        </exclusions>
 		</dependency>
 
 		<dependency>
 			<groupId>com.att.cdp</groupId>
 			<artifactId>cdp-pal-openstack</artifactId>
 			<scope>compile</scope>
+                        <version>${cdp.pal.version}</version>
+                        <exclusions>
+                            <exclusion>
+                                 <groupId>com.att.cdp</groupId>
+                                 <artifactId>cdp-pal-common</artifactId>
+                            </exclusion>
+                        </exclusions>
 		</dependency>
 
 		<dependency>
@@ -89,7 +110,7 @@
 		<dependency>
 			<groupId>javax.xml.bind</groupId>
 			<artifactId>jaxb-api</artifactId>
-			<version>2.1</version>
+			<version>2.2.3</version>
 		</dependency>
 
 		<dependency>
@@ -106,11 +127,6 @@
             <scope>test</scope>
 		</dependency>
 
-		<dependency>
-			<groupId>org.codehaus.jackson</groupId>
-			<artifactId>jackson-jaxrs</artifactId>
-			<version>1.9.12</version>
-		</dependency>
 
 		<dependency>
 			<groupId>commons-codec</groupId>
@@ -162,12 +178,19 @@
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>jcl-over-slf4j</artifactId>
-			</dependency>
+		</dependency>
 
 			<dependency>
 				<groupId>org.mariadb.jdbc</groupId>
 				<artifactId>mariadb-java-client</artifactId>
-			</dependency>
+                <version>${mariadb.client.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.osgi</groupId>
+			<artifactId>org.osgi.core</artifactId>
+			<scope>provided</scope>
+		</dependency>
 
 		<dependency>
 			<groupId>com.vmware</groupId>
@@ -194,14 +217,15 @@
 				<configuration>
 					<instructions>
 						<Bundle-SymbolicName>appc-rest-adapter</Bundle-SymbolicName>
-						<Bundle-Activator>org.openecomp.appc.adapter.rest.RestActivator</Bundle-Activator>
-						<Export-Package>org.openecomp.appc.adapter.rest</Export-Package>
+						<Bundle-Activator>org.onap.appc.adapter.rest.RestActivator</Bundle-Activator>
+						<Export-Package>org.onap.appc.adapter.rest</Export-Package>
 						<Import-Package>org.onap.ccsdk.sli.core.sli.*,org.osgi.framework.*,org.slf4j.*,com.vmware.*,org.apache.xerces.*,javax.net.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.bind.*,javax.naming.*</Import-Package>
-						<Embed-Dependency>*;scope=compile|runtime;artifactId=!sli-common|org.eclipse.osgi|slf4j-api|jcl-over-slf4j|mariadb-java-client|xml-apis|jaxp-api</Embed-Dependency>
+            <Embed-Dependency>*;scope=compile|runtime;artifactId=!sli-common|org.eclipse.osgi|slf4j-api|jcl-over-slf4j|mariadb-java-client|xml-apis|jaxp-api</Embed-Dependency>
 						<Embed-Transitive>true</Embed-Transitive>
 					</instructions>
 				</configuration>
 			</plugin>
 		</plugins>
 	</build>
-</project>
\ No newline at end of file
+	<version>1.6.0</version>
+</project>