[SDC-29] catalog 1707 rebase commit.

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

1 files changed, 358 insertions, 284 deletions

diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml
index db7a992179..17f01caa88 100644
--- a/catalog-be/pom.xml
+++ b/catalog-be/pom.xml
@@ -12,96 +12,61 @@
 		<version>1.1.0-SNAPSHOT</version>
 	</parent>
 
-
 	<properties>
 		<swagger-ui-version>2.1.0-M2</swagger-ui-version>
 	</properties>
 
 
-
-
-	<dependencyManagement>
-		<dependencies>
-
-			<!-- JSON and YAML Parsing -->
-			<dependency>
-				<groupId>com.fasterxml.jackson.dataformat</groupId>
-				<artifactId>jackson-dataformat-yaml</artifactId>
-				<version>${jackson.version}</version>
-			</dependency>
-
-			<dependency>
-				<groupId>com.fasterxml.jackson.core</groupId>
-				<artifactId>jackson-databind</artifactId>
-				<version>${jackson.version}</version>
-			</dependency>
-
-			<dependency>
-				<groupId>com.fasterxml.jackson.core</groupId>
-				<artifactId>jackson-core</artifactId>
-				<version>${jackson.version}</version>
-			</dependency>
-
-			<dependency>
-				<groupId>com.fasterxml.jackson.core</groupId>
-				<artifactId>jackson-annotations</artifactId>
-				<version>${jackson.annotations.version}</version>
-			</dependency>
-
-			<dependency>
-				<groupId>com.sun.jersey.contribs</groupId>
-				<artifactId>jersey-multipart</artifactId>
-				<version>2.14</version>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
-
-
-
-
 	<dependencies>
 
 
+		<!--JSON and YAML Parsing-->
+		<dependency>
+			<groupId>com.fasterxml.jackson.dataformat</groupId>
+			<artifactId>jackson-dataformat-yaml</artifactId>
+			<version>${jackson.version}</version>
+			<scope>compile</scope>
+		</dependency>
 
 		<dependency>
-			<groupId>org.testng</groupId>
-			<artifactId>testng</artifactId>
-			<version>6.9.10</version>
-			<scope>test</scope>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+			<version>${jackson.version}</version>
+			<scope>compile</scope>
 		</dependency>
 
 		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-context-support</artifactId>
-			<version>${spring.version}</version>
-			<scope>provided</scope>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-core</artifactId>
+			<version>${jackson.version}</version>
+			<scope>compile</scope>
 		</dependency>
 
 		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-messaging</artifactId>
-			<version>${spring.version}</version>
-			<scope>provided</scope>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-annotations</artifactId>
+			<version>${jackson.annotations.version}</version>
+			<scope>compile</scope>
 		</dependency>
 
 		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-aspects</artifactId>
-			<version>${spring.version}</version>
-			<scope>provided</scope>
+			<groupId>org.glassfish.jersey.media</groupId>
+			<artifactId>jersey-media-multipart</artifactId>
+			<version>${jersey-bom.version}</version>
+			<scope>compile</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>org.openecomp.sdc</groupId>
 			<artifactId>security-utils</artifactId>
-			<version>${security-utils.version}</version>
+			<version>${project.version}</version>
 			<scope>compile</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>com.tinkerpop.blueprints</groupId>
 			<artifactId>blueprints-sail-graph</artifactId>
-			<version>2.6.0</version>
+			<version>2.5.0</version>
 			<optional>true</optional>
 			<exclusions>
 				<exclusion>
@@ -126,37 +91,33 @@
 			<version>1.5.1-M2</version>
 		</dependency>
 
-		<dependency>
-			<groupId>org.glassfish.jersey.containers</groupId>
-			<artifactId>jersey-container-servlet-core</artifactId>
-		</dependency>
 
 
 		<!-- Swagger Dependencies End -->
 		<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>
 		<dependency>
 			<groupId>org.openecomp.sdc.be</groupId>
 			<artifactId>catalog-dao</artifactId>
-			<version>${catalog-dao.version}</version>
+			<version>${project.version}</version>
 			<scope>compile</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>org.openecomp.sdc.be</groupId>
 			<artifactId>catalog-model</artifactId>
-			<version>${catalog-model.version}</version>
+			<version>${project.version}</version>
 			<scope>compile</scope>
 		</dependency>
 
@@ -164,21 +125,21 @@
 		<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>
 
@@ -186,66 +147,67 @@
 		<dependency>
 			<groupId>org.yaml</groupId>
 			<artifactId>snakeyaml</artifactId>
