X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=93ba292f170bb432797b5bdd08766d19dbc3681c;hb=0b566202130593dffbc9590dacea2e57083fd4d9;hp=eab52ef60fc3978cba34a983aa5ea121820a9d3f;hpb=6cc9a11a09a9b650442bf301eb8fd1aa6cad66bc;p=sdc.git

diff --git a/pom.xml b/pom.xml
index eab52ef60f..93ba292f17 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,12 +4,14 @@
 
 	<groupId>org.openecomp.sdc</groupId>
 	<artifactId>sdc-main</artifactId>
-	<version>1.1.0-SNAPSHOT</version>
+	<version>1.2.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
-	
-
+        <name>sdc</name>	
 	<properties>
 
+		<maven.compiler.source>1.8</maven.compiler.source>
+		<maven.compiler.target>1.8</maven.compiler.target>
+
 		<!-- ==================== -->
 		<!-- Generic properties -->
 		<!-- ==================== -->
@@ -28,15 +30,13 @@
         <jersey-bom.version>2.24</jersey-bom.version>
         <servlet-api.version>2.5</servlet-api.version>
 
-		<artifact-generator-api.version>1.1.0-SNAPSHOT</artifact-generator-api.version>
-		<artifact-generator-core.version>1.1.0-SNAPSHOT</artifact-generator-core.version>
+		<artifact-generator-api.version>${project.version}</artifact-generator-api.version>
+		<artifact-generator-core.version>${project.version}</artifact-generator-core.version>
 		<ecomp.version>1.1.0</ecomp.version>
-		<dox-common-lib.version>1.1.0-SNAPSHOT</dox-common-lib.version>
+		<dox-common-lib.version>${project.version}</dox-common-lib.version>
 
 		<!-- Elastic Search mapper (reference the elastic search version actually). -->
 		<elastic-search.version>2.1.0</elastic-search.version>
-		<catalog-artifacts.version>1.0.0-SNAPSHOT</catalog-artifacts.version>
-		<catalog-builders.version>1.0.0-SNAPSHOT</catalog-builders.version>
 		<jetty.version>9.2.10.v20150310</jetty.version>
 
 		<!-- JSON and YAML Parsing -->
@@ -82,34 +82,43 @@
         <commons-jci-core.version>1.1</commons-jci-core.version>
 
 		<!--TESTING-->
-		<mockito.version>1.10.19</mockito.version>
+		<mockito.version>2.12.0</mockito.version>
 		<junit.version>4.12</junit.version>
 		<testng.version>6.9.10</testng.version>
 		<extentreports.version>3.0.3</extentreports.version>
 		
 		<!-- parser-->
-		<sdc-tosca-parser.version>1.1.14-SNAPSHOT</sdc-tosca-parser.version>
+		<sdc-tosca-parser.version>1.1.56-SNAPSHOT</sdc-tosca-parser.version>
 		
 		<!--JaCoCO -->
 		<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
-		<sonar.jacoco.reportPath>${project.basedir}/target/jacoco.exec</sonar.jacoco.reportPath>
-		<sonar.jacoco.itReportPath>${project.basedir}/target/it-jacoco.exec</sonar.jacoco.itReportPath>
+		<!--<sonar.jacoco.reportPath>${project.basedir}/target/jacoco.exec</sonar.jacoco.reportPath>
+		<sonar.jacoco.itReportPath>${project.basedir}/target/it-jacoco.exec</sonar.jacoco.itReportPath>-->
 		<sonar.language>java</sonar.language>
-		<sonar.version>${project.version}</sonar.version>
-
-		<!--cassandra -->
-		<cassandra.driver.version>3.0.0</cassandra.driver.version>
-		<!-- maven central (Nexus) -->
-		<nexus.id.release>nexus</nexus.id.release>
-		<nexus.id.snapshot>nexus</nexus.id.snapshot>
 		<!-- Sonar properties -->
 		<sonar.sourceEncoding>${project.build.sourceEncoding}</sonar.sourceEncoding>
