X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=appc-dg%2Fappc-dg-shared%2Fappc-dg-common%2Fpom.xml;h=2235e36b0b8107d83436341951afbbb58734f47c;hb=7346763fac123b7a5745bb6a18eaf1140b82779b;hp=1d92f1385900dd4ef79c86e889f49244dc0d4da7;hpb=38713207b817ed4700f630748c681116338d32f0;p=appc.git

diff --git a/appc-dg/appc-dg-shared/appc-dg-common/pom.xml b/appc-dg/appc-dg-shared/appc-dg-common/pom.xml
index 1d92f1385..2235e36b0 100644
--- a/appc-dg/appc-dg-shared/appc-dg-common/pom.xml
+++ b/appc-dg/appc-dg-shared/appc-dg-common/pom.xml
@@ -1,41 +1,111 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ============LICENSE_START=======================================================
+  ONAP : APPC
+  ================================================================================
+  Copyright (C) 2017-2018 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-dg-shared</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
-	</parent>
+    <parent>
+        <groupId>org.onap.appc.parent</groupId>
+        <artifactId>binding-parent</artifactId>
+        <version>2.6.2</version>
+        <relativePath />
+    </parent>
+    <groupId>org.onap.appc</groupId>
 	<artifactId>appc-dg-common</artifactId>
 	<packaging>bundle</packaging>
 
 	<dependencies>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
-			<artifactId>appc-common</artifactId>
+			<groupId>org.onap.appc</groupId>
+			<artifactId>appc-common-bundle</artifactId>
 			<version>${project.version}</version>
+			<!-- TODO: WA for fixing build, clueanup dependency tree -->
+			<exclusions>
+				<exclusion>
+					<groupId>equinoxSDK381</groupId>
+					<artifactId>org.eclipse.osgi</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-message-adapter-api</artifactId>
 			<version>${project.version}</version>
 			<scope>provided</scope>
+			<!-- TODO: WA for fixing build, clueanup dependency tree -->
+			<exclusions>
+				<exclusion>
+					<groupId>equinoxSDK381</groupId>
+					<artifactId>org.eclipse.osgi</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
+			<artifactId>appc-dmaap-adapter-bundle</artifactId>
+			<version>${project.version}</version>
+			<scope>provided</scope>
+			<!-- TODO: WA for fixing build, clueanup dependency tree -->
+			<exclusions>
+				<exclusion>
+					<groupId>equinoxSDK381</groupId>
+					<artifactId>org.eclipse.osgi</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-message-adapter-factory</artifactId>
 			<version>${project.version}</version>
 			<scope>provided</scope>
+			<!-- TODO: WA for fixing build, clueanup dependency tree -->
+			<exclusions>
+				<exclusion>
+					<groupId>equinoxSDK381</groupId>
+					<artifactId>org.eclipse.osgi</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.sdnc.core</groupId>
+			<groupId>org.onap.ccsdk.sli.core</groupId>
 			<artifactId>sli-common</artifactId>
 			<scope>provided</scope>
+			<!-- TODO: WA for fixing build, clueanup dependency tree -->
+			<exclusions>
+				<exclusion>
+					<groupId>equinoxSDK381</groupId>
+					<artifactId>org.eclipse.osgi</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.sdnc.core</groupId>
+			<groupId>org.onap.ccsdk.sli.core</groupId>
 			<artifactId>sli-provider</artifactId>
 			<scope>provided</scope>
+			<!-- TODO: WA for fixing build, clueanup dependency tree -->
+			<exclusions>
+				<exclusion>
+					<groupId>equinoxSDK381</groupId>
+					<artifactId>org.eclipse.osgi</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
@@ -63,55 +133,85 @@
 			<version>1.6.2</version>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-dg-dependency-model</artifactId>
 			<version>${project.version}</version>
+			<!-- TODO: WA for fixing build, clueanup dependency tree -->
+			<exclusions>
+				<exclusion>
+					<groupId>equinoxSDK381</groupId>
+					<artifactId>org.eclipse.osgi</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-ranking-framework-lib</artifactId>
 			<version>${project.version}</version>
