aboutsummaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorGautam Shah <gautams@amdocs.com>2018-06-01 08:38:32 +0530
committerGAUTAMS <gautams@amdocs.com>2018-06-04 13:53:51 +0530
commit03205dad582ffa5db54187f451b9a29d3d0af386 (patch)
tree21e67f2a40764fe1b1904e58cd775c0041528352 /common
parent06b1f35479a40194c6d84c38cc1215ae76b81ba6 (diff)
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>
Diffstat (limited to 'common')
-rw-r--r--common/pom.xml49
1 files changed, 2 insertions, 47 deletions
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,56 +192,19 @@
<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>
<version>${project.version}</version>
@@ -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>