Release appc

[appc.git] / appc-dg / appc-dg-shared / appc-dg-common / pom.xml

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 e1f1fed..739f545 100644 (file)
--- a/appc-dg/appc-dg-shared/appc-dg-common/pom.xml
+++ b/appc-dg/appc-dg-shared/appc-dg-common/pom.xml
@@ -3,7 +3,7 @@
   ============LICENSE_START=======================================================
   ONAP : APPC
   ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+  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");
@@ -18,22 +18,23 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   ============LICENSE_END=========================================================
-  ECOMP is a trademark and service mark of AT&T Intellectual Property.
   -->
 <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.onap.appc</groupId>
-               <artifactId>appc-dg-shared</artifactId>
-               <version>1.3.0-SNAPSHOT</version>
-       </parent>
+    <parent>
+        <groupId>org.onap.appc.parent</groupId>
+        <artifactId>binding-parent</artifactId>
+        <version>2.6.1</version>
+        <relativePath />
+    </parent>
+    <groupId>org.onap.appc</groupId>
        <artifactId>appc-dg-common</artifactId>
        <packaging>bundle</packaging>
 
        <dependencies>
                <dependency>
                        <groupId>org.onap.appc</groupId>
-                       <artifactId>appc-common</artifactId>
+                       <artifactId>appc-common-bundle</artifactId>
                        <version>${project.version}</version>
                        <!-- TODO: WA for fixing build, clueanup dependency tree -->
                        <exclusions>
@@ -56,6 +57,19 @@
                                </exclusion>
                        </exclusions>
                </dependency>
+               <dependency>
+                       <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>
@@ -175,27 +189,22 @@
         <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>
         <dependency>
             <groupId>commons-lang</groupId>
@@ -221,9 +230,11 @@
 
                                                <!--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.3</version>
 </project>