+			<!-- TODO: WA for fixing build, clueanup dependency tree -->
+			<exclusions>
+				<exclusion>
+					<groupId>equinoxSDK381</groupId>
+					<artifactId>org.eclipse.osgi</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
+			<groupId>org.onap.appc</groupId>
 			<artifactId>appc-data-access-lib</artifactId>
 			<version>${project.version}</version>
+			<!-- TODO: WA for fixing build, clueanup dependency tree -->
+			<exclusions>
+				<exclusion>
+					<groupId>equinoxSDK381</groupId>
+					<artifactId>org.eclipse.osgi</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
-   		<dependency>
+		<!-- TODO: WA for fixing build, clueanup dependency tree -->
+   		<!--<dependency>
 			<groupId>equinoxSDK381</groupId>
 			<artifactId>org.eclipse.osgi</artifactId>
 			<scope>test</scope>
-		</dependency>
+		</dependency>-->
 		<dependency>
-			<groupId>org.openecomp.appc</groupId>
-			<artifactId>appc-dg-mdsal-store</artifactId>
+			<groupId>org.onap.appc</groupId>
+			<artifactId>appc-dg-mdsal-bundle</artifactId>
 			<version>${project.version}</version>
+			<!-- TODO: WA for fixing build, clueanup dependency tree -->
+			<exclusions>
+				<exclusion>
+					<groupId>equinoxSDK381</groupId>
+					<artifactId>org.eclipse.osgi</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-yaml</artifactId>
-            <version>${jackson-yaml-version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
-            <version>${jackson-yaml-version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>${jackson-yaml-version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
-            <version>${jackson-yaml-version}</version>
         </dependency>
         <dependency>
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
-            <version>${snakeyaml.version}</version>
-        </dependency>	</dependencies>
+        </dependency>
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+            <scope>compile</scope>
+        </dependency>
+	</dependencies>
 
 	<build>
 		<plugins>
@@ -122,17 +222,19 @@
 				<configuration>
 					<instructions>
 						<Bundle-SymbolicName>appc-dg-common</Bundle-SymbolicName>
-						<Export-Package>org.openecomp.appc.dg.common,org.openecomp.appc.dg.common.objects,org.openecomp.appc.dg.common.utils</Export-Package>
-						<Private-Package>org.openecomp.appc.dg.common.impl.*</Private-Package>
-						<Import-Package>org.openecomp.appc.adapter.message.*,org.openecomp.appc.adapter.factory.*,org.openecomp.appc.adapter.messaging.*,
+						<Export-Package>org.onap.appc.dg.common,org.onap.appc.dg.common.objects,org.onap.appc.dg.common.utils</Export-Package>
+						<Private-Package>org.onap.appc.dg.common.impl.*</Private-Package>
+						<Import-Package>org.onap.appc.adapter.message.*,org.onap.appc.adapter.factory.*,org.onap.appc.adapter.messaging.*,
 							*;resolution:=optional</Import-Package>
-						<Embed-Dependency>appc-dg-mdsal-store,appc-dg-domain-model-lib,appc-dg-dependency-model,jackson-dataformat-yaml,jackson-databind,jackson-core;scope=compile|runtime;inline=false;artifactId=!org.eclipse.osgi</Embed-Dependency>
+						<Embed-Dependency>appc-dg-mdsal-bundle,appc-dg-domain-model-lib,appc-dg-dependency-model,jackson-dataformat-yaml,jackson-databind,jackson-core,jackson-annotations;scope=compile|runtime;inline=false;artifactId=!org.eclipse.osgi</Embed-Dependency>
 
 						<!--Embed-Dependency>eelf-core,logback-core,logback-classic;scope=compile|runtime;inline=false</Embed-Dependency-->
 						<Embed-Transitive>true</Embed-Transitive>
+						<_removeheaders>Import-Service</_removeheaders>
 					</instructions>
 				</configuration>
 			</plugin>
 		</plugins>
 	</build>
+	<version>1.6.4</version>
 </project>