X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ui-ci-dev%2Fpom.xml;h=1d6afa9c01c5158822420d81d9233a647cc6ff61;hb=88e37209870c269747d9dff49ab1169cb6399654;hp=b84322c8f159e05b3818254d9df35646ae4504f5;hpb=451a3400b76511393c62a444f588a4ed15f4a549;p=sdc.git

diff --git a/ui-ci-dev/pom.xml b/ui-ci-dev/pom.xml
index b84322c8f1..1d6afa9c01 100644
--- a/ui-ci-dev/pom.xml
+++ b/ui-ci-dev/pom.xml
@@ -5,15 +5,20 @@
 		<groupId>org.openecomp.sdc</groupId>
 		<artifactId>sdc-main</artifactId>
 		<!-- <version>${asdc.version}</version> -->
-		<version>1610.2.1</version>
+		<version>1.1.0-SNAPSHOT</version>
 	</parent>
-
 	<artifactId>ui-ci-dev</artifactId>
 	<description>Selenium tests for the SDnC Application</description>
 	
 	
 	
 	<dependencies>
+		<dependency>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+			<version>${guava.version}</version>
+			<scope>compile</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.seleniumhq.selenium</groupId>
 			<artifactId>selenium-java</artifactId>
@@ -32,24 +37,18 @@
 			<artifactId>asdc-tests</artifactId>
 			<version>${asdc-tests.version}</version>
 		</dependency>
-		
-		<!-- <dependency>
-			<groupId>org.openecomp.sdc</groupId>
-			<artifactId>catalog-be</artifactId>
-			<version>${asdc-tests.version}</version>
-		</dependency> -->
 
 		<dependency>
 			<groupId>org.yaml</groupId>
 			<artifactId>snakeyaml</artifactId>
-			<version>1.14</version>
+			<version>${snakeyaml.version}</version>
 			<scope>compile</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>com.google.code.gson</groupId>
 			<artifactId>gson</artifactId>
-			<version>2.3.1</version>
+			<version>${gson.version}</version>
 			<scope>compile</scope>
 		</dependency>
 
@@ -57,12 +56,14 @@
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>httpclient</artifactId>
+            <version>${httpclient.version}</version>
 			<scope>compile</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>httpmime</artifactId>
+            <version>${httpclient.version}</version>
 			<scope>compile</scope>
 		</dependency>
 
@@ -76,6 +77,7 @@
 		<dependency>
 			<groupId>commons-logging</groupId>
 			<artifactId>commons-logging</artifactId>
+            <version>${commons-logging}</version>
 			<scope>compile</scope>
 		</dependency>
 
@@ -83,6 +85,7 @@
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>httpcore</artifactId>
+			<version>${httpcore.version}</version>
 			<scope>compile</scope>
 		</dependency>
 
@@ -125,19 +128,20 @@
 		<dependency>
 			<groupId>org.openecomp.sdc</groupId>
 			<artifactId>sdc-distribution-client</artifactId>
-			<version>1.1.2</version>
+			<version>1.1.3</version>
 		</dependency>
 
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
+			<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>
 
@@ -151,19 +155,20 @@
 		<dependency>
 			<groupId>com.googlecode.json-simple</groupId>
 			<artifactId>json-simple</artifactId>
-			<version>1.1</version>
+			<version>${json-simple.version}</version>
 			<scope>compile</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>com.relevantcodes</groupId>
 			<artifactId>extentreports</artifactId>
-			<version>2.41.1</version>
+			<version>1.4</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-jci-core</artifactId>
+			<version>${commons-jci-core.version}</version>
 			<scope>compile</scope>
 		</dependency>
 
@@ -184,6 +189,7 @@
 		<dependency>
 			<groupId>commons-codec</groupId>
 			<artifactId>commons-codec</artifactId>
+            <version>${commons-codec}</version>
 			<scope>compile</scope>
 		</dependency>
 	</dependencies>
@@ -192,6 +198,32 @@
 	
 	<build>
 		<plugins>
+		
+			<!-- ================================================== -->
+			<!-- Get the next versions from the properties file. -->
+			<!-- ================================================== -->
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>properties-maven-plugin</artifactId>
+				<version>1.0-alpha-1</version>
+				<inherited>false</inherited>
+
+				<executions>
+					<execution>
+						<id>ui-ci-dev</id>
+						<phase>initialize</phase>
+						<goals>
+							<goal>read-project-properties</goal>
+						</goals>
+
+						<configuration>
+							<files>
+								<file>../target/FullReleaseVersion.properties</file>
+							</files>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 			
 			
 			
@@ -220,27 +252,12 @@
 							</descriptorRefs>
 						</configuration>
 					</execution>
-					
-					
-					<execution>
-						<id>tarball</id>
-						<phase>package</phase>
-						<goals>
-							<goal>single</goal>
-						</goals>
-						<configuration>
-							<finalName>${project.artifactId}-${full.release.version}${build.type}</finalName>
-							<appendAssemblyId>false</appendAssemblyId>
-							<descriptor>${project.basedir}/tarball.xml</descriptor>
-							<attach>false</attach>
-						</configuration>
-					</execution>
 				</executions>
 			</plugin>
 
 
 			<!-- =========================== -->
-			<!-- HP Fortifay scanner         -->
+			<!-- HP Fortify scanner         -->
 			<!-- =========================== -->
 			<plugin>
 				<groupId>com.fortify.ps.maven.plugin</groupId>