-		<sonar.skipDesign>true</sonar.skipDesign>
 		<sonar.projectBaseDir>${project.basedir}</sonar.projectBaseDir>
 		<sonar.sources>.</sonar.sources>
 		<sonar.exclusions>**/scripts/**/*</sonar.exclusions>
 		<sonar.test.exclusions>**/test/**/*,**/tests/**/*</sonar.test.exclusions>
 		<sonar.inclusions>app/**/*.js,server-mock/**/*.js,src/**/*.js,src/main/**/*.java</sonar.inclusions>
+		<sonar.branch>${project.version}</sonar.branch>
+
+		<assertj.version>3.8.0</assertj.version>
+
+		<!--cassandra -->
+		<cassandra.driver.version>3.0.0</cassandra.driver.version>
+		<!-- maven central (Nexus) -->
+		<nexus.id.release>nexus</nexus.id.release>
+		<nexus.id.snapshot>nexus</nexus.id.snapshot>
+
+		<assertj.version>3.8.0</assertj.version>
+
+		<!--cassandra -->
+		<cassandra.driver.version>3.0.0</cassandra.driver.version>
+		<!-- maven central (Nexus) -->
+		<nexus.id.release>nexus</nexus.id.release>
+		<nexus.id.snapshot>nexus</nexus.id.snapshot>
 
 		<!--nexus-->
 		<nexus.proxy>https://nexus.onap.org</nexus.proxy>
@@ -124,7 +133,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.10.4</version>
+				<version>3.0.0-M1</version>
 				<configuration>
 					<failOnError>false</failOnError>
 					<doclet>org.umlgraph.doclet.UmlGraphDoc</doclet>
@@ -178,6 +187,20 @@
 		</pluginManagement>
 
 		<plugins>
+
+			<!-- Staging Plugin -->
+			<plugin>
+				 <groupId>org.sonatype.plugins</groupId>
+				 <artifactId>nexus-staging-maven-plugin</artifactId>
+				 <version>1.6.7</version>
+				 <extensions>true</extensions>
+				 <configuration>
+						 <nexusUrl>${nexus.proxy}</nexusUrl>
+						 <stagingProfileId>${staging.profile.id}</stagingProfileId>
+						 <serverId>ecomp-staging</serverId>
+				 </configuration>
+			</plugin>
+
 			<plugin>
 				<artifactId>maven-surefire-plugin</artifactId>
 				<version>2.19.1</version>
@@ -202,59 +225,43 @@
 				</executions>
 			</plugin>
 
-			<!-- Set the JDK compiler version. -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.5.1</version>
-				<inherited>true</inherited>
-				<configuration>
-					<source>1.8</source>
-					<target>1.8</target>
-				</configuration>
-			</plugin>
-
 			<!-- Java Code Coverage -->
 			<plugin>
 				<groupId>org.jacoco</groupId>
 				<artifactId>jacoco-maven-plugin</artifactId>
-				<version>0.7.1.201405082137</version>
-				<inherited>True</inherited>
+				<version>0.7.9</version>
+				<configuration>
+					<append>true</append>
+					<destFile>${sonar.jacoco.reportPath}</destFile>
+					<dataFile>${sonar.jacoco.reportPath}</dataFile>
+				</configuration>
 				<executions>
-					<!-- Unit-Tests -->
 					<execution>
-						<id>prepare-agent</id>
+						<id>default-prepare-agent</id>
 						<goals>
 							<goal>prepare-agent</goal>
 						</goals>
-						<configuration>
-							<destFile>${sonar.jacoco.reportPath}</destFile>
-						</configuration>
 					</execution>
 					<execution>
-						<id>report</id>
+						<id>default-report</id>
 						<goals>
 							<goal>report</goal>
 						</goals>
