[SDC-29] catalog 1707 rebase commit.

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

1 files changed, 121 insertions, 127 deletions

diff --git a/asdc-tests/pom.xml b/asdc-tests/pom.xml
index 50b7f65d92..0c0e9a2598 100644
--- a/asdc-tests/pom.xml
+++ b/asdc-tests/pom.xml
@@ -4,23 +4,14 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<artifactId>asdc-tests</artifactId>
-	
+
 	<parent>
 		<groupId>org.openecomp.sdc</groupId>
 		<artifactId>sdc-main</artifactId>
 		<version>1.1.0-SNAPSHOT</version>
 	</parent>
-	
-	
-	<dependencies>
-
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-lang3</artifactId>
-			<version>${lang3.version}</version>
-			<scope>compile</scope>
-		</dependency>
 
+	<dependencies>
 
 		<dependency>
 			<groupId>com.google.guava</groupId>
@@ -28,89 +19,90 @@
 			<version>${guava.version}</version>
 			<scope>compile</scope>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.12</version>
+            <version>${junit.version}</version>
 			<scope>compile</scope>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.testng</groupId>
 			<artifactId>testng</artifactId>
-			<version>6.9.10</version>
+            <version>${testng.version}</version>
 			<scope>compile</scope>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>com.relevantcodes</groupId>
 			<artifactId>extentreports</artifactId>
 			<version>2.41.0</version>
 			<scope>compile</scope>
 		</dependency>
-	
+
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-all</artifactId>
 			<version>1.10.19</version>
 			<scope>compile</scope>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>com.typesafe</groupId>
 			<artifactId>config</artifactId>
 			<version>1.0.2</version>
 			<scope>compile</scope>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>log4j</groupId>
 			<artifactId>log4j</artifactId>
 			<version>1.2.17</version>
 			<scope>compile</scope>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>com.jcraft.jsch</groupId>
 			<artifactId>com.springsource.com.jcraft.jsch</artifactId>
 			<version>0.1.41</version>
 			<scope>compile</scope>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.openecomp.sdc</groupId>
 			<artifactId>common-app-api</artifactId>
-			<version>${common-app-api.version}</version>
+			<version>${project.version}</version>
 			<scope>compile</scope>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.openecomp.sdc.be</groupId>
 			<artifactId>common-be</artifactId>
-			<version>${common-be.version}</version>
+			<version>${project.version}</version>
 			<scope>compile</scope>
 		</dependency>
-		
+
 		<!-- CHECK CATLOG MODEL -->
 		<dependency>
 			<groupId>org.openecomp.sdc.be</groupId>
 			<artifactId>catalog-model</artifactId>
-			<version>${catalog-model.version}</version>
+			<version>${project.version}</version>
 			<scope>compile</scope>
 		</dependency>
-		
+
 		<!-- catalog dao -->
 		<dependency>
 			<groupId>org.openecomp.sdc.be</groupId>
 			<artifactId>catalog-dao</artifactId>
-			<version>${catalog-dao.version}</version>
+			<version>${project.version}</version>
 			<scope>compile</scope>
 		</dependency>
-		
+		<!-- functional java -->
 		<dependency>
 			<groupId>org.functionaljava</groupId>
 			<artifactId>functionaljava</artifactId>
+			<version>${functionaljava.version}</version>
 			<scope>compile</scope>
 		</dependency>
 		<!-- CASSANDRA -->
@@ -121,107 +113,104 @@
 			<scope>compile</scope>
 		</dependency>
 		<!-- CASSANDRA END -->
-	
-		
+
 		<!-- slf4j + logback -->
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
-			<version>1.7.10</version>
+            <version>${slf4j-api.version}</version>
 			<scope>compile</scope>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>ch.qos.logback</groupId>
 			<artifactId>logback-classic</artifactId>
-			<version>${logback.version}</version>
+            <version>${logback.version}</version>
 			<scope>compile</scope>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>ch.qos.logback</groupId>
 			<artifactId>logback-core</artifactId>
-			<version>${logback.version}</version>
+            <version>${logback.version}</version>
 			<scope>compile</scope>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>com.googlecode.json-simple</groupId>
 			<artifactId>json-simple</artifactId>
+            <version>${json-simple.version}</version>
 			<scope>compile</scope>
 		</dependency>
 
 		<!-- File changes listener -->
-		
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-jci-core</artifactId>
+            <version>${commons-jci-core.version}</version>
 			<scope>compile</scope>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>commons-codec</groupId>
 			<artifactId>commons-codec</artifactId>
-			<version>2.0-SNAPSHOT</version>
+            <version>${commons-codec}</version>
 			<scope>compile</scope>
 		</dependency>
-		
-		<!-- Gson -->
 
+		<!-- Gson -->
 		<dependency>
 			<groupId>com.google.code.gson</groupId>
 			<artifactId>gson</artifactId>
-			<version>2.3.1</version>
+			<version>${gson.version}</version>
 			<scope>compile</scope>
 		</dependency>
-		
+
 		<!-- Snake Yaml -->
 		<dependency>
 			<groupId>org.yaml</groupId>
 			<artifactId>snakeyaml</artifactId>
-			<version>1.14</version>
+            <version>${snakeyaml.version}</version>
 			<scope>compile</scope>
 		</dependency>
 
-
-		
 		<!-- http client -->
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>httpclient</artifactId>
-			<version>${httpclient.version}</version>
+            <version>${httpclient.version}</version>
 			<scope>compile</scope>
 		</dependency>
-        
+
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>httpmime</artifactId>
-			<version>${httpclient.version}</version>
+            <version>${httpclient.version}</version>
 			<scope>compile</scope>
