X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=b0c8c360f81d47d8fb0d9065051afd5cf6dcd9de;hb=b6d08d886acc9765ebe5462baf53b2ed4cba27ce;hp=9f6879472a196dafffe330c5e67d992ed3573e29;hpb=6e60006d2e22665b491d176ca9e91b74326bfabc;p=sdc.git

diff --git a/pom.xml b/pom.xml
index 9f6879472a..b0c8c360f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,8 +6,7 @@
 	<artifactId>sdc-main</artifactId>
 	<version>1.1.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
-	
-
+        <name>sdc</name>	
 	<properties>
 
 		<!-- ==================== -->
@@ -15,7 +14,7 @@
 		<!-- ==================== -->
 		<build.type>-SNAPSHOT</build.type>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<sprint.number>73</sprint.number>
+		<sprint.number>74</sprint.number>
 
 		<!-- 3rd parties versions -->
 		<lang3.version>3.3.2</lang3.version>
@@ -28,15 +27,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>
-		<ecomp.version>1.1.0-SNAPSHOT</ecomp.version>
-		<dox-common-lib.version>1.1.0-SNAPSHOT</dox-common-lib.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>${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 -->
@@ -60,13 +57,13 @@
         <commons-logging>1.2</commons-logging>
 		<groovy.version>2.3.5</groovy.version>
 		<janino.version>3.0.6</janino.version>
-		
+
 		<!-- aspects -->
 		<jcabi.version>0.20.1</jcabi.version>
 		<aspectjrt.version>1.8.4</aspectjrt.version>
 		<aspectj.version>1.7.4</aspectj.version>
 		<jcabi.plugin.version>0.13.2</jcabi.plugin.version>
-		
+
 		<!-- Logging end -->
 		<!-- System Metrics -->
 		<sigar.version>1.6.4</sigar.version>
@@ -86,6 +83,10 @@
 		<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.32</sdc-tosca-parser.version>
+		
 		<!--JaCoCO -->
 		<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
 		<sonar.jacoco.reportPath>${project.basedir}/target/jacoco.exec</sonar.jacoco.reportPath>
@@ -106,6 +107,7 @@
 		<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>
 
 		<!--nexus-->
 		<nexus.proxy>https://nexus.onap.org</nexus.proxy>
@@ -120,7 +122,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>
@@ -174,6 +176,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>
@@ -251,6 +267,18 @@
 					</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>
@@ -291,7 +319,8 @@
 					<sectionDelimiter>================================================================================</sectionDelimiter>
 					<licenseName>apache_v2</licenseName>
 					<inceptionYear>2017</inceptionYear>
-					<organizationName>AT&amp;T Intellectual Property. All rights reserved.</organizationName>
+					<organizationName>AT&amp;T Intellectual Property. All rights
+						reserved.</organizationName>
 					<projectName>SDC</projectName>
 					<canUpdateCopyright>true</canUpdateCopyright>
 					<canUpdateDescription>true</canUpdateDescription>
@@ -335,6 +364,7 @@
 				<activeByDefault>true</activeByDefault>
 			</activation>
 			<modules>
+				<module>build-tools</module>
 				<module>onboarding</module>
 				<module>security-utils</module>
 				<module>common-app-api</module>
@@ -353,8 +383,6 @@
 
 		</profile>
 
-
-
 		<profile>
 			<id>catalog</id>
 			<activation>
@@ -373,60 +401,15 @@
 				<module>asdc-tests</module>
 				<module>test-apis-ci</module>
 				<module>ui-ci</module>
-			</modules>
-		
-			<build>
-				<plugins>
-					<!-- Create the 'next build number' file -->
-					<plugin>
-						<groupId>org.codehaus.mojo</groupId>
-						<artifactId>exec-maven-plugin</artifactId>
-						<version>1.5.0</version>
-						
-						<executions>
-							<execution>
-								<inherited>false</inherited>
-								<goals>
-									<goal>exec</goal>
-								</goals>
-								<phase>initialize</phase>
-								<id>get.next.build.number</id>
-								<configuration>
-									<workingDirectory>${project.basedir}</workingDirectory>
-									<executable>/usr/bin/perl</executable>
-									<arguments>
-										<argument>scripts/get_next_version.pl</argument>
-										<argument>-groupId=${project.groupId}</argument>
-										<argument>-artifactId=${project.artifactId}</argument>
-										<argument>-baseVersion=${project.version}.${sprint.number}</argument>
-									</arguments>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-
-					<plugin>
-						<groupId>org.codehaus.mojo</groupId>
-						<artifactId>properties-maven-plugin</artifactId>
-						<version>1.0-alpha-2</version>
-
-						<executions>
-							<execution>
-								<phase>initialize</phase>
-								<inherited>false</inherited>
-								<goals>
-									<goal>read-project-properties</goal>
-								</goals>
-								<configuration>
-									<files>
-										<file>${project.build.directory}/FullReleaseVersion.properties</file>
-									</files>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
+			</modules>			
+			
+			<properties>
+				<ecomp.version>1.2.7</ecomp.version>
+				<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.32</sdc-tosca-parser.version>
+			</properties>
 		</profile>
 
 		<profile>
@@ -435,83 +418,14 @@
 				<activeByDefault>false</activeByDefault>
 			</activation>
 			<modules>
+				<module>build-tools</module>
 				<module>onboarding</module>
 			</modules>
 		</profile>
-
-		<profile>
-			<id>Fortify</id>
-			<activation>
-				<activeByDefault>false</activeByDefault>
-			</activation>
-
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>com.fortify.ps.maven.plugin</groupId>
-						<artifactId>sca-maven-plugin</artifactId>
-						<version>4.30</version>
-						<configuration>
-							<source>1.8</source>
-							<buildId>${project.artifactId}</buildId>
-							<toplevelArtifactId>${project.artifactId}</toplevelArtifactId>
-							<fortify.sca.exclude>**/node_modules/*</fortify.sca.exclude>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-
-		<profile>
-			<id>WhiteSource</id>
-			<activation>
-				<activeByDefault>false</activeByDefault>
-			</activation>
-
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.whitesource</groupId>
-						<artifactId>whitesource-maven-plugin</artifactId>
-						<version>3.1.6</version>
-						<configuration>
-							<orgToken>2809bf29-b00c-48c0-a1f0-ca5c9c22f3df</orgToken>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-
 	</profiles>
 
 	<repositories>
-		<repository>
-			<id>virtuos</id>
-			<name>Virtuos</name>
-			<url>http://nexus.virtuos.uos.de/nexus/content/repositories/public/</url>
-			<layout>default</layout>
-		</repository>
-		<repository>
-			<id>apache-public</id>
-			<name>Apache-Public</name>
-			<url>https://repository.apache.org/content/groups/public/</url>
-			<layout>default</layout>
-		</repository>
-		<repository>
-			<id>elasticsearch-releases</id>
-			<url>https://maven.elasticsearch.org/releases</url>
-			<releases>
-				<enabled>true</enabled>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>central</id>
-			<name>Official Maven repository</name>
-			<url>http://repo2.maven.org/maven2/</url>
-		</repository>
+		<!-- LF repositories -->
 		<repository>
 			<id>ecomp-releases</id>
 			<name>Release Repository</name>
@@ -528,15 +442,11 @@
 			<url>${nexus.proxy}/content/repositories/snapshots/</url>
 		</repository>
 		<repository>
-			<id>node</id>
-			<name>Node</name>
-			<url>https://maven-nodejs-proxy.pvtool.org/</url>
-		</repository>
-		<repository>
-			<id>SonoType</id>
-			<name>sonotype</name>
-			<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+			<id>ecomp-public</id>
+			<name>Public Repository</name>
+			<url>${nexus.proxy}/content/repositories/public/</url>
 		</repository>
+		<!-- LF repositories END-->
 	</repositories>
 
 	<distributionManagement>