[SDC] compiltion alignment fix

Change-Id: I4e7d3d4e0cfb59ea0571604c26db9b32b0e22a15
Signed-off-by: Michael Lando <ml636r@att.com>

diff --git a/asdctool/pom.xml b/asdctool/pom.xml
index 40eebba..a7a122f 100644 (file)
--- a/asdctool/pom.xml
+++ b/asdctool/pom.xml
@@ -48,17 +48,100 @@
                        <scope>compile</scope>
                </dependency>
 
+
                <dependency>
                        <groupId>org.openecomp.sdc</groupId>
                        <artifactId>catalog-be</artifactId>
                        <version>${project.version}</version>
 
                        <!-- Comment Out in order to debug in eclipse -->
-                       <classifier>classes</classifier>
+                        <classifier>classes</classifier>
+
+                        <exclusions>
+                               <exclusion>
+                                       <groupId>org.openecomp.ecompsdkos</groupId>
+                                       <artifactId>epsdk-fw</artifactId>
+                               </exclusion>
 
+                               <exclusion>
+                                       <groupId>org.openecomp.sdc.common</groupId>
+                                       <artifactId>openecomp-sdc-artifact-generator-api</artifactId>
+                               </exclusion>
+
+                               <exclusion>
+                                       <groupId>org.openecomp.sdc.common</groupId>
+                                       <artifactId>openecomp-sdc-artifact-generator-core</artifactId>
+                               </exclusion>
+
+                               <exclusion>
+                                       <groupId>org.openecomp.sdc.common</groupId>
+                                       <artifactId>openecomp-common-lib</artifactId>
+                               </exclusion>
+                        </exclusions>
+
+                        <scope>compile</scope> 
+               </dependency>
+
+               <dependency>
+                       <groupId>org.openecomp.ecompsdkos</groupId>
+                       <artifactId>epsdk-fw</artifactId>
+                       <version>${ecomp.version}</version>
                        <scope>compile</scope>
+                       <exclusions>
+                               <exclusion>
+                                       <groupId>com.att.nsa</groupId>
+                                       <artifactId>cambriaClient</artifactId>
+                               </exclusion>
+
+                               <exclusion>
+                                       <artifactId>slf4j-log4j12</artifactId>
+                                       <groupId>org.slf4j</groupId>
+                               </exclusion>
+                       </exclusions>
                </dependency>
 
+
+               <!--Artifact Generator-->
+               <dependency>
+                       <groupId>org.openecomp.sdc.common</groupId>
+                       <artifactId>openecomp-sdc-artifact-generator-api</artifactId>
+                       <version>${artifact-generator-api.version}</version>
+                       <scope>compile</scope>
+                       <exclusions>
+                               <exclusion>
+                                       <groupId>junit</groupId>
+                                       <artifactId>junit</artifactId>
+                               </exclusion>
+                       </exclusions>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.openecomp.sdc.common</groupId>
+                       <artifactId>openecomp-sdc-artifact-generator-core</artifactId>
+                       <version>${artifact-generator-core.version}</version>
+                       <scope>compile</scope>
+                       <exclusions>
+                               <exclusion>
+                                       <groupId>junit</groupId>
+                                       <artifactId>junit</artifactId>
+                               </exclusion>
+                       </exclusions>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.openecomp.sdc.common</groupId>
+                       <artifactId>openecomp-common-lib</artifactId>
+                       <version>${dox-common-lib.version}</version>
+                       <type>pom</type>
+                       <exclusions>
+                               <exclusion>
+                                       <groupId>junit</groupId>
+                                       <artifactId>junit</artifactId>
+                               </exclusion>
+                       </exclusions>
+               </dependency>
+
+
                <!-- ASDC dependencies end -->
                <dependency>
                        <groupId>org.eclipse.jetty</groupId>

diff --git a/pom.xml b/pom.xml
index 22ff9bb..dcb086c 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -549,11 +549,11 @@
                                <enabled>false</enabled>
                        </snapshots>
                </repository>
-               <repository>
+<!--           <repository>
                        <id>central</id>
                        <name>Official Maven repository</name>
                        <url>http://repo2.maven.org/maven2/</url>
-               </repository>
+               </repository>-->
                <repository>
                        <id>ecomp-releases</id>
                        <name>Release Repository</name>