-						<configuration>
-							<dataFile>${sonar.jacoco.reportPath}</dataFile>
-							<outputDirectory>${project.basedir}/target/site/jacoco</outputDirectory>
-						</configuration>
-					</execution>
-
-					<!-- Integration Tests (Only report goal) -->
-					<execution>
-						<id>report-integration</id>
-						<goals>
-							<goal>report-integration</goal>
-						</goals>
-						<configuration>
-							<dataFile>${sonar.jacoco.itReportPath}</dataFile>
-							<outputDirectory>${project.basedir}/target/site/it-jacoco</outputDirectory>
-						</configuration>
 					</execution>
 				</executions>
 			</plugin>
+			
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-site-plugin</artifactId>
+				<dependencies>
+					<dependency>
+						<groupId>org.apache.maven.wagon</groupId>
+						<artifactId>wagon-webdav-jackrabbit</artifactId>
+						<version>2.10</version>
+					</dependency>
+				</dependencies>
+			</plugin>
 
 			<!-- Set the deployment repositories properties. -->
 			<plugin>
@@ -282,54 +289,6 @@
 					</execution>
 				</executions>
 			</plugin>
-
-			<!-- license plugin -->
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>license-maven-plugin</artifactId>
-				<version>1.10</version>
-				<configuration>
-					<addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage>
-					<processStartTag>============LICENSE_START=======================================================</processStartTag>
-					<processEndTag>============LICENSE_END=========================================================</processEndTag>
-					<sectionDelimiter>================================================================================</sectionDelimiter>
-					<licenseName>apache_v2</licenseName>
-					<inceptionYear>2017</inceptionYear>
-					<organizationName>AT&amp;T Intellectual Property. All rights
-						reserved.</organizationName>
-					<projectName>SDC</projectName>
-					<canUpdateCopyright>true</canUpdateCopyright>
-					<canUpdateDescription>true</canUpdateDescription>
-					<canUpdateLicense>true</canUpdateLicense>
-					<emptyLineAfterHeader>true</emptyLineAfterHeader>
-					<verbose>false</verbose>
-					<includes>
-						<include>**/*.java</include>
-						<include>**/*.ts</include>
-					</includes>
-					<excludes>
-						<exclude>**/*.d.ts</exclude>
-					</excludes>
-					<roots>
-						<root>src</root>
-						<root>app</root>
-						<root>server-mock</root>
-						<root>typings</root>
-					</roots>
-					<extraExtensions>
-						<ts>java</ts>
-					</extraExtensions>
-				</configuration>
-				<executions>
-					<execution>
-						<id>first</id>
-						<goals>
-							<goal>update-file-header</goal>
-						</goals>
-						<!--phase>process-sources</phase -->
-					</execution>
-				</executions>
-			</plugin>
 		</plugins>
 	</build>
 
@@ -384,13 +343,9 @@
 				<artifact-generator-api.version>1710.0.0</artifact-generator-api.version>
 				<artifact-generator-core.version>1710.0.0</artifact-generator-core.version>
 				<dox-common-lib.version>1710.0.0</dox-common-lib.version>
-				<sdc-tosca-parser.version>1.1.14</sdc-tosca-parser.version>
-			</properties>	
-			
-			
+				<sdc-tosca-parser.version>1.1.32</sdc-tosca-parser.version>
+			</properties>
 		</profile>
-		
-
 
 		<profile>
 			<id>onboarding</id>
@@ -398,9 +353,24 @@
 				<activeByDefault>false</activeByDefault>
 			</activation>
 			<modules>
+				<module>build-tools</module>
 				<module>onboarding</module>
 			</modules>
 		</profile>
+
+		<profile>
+			<id>dev-integ</id>
+			<activation>
+				<activeByDefault>false</activeByDefault>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>org.togglz</groupId>
+					<artifactId>togglz-console</artifactId>
+					<version>${togglz.version}</version>
+				</dependency>
+			</dependencies>
+		</profile>
 	</profiles>
 
 	<repositories>