-		</dependency>  
-		
+		</dependency>
+
 		<dependency>
 			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>
 			<version>2.5</version>
 			<scope>compile</scope>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>commons-logging</groupId>
 			<artifactId>commons-logging</artifactId>
-			<version>1.2.1-SNAPSHOT</version>
+            <version>${commons-logging}</version>
 			<scope>compile</scope>
 		</dependency>
-		
+
 		<!-- http core -->
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>httpcore</artifactId>
-			<version>${httpcore.version}</version>
+            <version>${httpcore.version}</version>
 			<scope>compile</scope>
 		</dependency>
-		
+
 		<!-- TITAN -->
 		<dependency>
 			<groupId>com.thinkaurelius.titan</groupId>
@@ -235,7 +224,7 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>com.thinkaurelius.titan</groupId>
 			<artifactId>titan-cassandra</artifactId>
@@ -248,7 +237,7 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.codehaus.jackson</groupId>
 			<artifactId>jackson-mapper-asl</artifactId>
@@ -259,50 +248,75 @@
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
-			<!--<version>2.3.1</version>-->
 			<version>${jackson.version}</version>
+			<!--<version>2.3.1</version>-->
 			<scope>compile</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-core</artifactId>
-			<!--<version>2.3.1</version>-->
 			<version>${jackson.version}</version>
+			<!--<version>2.3.1</version>-->
 			<scope>compile</scope>
 		</dependency>
-		
+
 		<dependency>
-			<groupId>org.openecomp.sdc</groupId>
+			<groupId>org.openecomp.sdc.sdc-distribution-client</groupId>
 			<artifactId>sdc-distribution-client</artifactId>
-			<version>1.0.0</version>
+			<version>1.1.9-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.openecomp.ecompsdkos</groupId>
 			<artifactId>ecompFW</artifactId>
-			<version>1.0.0</version>
+			<version>${ecomp.version}</version>
 			<scope>compile</scope>
-            <exclusions>
-                <exclusion>
-                    <artifactId>slf4j-log4j12</artifactId>
-                    <groupId>org.slf4j</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-		
+			<exclusions>
+				<exclusion>
+					<artifactId>slf4j-log4j12</artifactId>
+					<groupId>org.slf4j</groupId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
 		<dependency>
 			<groupId>org.json</groupId>
 			<artifactId>json</artifactId>
 			<version>20090211</version>
 		</dependency>
 	</dependencies>
-	
-	
+
 	<build>
 		<plugins>
-			
+
+			<!-- ============================================= -->
+			<!-- Get the next build number -->
+			<!-- ============================================= -->
+			<!--<plugin>-->
+				<!--<groupId>org.codehaus.mojo</groupId>-->
+				<!--<artifactId>properties-maven-plugin</artifactId>-->
+				<!--<version>1.0-alpha-1</version>-->
+				<!--<inherited>false</inherited>-->
+
+				<!--<executions>-->
+					<!--<execution>-->
+						<!--<id>tests</id>-->
+						<!--<phase>initialize</phase>-->
+						<!--<goals>-->
+							<!--<goal>read-project-properties</goal>-->
+						<!--</goals>-->
+
+						<!--<configuration>-->
+							<!--<files>-->
+								<!--<file>../target/FullReleaseVersion.properties</file>-->
+							<!--</files>-->
+						<!--</configuration>-->
+					<!--</execution>-->
+				<!--</executions>-->
+			<!--</plugin>-->
+
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-deploy-plugin</artifactId>
@@ -312,16 +326,16 @@
 				</configuration>
 			</plugin>
 
-			<!--  ============================================= -->
-			<!--  Create the JAR file with its dependencies     -->
-			<!--  ============================================= -->
+			<!-- ============================================= -->
+			<!-- Create the JAR file with its dependencies -->
+			<!-- ============================================= -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-assembly-plugin</artifactId>
-				<version>2.5.5</version>	
+				<version>2.5.5</version>
 				<executions>
 					<execution>
-					<id>create.jar.with.dependencies</id>
+						<id>create.jar.with.dependencies</id>
 						<phase>package</phase>
 						<goals>
 							<goal>single</goal>
@@ -339,53 +353,33 @@
 					</execution>
 				</executions>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<version>2.6</version>
-				<executions>
-						<execution>
-							<configuration>
-									<finalName>${project.artifactId}</finalName>
-									<appendAssemblyId>false</appendAssemblyId>
-									<descriptor>${project.basedir}/tarball.xml</descriptor>
-							</configuration>
-							<id>assemble-file</id>
-							<phase>package</phase>
-							<goals>
-									<goal>single</goal>
-							</goals>
-						</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-resources-plugin</artifactId>
-				<version>3.0.2</version>
+		</plugins>
+	</build>
 
-				<executions>
-					<execution>
-						<id>copy-asdc-tests</id>
-						<phase>install</phase>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals>
+	<profiles>
+		<profile>
+			<id>Fortify</id>
+			<activation>
+				<activeByDefault>false</activeByDefault>
+			</activation>
+
+			<build>
+				<plugins>
+					<!-- =========================== -->
+					<!-- HP Fortifay scanner -->
+					<!-- =========================== -->
+					<plugin>
+						<groupId>com.fortify.ps.maven.plugin</groupId>
+						<artifactId>sca-maven-plugin</artifactId>
+						<version>4.30</version>
 						<configuration>
-							<outputDirectory>${project.parent.basedir}/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default</outputDirectory>
-							<resources>
-								<resource>
-									<directory>./target</directory>
-									<includes>
-										<include>asdc-tests.tar</include>
-									</includes>
-								</resource>
-							</resources>
+							<scanEnabled>false</scanEnabled>
+							<skip>true</skip>
 						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-
-		</plugins>
-	</build>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
 </project>