-			<version>1.14</version>
+            <version>${snakeyaml.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>
 
 		<!-- Gson -->
-
 		<dependency>
 			<groupId>com.google.code.gson</groupId>
 			<artifactId>gson</artifactId>
-			<version>2.3.1</version>
+			<version>${gson.version}</version>
 			<scope>compile</scope>
 		</dependency>
 
-		<!-- Json -->
-
-
-
-
 		<!-- jersey -->
 		<dependency>
 			<groupId>org.glassfish.jersey.media</groupId>
 			<artifactId>jersey-media-json-jackson</artifactId>
+			<version>${jersey-bom.version}</version>
 			<scope>compile</scope>
 		</dependency>
 
+		<dependency>
+			<groupId>org.glassfish.jersey.containers</groupId>
+			<artifactId>jersey-container-servlet-core</artifactId>
+			<version>${jersey-bom.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>httpcore</artifactId>
-			<version>${httpcore.version}</version>
+            <version>${httpcore.version}</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>
 
 		<dependency>
 			<groupId>commons-codec</groupId>
 			<artifactId>commons-codec</artifactId>
-			<version>2.0-SNAPSHOT</version>
+            <version>${commons-codec}</version>
 			<scope>compile</scope>
 		</dependency>
 		<!-- http client END -->
@@ -253,19 +215,17 @@
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>servlet-api</artifactId>
+            <version>${servlet-api.version}</version>
 			<scope>provided</scope>
 		</dependency>
 
-
 		<dependency>
 			<groupId>org.eclipse.jgit</groupId>
 			<artifactId>org.eclipse.jgit</artifactId>
 			<version>3.4.1.201406201815-r</version>
 		</dependency>
 
-
 		<!-- spring - used by A4C -->
-
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-core</artifactId>
@@ -321,7 +281,6 @@
 			<version>${groovy.version}</version>
 			<scope>compile</scope>
 		</dependency>
-		
 
 		<dependency>
 			<groupId>org.codehaus.janino</groupId>
@@ -333,11 +292,10 @@
 		<dependency>
 			<groupId>org.codehaus.janino</groupId>
 			<artifactId>commons-compiler</artifactId>
-			<version>3.0.6</version>
+			<version>${janino.version}</version>
 			<scope>compile</scope>
 		</dependency>
 
-
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
@@ -366,9 +324,8 @@
 		<dependency>
 			<groupId>com.thinkaurelius.titan</groupId>
 			<artifactId>titan-cassandra</artifactId>
-			<!--<artifactId>asdc-titan-cassandra</artifactId -->
+			<!--<artifactId>asdc-titan-cassandra</artifactId>-->
 			<version>${titan.version}</version>
-			<!--<version>1.0.0-snapshot</version -->
 			<scope>compile</scope>
 			<exclusions>
 				<exclusion>
@@ -393,6 +350,7 @@
 		<dependency>
 			<groupId>com.googlecode.json-simple</groupId>
 			<artifactId>json-simple</artifactId>
+			<version>${json-simple.version}</version>
 			<scope>compile</scope>
 
 		</dependency>
@@ -400,10 +358,10 @@
 		<dependency>
 			<groupId>org.elasticsearch</groupId>
 			<artifactId>elasticsearch</artifactId>
+            <version>${elastic-search.version}</version>
 			<scope>compile</scope>
 		</dependency>
 
-
 		<dependency>
 			<groupId>org.elasticsearch.plugin</groupId>
 			<artifactId>shield</artifactId>
@@ -414,6 +372,7 @@
 		<dependency>
 			<groupId>org.functionaljava</groupId>
 			<artifactId>functionaljava</artifactId>
+			<version>${functionaljava.version}</version>
 			<scope>compile</scope>
 		</dependency>
 
@@ -421,6 +380,7 @@
 		<dependency>
 			<groupId>com.jcabi</groupId>
 			<artifactId>jcabi-aspects</artifactId>
+			<version>${jcabi.version}</version>
 			<scope>compile</scope>
 		</dependency>
 
@@ -505,30 +465,47 @@
 			</exclusions>
 		</dependency>
 
-		<!-- Artifact Generator -->
+		<!--Artifact Generator-->
 		<dependency>
-			<groupId>org.openecomp.sdc.sdc_common</groupId>
+			<groupId>org.openecomp.sdc.common</groupId>
 			<artifactId>openecomp-sdc-artifact-generator-api</artifactId>
-			<version>${artefact-gen-api.version}</version>
+			<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.sdc_common</groupId>
+			<groupId>org.openecomp.sdc.common</groupId>
 			<artifactId>openecomp-sdc-artifact-generator-core</artifactId>
-			<version>${artefact-gen-core.version}</version>
+			<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.sdc_common</groupId>
+			<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>
 
-
-		<!-- Jetty Proxy -->
+		<!--Jetty Proxy-->
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
 			<artifactId>jetty-proxy</artifactId>
@@ -536,12 +513,17 @@
 			<scope>compile</scope>
 		</dependency>
 
-
-
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
 			<artifactId>jetty-servlets</artifactId>
-			<version>${jetty.servlets.version}</version>
+			<version>${jetty.version}</version>
+			<scope>compile</scope>
+		</dependency>
+		<!-- System metrics -->
+		<dependency>
+			<groupId>org.fusesource</groupId>
+			<artifactId>sigar</artifactId>
+			<version>${sigar.version}</version>
 			<scope>compile</scope>
 		</dependency>
 
@@ -549,6 +531,7 @@
 		<dependency>
 			<groupId>org.glassfish.jersey.test-framework.providers</groupId>
 			<artifactId>jersey-test-framework-provider-bundle</artifactId>
+			<version>${jersey-bom.version}</version>
 			<type>pom</type>
 			<scope>test</scope>
 		</dependency>
@@ -556,26 +539,29 @@
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
 			<artifactId>jetty-servlet</artifactId>
+            <version>${jetty.version}</version>
 			<scope>test</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
 			<artifactId>jetty-webapp</artifactId>
+            <version>${jetty.version}</version>
 			<scope>test</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.12</version>
+			<version>${junit.version}</version>
 			<scope>test</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-all</artifactId>
-			<version>1.10.19</version>
+			<version>${mockito.version}</version>
+			<!--<version>1.10.19</version>-->
 			<scope>test</scope>
 		</dependency>
 
@@ -594,23 +580,12 @@
 		</dependency>
 	</dependencies>
 
-
-
 	<build>
 
 		<finalName>${project.artifactId}-${project.version}</finalName>
 
-
 		<plugins>
-			<plugin>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<configuration>
-					<systemPropertyVariables>
-						<logback.configurationFile>src/test/resources/logback-test.xml</logback.configurationFile>
-					</systemPropertyVariables>
-				</configuration>
-			</plugin>
-			
+
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-war-plugin</artifactId>
@@ -619,180 +594,222 @@
 					<packagingExcludes>WEB-INF\lib\slf4j-log4j*.jar,
 						WEB-INF/classes/elasticsearch.yml,
 						WEB-INF/classes/portal.properties</packagingExcludes>
-						<archive>
-							<manifestEntries>
-								<SDC-Version>${parent.version}</SDC-Version>
-							</manifestEntries>
-							<manifest>
-								<!-- <addClasspath>true</addClasspath -->
-								<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-								<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-							</manifest>
-						</archive>
-
-						<webResources>
-							<resource>
-								<directory>src/main/resources</directory>
-								<!-- <directory>target/swagger-ui-2.1.0-M2/dist</directory -->
-								<directory>src/main/resources/swagger</directory>
-							</resource>
-						</webResources>
-						<attachClasses>true</attachClasses>
-					</configuration>
-				</plugin>
-
-
-
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-dependency-plugin</artifactId>
-					<executions>
-						<execution>
-							<id>copy-dependencies</id>
-							<phase>package</phase>
-							<goals>
-								<goal>copy-dependencies</goal>
-							</goals>
-							<configuration>
-								<includeScope>compile</includeScope>
-							</configuration>
-						</execution>
-						<execution>
-							<id>copy-installed</id>
-							<phase>install</phase>
-							<goals>
-								<goal>copy</goal>
-							</goals>
-							<configuration>
-								<artifactItems>
-									<artifactItem>
-										<groupId>${project.groupId}</groupId>
-										<artifactId>${project.artifactId}</artifactId>
-										<version>${project.version}</version>
-										<type>${project.packaging}</type>
-									</artifactItem>
-								</artifactItems>
-								<outputDirectory>${project.parent.basedir}/sdc-os-chef/sdc-backend/</outputDirectory>
-							</configuration>
-						</execution>
-					</executions>
-				</plugin>
-
-
-				<plugin>
-					<groupId>com.jcabi</groupId>
-					<artifactId>jcabi-maven-plugin</artifactId>
-					<version>${jcabi.plugin.version}</version>
-					<executions>
-						<execution>
-							<goals>
-								<goal>ajc</goal>
-							</goals>
-						</execution>
-					</executions>
-				</plugin>
-
-
-
-				<!-- Swagger Plugins Start -->
-				<plugin>
-					<groupId>com.googlecode.maven-download-plugin</groupId>
-					<artifactId>download-maven-plugin</artifactId>
-					<version>1.2.1</version>
-					<executions>
-						<execution>
-							<id>swagger-ui</id>
-							<goals>
-								<goal>wget</goal>
-							</goals>
-							<configuration>
-								<url>https://github.com/swagger-api/swagger-ui/archive/v${swagger-ui-version}.tar.gz</url>
-								<unpack>true</unpack>
-								<outputDirectory>${project.build.directory}</outputDirectory>
-							</configuration>
-						</execution>
-					</executions>
-				</plugin>
+					<archive>
+						<manifestEntries>
+							<SDC-Version>${full.release.version}</SDC-Version>
+						</manifestEntries>
+						<manifest>
+							<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+							<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+						</manifest>
+					</archive>
+
+					<webResources>
+						<resource>
+							<directory>src/main/resources</directory>
+							<directory>src/main/resources/swagger</directory>
+						</resource>
+					</webResources>
+					<attachClasses>true</attachClasses>
+				</configuration>
+			</plugin>
 
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>copy-dependencies</id>
+						<phase>package</phase>
+						<goals>
+							<goal>copy-dependencies</goal>
+						</goals>
+						<configuration>
+							<includeScope>compile</includeScope>
+						</configuration>
+					</execution>
+					<execution>
+						<id>copy-installed</id>
+						<phase>install</phase>
+						<goals>
+							<goal>copy</goal>
+						</goals>
+						<configuration>
+							<artifactItems>
+								<artifactItem>
+									<groupId>${project.groupId}</groupId>
+									<artifactId>${project.artifactId}</artifactId>
+									<version>${project.version}</version>
+									<type>${project.packaging}</type>
+								</artifactItem>
+							</artifactItems>
+							<outputDirectory>${project.parent.basedir}/sdc-os-chef/sdc-backend/</outputDirectory>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 
+			<plugin>
+				<groupId>com.jcabi</groupId>
+				<artifactId>jcabi-maven-plugin</artifactId>
+				<version>${jcabi.plugin.version}</version>
+				<executions>
+					<execution>
+						<goals>
+							<goal>ajc</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 
-				<plugin>
-					<artifactId>maven-resources-plugin</artifactId>
-					<version>2.6</version>
-					<executions>
-
-						<execution>
-							<id>copy-resources</id>
-							<phase>process-resources</phase>
-							<goals>
-								<goal>copy-resources</goal>
-							</goals>
-							<configuration>
-								<outputDirectory>target/${project.artifactId}-${project.version}</outputDirectory>
-								<resources>
-									<resource>
-										<directory>${project.build.directory}/swagger-ui-${swagger-ui-version}/dist</directory>
-										<filtering>true</filtering>
-										<excludes>
-											<exclude>index.html</exclude>
-										</excludes>
-									</resource>
-								</resources>
-							</configuration>
-						</execution>
-
-						<execution>
-							<id>copy-normatives-backend</id>
-							<phase>install</phase>
-							<goals>
-								<goal>copy-resources</goal>
-							</goals>
-							<configuration>
-								<outputDirectory>${project.parent.basedir}/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-normatives/files/default</outputDirectory>
-								<resources>
-									<resource>
-										<directory>./target</directory>
-										<includes>
-											<include>normatives.tar.gz</include>
-										</includes>
-									</resource>
-								</resources>
-							</configuration>
-						</execution>
-
-					</executions>
-				</plugin>
+			<!-- Swagger Plugins Start -->
+			<plugin>
+				<groupId>com.googlecode.maven-download-plugin</groupId>
+				<artifactId>download-maven-plugin</artifactId>
+				<version>1.2.1</version>
+				<executions>
+					<execution>
+						<id>swagger-ui</id>
+						<goals>
+							<goal>wget</goal>
+						</goals>
+						<configuration>
+							<url>https://github.com/swagger-api/swagger-ui/archive/v${swagger-ui-version}.tar.gz</url>
+							<unpack>true</unpack>
+							<outputDirectory>${project.build.directory}</outputDirectory>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 
+			<plugin>
+				<artifactId>maven-clean-plugin</artifactId>
+				<version>2.6.1</version>
+				<executions>
+					<execution>
+						<id>clean.sdc.zip.chef.os.folder</id>
+						<phase>initialize</phase>
+						<goals>
+							<goal>clean</goal>
+						</goals>
+						<configuration>
+
+							<filesets>
+								<fileset>
+									<directory>${project.parent.basedir}/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/files/default/sdc-*.zip</directory>
+									<includes>
+										<include>sdc-*.zip</include>
+									</includes>
+									<followSymlinks>false</followSymlinks>
+								</fileset>
+							</filesets>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<artifactId>maven-resources-plugin</artifactId>
+				<version>2.6</version>
+				<executions>
+					<execution>
+						<id>copy-resources</id>
+						<phase>process-resources</phase>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>target/${project.artifactId}-${project.version}</outputDirectory>
+							<resources>
+								<resource>
+									<directory>${project.build.directory}/swagger-ui-${swagger-ui-version}/dist</directory>
+									<filtering>true</filtering>
+									<excludes>
+										<exclude>index.html</exclude>
+									</excludes>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>
+
+					<execution>
+						<id>copy-normatives</id>
+						<phase>install</phase>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${project.parent.basedir}/sdc-os-chef/sdc-normatives/chef-repo/cookbooks/sdc-normatives/files/default</outputDirectory>
+							<resources>
+								<resource>
+									<directory>./target</directory>
+									<includes>
+										<include>normatives.tar.gz</include>
+									</includes>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-assembly-plugin</artifactId>
-					<version>2.6</version>
-					<executions>
-						<execution>
-							<id>normatives</id>
-							<phase>package</phase>
-							<goals>
-								<goal>single</goal>
-							</goals>
-							<configuration>
-								<finalName>normatives</finalName>
-								<appendAssemblyId>false</appendAssemblyId>
-								<descriptor>${project.basedir}/normatives.xml</descriptor>
-							</configuration>
-						</execution>
-					</executions>
-				</plugin>
+			<plugin>
+				<groupId>com.coderplus.maven.plugins</groupId>
+				<artifactId>copy-rename-maven-plugin</artifactId>
+				<version>1.0</version>
+				<executions>
+					<execution>
+						<id>copy-file</id>
+						<phase>install</phase>
+						<goals>
+							<goal>copy</goal>
+						</goals>
+						<configuration>
+							<sourceFile>${project.parent.basedir}/catalog-be/src/main/resources/config/SDC.zip</sourceFile>
+							<destinationFile>${project.parent.basedir}/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/files/default/SDC.zip</destinationFile>
+						</configuration>
+					</execution>
+					<execution>
+						<id>rename-file</id>
+						<phase>install</phase>
+						<goals>
+							<goal>rename</goal>
+						</goals>
+						<configuration>
+							<sourceFile>${project.parent.basedir}/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/files/default/SDC.zip</sourceFile>
+							<destinationFile>${project.parent.basedir}/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/files/default/SDC-${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.zip</destinationFile>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 
-			</plugins>
 
 
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<version>2.6</version>
+				<executions>
+					<execution>
+						<id>normatives</id>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+						<configuration>
+							<finalName>normatives</finalName>
+							<appendAssemblyId>false</appendAssemblyId>
+							<descriptor>${project.basedir}/normatives.xml</descriptor>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 
+		</plugins>
 
-			<pluginManagement>
-				<plugins>
+		<pluginManagement>
+			<plugins>
 				<!--This plugin's configuration is used to store Eclipse m2e settings 
-				only. It has no influence on the Maven build itself. -->
+					only. It has no influence on the Maven build itself. -->
 				<plugin>
 					<groupId>org.eclipse.m2e</groupId>
 					<artifactId>lifecycle-mapping</artifactId>
@@ -836,13 +853,70 @@
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-deploy-plugin</artifactId>
 					<version>2.7</version>
+					<configuration>
+						<skip>true</skip>
+					</configuration>
 				</plugin>
-				
 			</plugins>
 		</pluginManagement>
 		<!-- Swagger Plugins End -->
 	</build>
 
-
-
+	<profiles>
+        <profile>
+            <id>catalog</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+
+
+            <build>
+				<finalName>${project.artifactId}-${full.release.version}</finalName>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>properties-maven-plugin</artifactId>
+                        <version>1.0-alpha-2</version>
+
+                        <executions>
+                            <execution>
+                                <inherited>false</inherited>
+                                <phase>initialize</phase>
+                                <goals>
+                                    <goal>read-project-properties</goal>
+                                </goals>
+                                <configuration>
+                                    <files>
+                                        <file>${project.parent.build.directory}/FullReleaseVersion.properties</file>
+                                    </files>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </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.parent.artifactId}</buildId>
+							<toplevelArtifactId>${project.parent.artifactId}</toplevelArtifactId>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
 </project>