From 03205dad582ffa5db54187f451b9a29d3d0af386 Mon Sep 17 00:00:00 2001
From: Gautam Shah <gautams@amdocs.com>
Date: Fri, 1 Jun 2018 08:38:32 +0530
Subject: Fixing Merge Build issue and Sonar issues.

fixing build issue and Sonar issues.

Change-Id: I4209b79ab2a3646839df50be4b58f8f230b6d710
Issue-ID: SDC-1189
Signed-off-by: GAUTAMS <gautams@amdocs.com>
---
 common/pom.xml | 49 ++-----------------------------------------------
 1 file changed, 2 insertions(+), 47 deletions(-)

(limited to 'common/pom.xml')

diff --git a/common/pom.xml b/common/pom.xml
index 2ca3525d93..a1c4fc1890 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -184,7 +184,6 @@
                     <execution>
                         <goals>
                             <goal>init-artifact-helper</goal>
-                            <goal>copy-helper</goal>
                             <goal>calibrate-artifact-helper</goal>
                         </goals>
                     </execution>
@@ -193,55 +192,18 @@
                     <groupId>org.openecomp.sdc</groupId>
                     <artifactId>build-data-installer</artifactId>
                     <version>${project.version}</version>
-                    <targetLocation>build-data-helper</targetLocation>
-                    <name>build-data-helper-${project.version}.jar</name>
                     <artifactHelper>
                         <project>${project}</project>
+                        <session>${session}</session>
+                        <unicornRoot>org.openecomp.sdc:sdc-onboarding/target/build-data</unicornRoot>
                     </artifactHelper>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <version>${maven.dependency.version}</version>
-                <executions>
-                    <execution>
-                        <id>id1</id>
-                        <goals>
-                            <goal>get</goal>
-                        </goals>
-                        <phase>pre-clean</phase>
-                        <configuration>
-                            <artifactId>build-data-helper</artifactId>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>id2</id>
-                        <goals>
-                            <goal>get</goal>
-                        </goals>
-                        <phase>pre-clean</phase>
-                        <configuration>
-                            <artifactId>build-data-installer</artifactId>
-                        </configuration>
-                    </execution>
-                </executions>
-                <configuration>
-                    <groupId>org.openecomp.sdc</groupId>
-                    <version>${project.version}</version>
-                    <skip>${skipGet}</skip>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.openecomp.sdc.onboarding</groupId>
                 <artifactId>compile-helper-plugin</artifactId>
                 <version>${project.version}</version>
                 <dependencies>
-                    <dependency>
-                        <groupId>org.openecomp.sdc</groupId>
-                        <artifactId>build-data-helper</artifactId>
-                        <version>${project.version}</version>
-                    </dependency>
                     <dependency>
                         <groupId>org.openecomp.sdc.onboarding</groupId>
                         <artifactId>pmd-helper-plugin</artifactId>
@@ -325,13 +287,6 @@
                 <groupId>org.openecomp.sdc.onboarding</groupId>
                 <artifactId>pmd-helper-plugin</artifactId>
                 <version>${project.version}</version>
-                <dependencies>
-                    <dependency>
-                    <groupId>org.openecomp.sdc</groupId>
-                    <artifactId>build-data-helper</artifactId>
-                    <version>${project.version}</version>
-                </dependency>
-                </dependencies>
                 <executions>
                     <execution>
                         <goals>
-- 
cgit 1.2.3-korg