Prepare for release build

Prepare for release of early ODL-Oxygen based CCSDK Dublin

Change-Id: I63929ef52de41309905ee31e3fbcf49b64063059
Issue-ID: CCSDK-870
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>

3 files changed, 451 insertions, 466 deletions

diff --git a/ms/controllerblueprints/application/pom.xml b/ms/controllerblueprints/application/pom.xml
index bb0f7686d..bd244e0db 100644
--- a/ms/controllerblueprints/application/pom.xml
+++ b/ms/controllerblueprints/application/pom.xml
@@ -1,260 +1,254 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-  ~ Copyright © 2017-2018 AT&T Intellectual Property.

-  ~

-  ~ Modifications Copyright © 2018 IBM.

-  ~

-  ~ Licensed under the Apache License, Version 2.0 (the "License");

-  ~ you may not use this file except in compliance with the License.

-  ~ You may obtain a copy of the License at

-  ~

-  ~     http://www.apache.org/licenses/LICENSE-2.0

-  ~

-  ~ Unless required by applicable law or agreed to in writing, software

-  ~ distributed under the License is distributed on an "AS IS" BASIS,

-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-  ~ See the License for the specific language governing permissions and

-  ~ limitations under the License.

-  -->

-

-<project

-        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"

-        xmlns="http://maven.apache.org/POM/4.0.0"

-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.onap.ccsdk.apps.controllerblueprints</groupId>

-        <artifactId>parent</artifactId>

-        <version>0.4.0-SNAPSHOT</version>

-        <relativePath>../parent</relativePath>

-    </parent>

-    <artifactId>application</artifactId>

-    <name>Controller Blueprints Application</name>

-    <properties>

-        <swagger.directory>${basedir}/target/src/main/resources/swagger-ui</swagger.directory>

-        <java.version>1.8</java.version>

-        <name.space>org.onap.ccsdk.apps</name.space>     <!-- <name.space>${namespace}</name.space> -->

-        <serviceArtifactName>controllerblueprints</serviceArtifactName>

-        <!-- Sonar -->

-        <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>

-        <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>

-        <sonar.surefire.reportsPath>${basedir}/target/surefire-reports</sonar.surefire.reportsPath>

-        <sonar.failsafe.reportsPath>${basedir}/target/failsafe-reports</sonar.failsafe.reportsPath>

-        <jacoco.path>${basedir}/target/jacoco_report</jacoco.path>

-        <jacoco.itPath>${basedir}/target/jacoco_itReport</jacoco.itPath>

-        <sonar.jacoco.reportPath>${basedir}/target/jacoco-ut.exec</sonar.jacoco.reportPath>

-        <sonar.jacoco.itReportPath>${basedir}/target/jacoco-it.exec</sonar.jacoco.itReportPath>

-        <sonar.language>java</sonar.language>

-        <ilib.version>2.0.7</ilib.version>

-    </properties>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.onap.ccsdk.apps.controllerblueprints</groupId>

-            <artifactId>service</artifactId>

-        </dependency>

-        <dependency>

-            <groupId>org.springframework.boot</groupId>

-            <artifactId>spring-boot-starter-security</artifactId>

-        </dependency>

-        <dependency>

-            <groupId>org.springframework.boot</groupId>

-            <artifactId>spring-boot-starter-actuator</artifactId>

-        </dependency>

-        <dependency>

-            <groupId>org.powermock</groupId>

-            <artifactId>powermock-api-mockito2</artifactId>

-            <scope>test</scope>

-        </dependency>

-        <dependency>

-            <groupId>org.springframework.boot</groupId>

-            <artifactId>spring-boot-starter-test</artifactId>

-            <scope>test</scope>

-        </dependency>

-        <dependency>

-            <groupId>org.springframework.security</groupId>

-            <artifactId>spring-security-test</artifactId>

-            <scope>test</scope>

-        </dependency>

-        <dependency>

-            <groupId>org.jetbrains.kotlin</groupId>

-            <artifactId>kotlin-test-junit</artifactId>

-            <scope>test</scope>

-        </dependency>

-        <dependency>

-            <groupId>io.projectreactor</groupId>

-            <artifactId>reactor-test</artifactId>

-            <scope>test</scope>

-        </dependency>

-    </dependencies>

-    <build>

-        <resources>

-            <resource>

-                <!--config and resource files -->

-                <directory>${basedir}/etc</directory>

-                <targetPath>${basedir}/target/etc</targetPath>

-                <filtering>true</filtering>

-                <includes>

-                    <include>**/*</include>

-                </includes>

-            </resource>

-            <resource>

-                <!--config and resource files -->

-                <directory>${basedir}/src/main/resources</directory>

-                <targetPath>${basedir}/target/src/main/resources</targetPath>

-                <filtering>true</filtering>

-                <includes>

-                    <include>**/*</include>

-                </includes>

-            </resource>

-            <resource>

-                <directory>src/main/resources</directory>

-                <includes>

-                    <include>**/*</include>

-                </includes>

-                <filtering>true</filtering>

-            </resource>

-        </resources>

-        <plugins>

-            <plugin>

-                <artifactId>maven-resources-plugin</artifactId>

-                <version>2.6</version>

-                <executions>

-                    <execution>

-                        <id>copy-dockerfile</id>

-                        <goals>

-                            <goal>copy-resources</goal>

-                        </goals><!-- here the phase you need -->

-                        <phase>validate</phase>

-                        <configuration>

-                            <outputDirectory>${basedir}/target/docker-stage</outputDirectory>

-                            <resources>

-                                <resource>

-                                    <directory>src/main/docker</directory>

-                                    <includes>

-                                        <include>*</include>

-                                    </includes>

-                                    <filtering>true</filtering>

-                                </resource>

-                            </resources>

-                        </configuration>

-                    </execution>

-                </executions>

-            </plugin>

-

-            <plugin>

-                <groupId>org.jacoco</groupId>

-                <artifactId>jacoco-maven-plugin</artifactId>

-                <version>0.7.5.201505241946</version>

-                <executions>

-                    <!-- Prepares the property pointing to the JaCoCo runtime agent which

-                        is passed as VM argument when Maven the Surefire plugin is executed. -->

-                    <execution>

-                        <id>pre-unit-test</id>

-                        <goals>

-                            <goal>prepare-agent</goal>

-                        </goals>

-                        <configuration>

-                            <!-- Sets the path to the file which contains the execution data. -->

-                            <destFile>${sonar.jacoco.reportPath}</destFile>

-                            <propertyName>surefireArgLine</propertyName>

-                        </configuration>

-                    </execution>

-                    <!-- Ensures that the code coverage report for unit tests is created

-                        after unit tests have been run. -->

-                    <execution>

-                        <id>post-unit-test</id>

-                        <phase>test</phase>

-                        <goals>

-                            <goal>report</goal>

-                        </goals>

-                        <configuration>

-                            <!-- Sets the path to the file which contains the execution data. -->

-                            <dataFile>${sonar.jacoco.reportPath}</dataFile>

-                            <!-- Sets the output directory for the code coverage report. -->

-                            <outputDirectory>${jacoco.path}</outputDirectory>

-                        </configuration>

-                    </execution>

-                </executions>

-            </plugin>

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-antrun-plugin</artifactId>

-                <executions>

-                    <execution>

-                        <id>ant-test</id>

-                        <phase>package</phase>

-                        <configuration>

-                            <tasks>

-                                <fixcrlf srcdir="${basedir}" eol="unix"

-                                         includes="**/*.sh, **/*.source"/>

-                            </tasks>

-                        </configuration>

-                        <goals>

-                            <goal>run</goal>

-                        </goals>

-                    </execution>

-                </executions>

-            </plugin>

-            <plugin>

-                <artifactId>maven-compiler-plugin</artifactId>

-                <version>3.1</version>

-                <configuration>

-                    <!-- <skip>${skip.compile}</skip>-->

-                    <source>1.8</source>

-                    <target>1.8</target>

-                </configuration>

-            </plugin>

-            <plugin>

-                <groupId>com.github.kongchen</groupId>

-                <artifactId>swagger-maven-plugin</artifactId>

-                <version>3.1.7</version>

-                <configuration>

-                    <apiSources>

-                        <apiSource>

-                            <springmvc>true</springmvc>

-                            <locations>org.onap.ccsdk.apps.controllerblueprints.service.rs

-                            </locations>

-                            <schemes>

-                                <scheme>http</scheme>

-                                <scheme>https</scheme>

-                            </schemes>

-                            <basePath>/api/v1</basePath>

-                            <info>

-                                <title>Controller Blueprints</title>

-                                <version>${project.version}</version>

-                                <description>

-                                    Controller blueprints API for VNF Self Service.

-                                </description>

-                                <termsOfService>

-                                    Terms of service

-                                </termsOfService>

-                                <contact>

-                                    <email>brindasanth@gmail.com</email>

-                                    <name>Brinda Santh</name>

-                                    <url>http://onap.com</url>

-                                </contact>

-                                <license>

-                                    <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>

-                                    <name>Apache 2.0</name>

-                                </license>

-                            </info>

-                            <swaggerDirectory>${swagger.directory}</swaggerDirectory>

-                        </apiSource>

-                    </apiSources>

-                </configuration>

-                <executions>

-                    <execution>

-                        <phase>compile</phase>

-                        <goals>

-                            <goal>generate</goal>

-                        </goals>

-                    </execution>

-                </executions>

-            </plugin>

-        </plugins>

-    </build>

-

-

-</project>

-

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright © 2017-2018 AT&T Intellectual Property.
+  ~
+  ~ Modifications Copyright © 2018 IBM.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.onap.ccsdk.apps.controllerblueprints</groupId>
+        <artifactId>parent</artifactId>
+        <version>0.4.0-SNAPSHOT</version>
+        <relativePath>../parent</relativePath>
+    </parent>
+    <artifactId>application</artifactId>
+    <name>Controller Blueprints Application</name>
+    <properties>
+        <swagger.directory>${basedir}/target/src/main/resources/swagger-ui</swagger.directory>
+        <java.version>1.8</java.version>
+        <name.space>org.onap.ccsdk.apps</name.space>     <!-- <name.space>${namespace}</name.space> -->
+        <serviceArtifactName>controllerblueprints</serviceArtifactName>
+        <!-- Sonar -->
+        <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
+        <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
+        <sonar.surefire.reportsPath>${basedir}/target/surefire-reports</sonar.surefire.reportsPath>
+        <sonar.failsafe.reportsPath>${basedir}/target/failsafe-reports</sonar.failsafe.reportsPath>
+        <jacoco.path>${basedir}/target/jacoco_report</jacoco.path>
+        <jacoco.itPath>${basedir}/target/jacoco_itReport</jacoco.itPath>
+        <sonar.jacoco.reportPath>${basedir}/target/jacoco-ut.exec</sonar.jacoco.reportPath>
+        <sonar.jacoco.itReportPath>${basedir}/target/jacoco-it.exec</sonar.jacoco.itReportPath>
+        <sonar.language>java</sonar.language>
+        <ilib.version>2.0.7</ilib.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.onap.ccsdk.apps.controllerblueprints</groupId>
+            <artifactId>service</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-api-mockito2</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-test-junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.projectreactor</groupId>
+            <artifactId>reactor-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <resources>
+            <resource>
+                <!--config and resource files -->
+                <directory>${basedir}/etc</directory>
+                <targetPath>${basedir}/target/etc</targetPath>
+                <filtering>true</filtering>
+                <includes>
+                    <include>**/*</include>
+                </includes>
+            </resource>
+            <resource>
+                <!--config and resource files -->
+                <directory>${basedir}/src/main/resources</directory>
+                <targetPath>${basedir}/target/src/main/resources</targetPath>
+                <filtering>true</filtering>
+                <includes>
+                    <include>**/*</include>
+                </includes>
+            </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+                <includes>
+                    <include>**/*</include>
+                </includes>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>2.6</version>
+                <executions>
+                    <execution>
+                        <id>copy-dockerfile</id>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals><!-- here the phase you need -->
+                        <phase>validate</phase>
+                        <configuration>
+                            <outputDirectory>${basedir}/target/docker-stage</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/docker</directory>
+                                    <includes>
+                                        <include>*</include>
+                                    </includes>
+                                    <filtering>true</filtering>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <version>0.7.5.201505241946</version>
+                <executions>
+                    <!-- Prepares the property pointing to the JaCoCo runtime agent which
+                        is passed as VM argument when Maven the Surefire plugin is executed. -->
+                    <execution>
+                        <id>pre-unit-test</id>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                        <configuration>
+                            <!-- Sets the path to the file which contains the execution data. -->
+                            <destFile>${sonar.jacoco.reportPath}</destFile>
+                            <propertyName>surefireArgLine</propertyName>
+                        </configuration>
+                    </execution>
+                    <!-- Ensures that the code coverage report for unit tests is created
+                        after unit tests have been run. -->
+                    <execution>
+                        <id>post-unit-test</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                        <configuration>
+                            <!-- Sets the path to the file which contains the execution data. -->
+                            <dataFile>${sonar.jacoco.reportPath}</dataFile>
+                            <!-- Sets the output directory for the code coverage report. -->
+                            <outputDirectory>${jacoco.path}</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>ant-test</id>
+                        <phase>package</phase>
+                        <configuration>
+                            <tasks>
+                                <fixcrlf srcdir="${basedir}" eol="unix" includes="**/*.sh, **/*.source"/>
+                            </tasks>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.1</version>
+                <configuration>
+                    <!-- <skip>${skip.compile}</skip>-->
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>com.github.kongchen</groupId>
+                <artifactId>swagger-maven-plugin</artifactId>
+                <version>3.1.7</version>
+                <configuration>
+                    <apiSources>
+                        <apiSource>
+                            <springmvc>true</springmvc>
+                            <locations>org.onap.ccsdk.apps.controllerblueprints.service.rs
+                            </locations>
+                            <schemes>
+                                <scheme>http</scheme>
+                                <scheme>https</scheme>
+                            </schemes>
+                            <basePath>/api/v1</basePath>
+                            <info>
+                                <title>Controller Blueprints</title>
+                                <version>${project.version}</version>
+                                <description>
+                                    Controller blueprints API for VNF Self Service.
+                                </description>
+                                <termsOfService>
+                                    Terms of service
+                                </termsOfService>
+                                <contact>
+                                    <email>brindasanth@gmail.com</email>
+                                    <name>Brinda Santh</name>
+                                    <url>http://onap.com</url>
+                                </contact>
+                                <license>
+                                    <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
+                                    <name>Apache 2.0</name>
+                                </license>
+                            </info>
+                            <swaggerDirectory>${swagger.directory}</swaggerDirectory>
+                        </apiSource>
+                    </apiSources>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+
+</project>
diff --git a/ms/controllerblueprints/distribution/pom.xml b/ms/controllerblueprints/distribution/pom.xml
index 33690024b..afbc6617a 100644
--- a/ms/controllerblueprints/distribution/pom.xml
+++ b/ms/controllerblueprints/distribution/pom.xml
@@ -1,202 +1,196 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-  ~  Copyright © 2017-2018 AT&T Intellectual Property.

-  ~

-  ~  Licensed under the Apache License, Version 2.0 (the "License");

-  ~  you may not use this file except in compliance with the License.

-  ~  You may obtain a copy of the License at

-  ~

-  ~      http://www.apache.org/licenses/LICENSE-2.0

-  ~

-  ~  Unless required by applicable law or agreed to in writing, software

-  ~  distributed under the License is distributed on an "AS IS" BASIS,

-  ~  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-  ~  See the License for the specific language governing permissions and

-  ~  limitations under the License.

-  -->

-

-<project

-        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"

-        xmlns="http://maven.apache.org/POM/4.0.0"

-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.onap.ccsdk.apps.controllerblueprints</groupId>

-        <artifactId>parent</artifactId>

-        <version>0.4.0-SNAPSHOT</version>

-        <relativePath>../parent</relativePath>

-    </parent>

-    <artifactId>distribution</artifactId>

-    <packaging>pom</packaging>

-    <name>Controller Blueprints Distribution</name>

-    <properties>

-        <assembly.id>maven</assembly.id>

-        <name.space>org.onap.ccsdk.apps</name.space>     <!-- <name.space>${namespace}</name.space> -->

-        <serviceArtifactName>controllerblueprints</serviceArtifactName>

-        <image.name>onap/ccsdk-controllerblueprints</image.name>

-		<docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>

-		<docker.push.phase>deploy</docker.push.phase>

-		<docker.verbose>true</docker.verbose>

-	</properties>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.onap.ccsdk.apps.controllerblueprints</groupId>

-            <artifactId>application</artifactId>

-        </dependency>

-    </dependencies>

-    <build>

-        <plugins>

-            <plugin>

-                <artifactId>maven-resources-plugin</artifactId>

-                <version>2.6</version>

-                <executions>

-                    <execution>

-                        <id>copy-dockerfile</id>

-                        <goals>

-                            <goal>copy-resources</goal>

-                        </goals><!-- here the phase you need -->

-                        <phase>validate</phase>

-                        <configuration>

-                            <outputDirectory>${basedir}/target/docker-stage</outputDirectory>

-                            <resources>

-                                <resource>

-                                    <directory>src/main/docker</directory>

-                                    <includes>

-                                        <include>*</include>

-                                    </includes>

-                                    <filtering>true</filtering>

-                                </resource>

-                            </resources>

-                        </configuration>

-                    </execution>

-                </executions>

-            </plugin>

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-antrun-plugin</artifactId>

-                <executions>

-                    <execution>

-                        <id>ant-test</id>

-                        <phase>package</phase>

-                        <configuration>

-                            <tasks>

-                                <fixcrlf srcdir="${basedir}" eol="unix"

-                                         includes="**/*.sh, **/*.source"/>

-                            </tasks>

-                        </configuration>

-                        <goals>

-                            <goal>run</goal>

-                        </goals>

-                    </execution>

-                </executions>

-            </plugin>

-            <plugin>

-                <!--build the final artifact for docker deployment -->

-                <artifactId>maven-assembly-plugin</artifactId>

-                <version>3.1.0</version>

-                <configuration>

-                    <!-- <skipAssembly>${skip.assembly}</skipAssembly>-->

-                    <outputDirectory>${basedir}/target/docker-stage</outputDirectory>

-                    <descriptors>

-                        <descriptor>src/main/docker/distribution.xml</descriptor>

-                    </descriptors>

-                    <tarLongFileMode>posix</tarLongFileMode>

-                </configuration>

-                <executions>

-                    <execution>

-                        <id>${assembly.id}</id>

-                        <phase>package</phase>

-                        <goals>

-                            <goal>single</goal>

-                        </goals>

-                    </execution>

-                </executions>

-            </plugin>

-            <plugin>

-                <groupId>org.codehaus.groovy.maven</groupId>

-                <artifactId>gmaven-plugin</artifactId>

-                <version>1.0</version>

-                <executions>

-                    <execution>

-                        <phase>validate</phase>

-                        <goals>

-                            <goal>execute</goal>

-                        </goals>

-                        <configuration>

-                            <source>

-                                println project.properties['ccsdk.project.version'];

-                                def versionArray;

-                                if (project.properties['ccsdk.project.version'] != null ) {

-                                    versionArray = project.properties['ccsdk.project.version'].split('\\.');

-                                }

-

-                                if (project.properties['ccsdk.project.version'].endsWith("-SNAPSHOT"))

-                                {

-                                    project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";

-                                } else {

-                                    project.properties['project.docker.latesttag.version']=versionArray[0]+'.' + versionArray[1]+"-STAGING-latest";

-                                }

-

-                                println 'New Tag for docker:' + project.properties['project.docker.latesttag.version'];

-                            </source>

-                        </configuration>

-                    </execution>

-                </executions>

-            </plugin>

-

-        </plugins>

-    </build>

-

-	<profiles>

-		<profile>

-			<id>docker</id>

-			<build>

-				<plugins>

-					<plugin>

-						<groupId>io.fabric8</groupId>

-						<artifactId>docker-maven-plugin</artifactId>

-						<version>0.26.1</version>

-						<inherited>false</inherited>

-						<configuration>

-							<images>

-								<image>

-									<name>${image.name}</name>

-									<build>

-										<cleanup>try</cleanup>

-										<dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>

-										<tags>

-											<tag>${project.version}</tag>

-											<tag>${project.version}-STAGING-${maven.build.timestamp}</tag>

-											<tag>${project.docker.latesttag.version}</tag>

-										</tags>

-									</build>

-								</image>

-							</images>

-							<verbose>true</verbose>

-						</configuration>

-						<executions>

-                            <execution>

-                                <id>generate-images</id>

-                                <phase>package</phase>

-                                <goals>

-                                    <goal>build</goal>

-                                </goals>

-                            </execution>

-                            <execution>

-                                <id>push-images</id>

-                                <phase>${docker.push.phase}</phase>

-                                <goals>

-                                    <goal>build</goal>

-                                    <goal>push</goal>

-                                </goals>

-                            </execution>

-						</executions>

-					</plugin>

-				</plugins>

-			</build>

-		</profile>

-

-	</profiles>

-</project>

-

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~  Copyright © 2017-2018 AT&T Intellectual Property.
+  ~
+  ~  Licensed under the Apache License, Version 2.0 (the "License");
+  ~  you may not use this file except in compliance with the License.
+  ~  You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~  Unless required by applicable law or agreed to in writing, software
+  ~  distributed under the License is distributed on an "AS IS" BASIS,
+  ~  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~  See the License for the specific language governing permissions and
+  ~  limitations under the License.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.onap.ccsdk.apps.controllerblueprints</groupId>
+        <artifactId>parent</artifactId>
+        <version>0.4.0-SNAPSHOT</version>
+        <relativePath>../parent</relativePath>
+    </parent>
+    <artifactId>distribution</artifactId>
+    <packaging>pom</packaging>
+    <name>Controller Blueprints Distribution</name>
+    <properties>
+        <assembly.id>maven</assembly.id>
+        <name.space>org.onap.ccsdk.apps</name.space>     <!-- <name.space>${namespace}</name.space> -->
+        <serviceArtifactName>controllerblueprints</serviceArtifactName>
+        <image.name>onap/ccsdk-controllerblueprints</image.name>
+		<docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
+		<docker.push.phase>deploy</docker.push.phase>
+		<docker.verbose>true</docker.verbose>
+	</properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.onap.ccsdk.apps.controllerblueprints</groupId>
+            <artifactId>application</artifactId>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>2.6</version>
+                <executions>
+                    <execution>
+                        <id>copy-dockerfile</id>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals><!-- here the phase you need -->
+                        <phase>validate</phase>
+                        <configuration>
+                            <outputDirectory>${basedir}/target/docker-stage</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/docker</directory>
+                                    <includes>
+                                        <include>*</include>
+                                    </includes>
+                                    <filtering>true</filtering>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>ant-test</id>
+                        <phase>package</phase>
+                        <configuration>
+                            <tasks>
+                                <fixcrlf srcdir="${basedir}" eol="unix" includes="**/*.sh, **/*.source"/>
+                            </tasks>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <!--build the final artifact for docker deployment -->
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>3.1.0</version>
+                <configuration>
+                    <!-- <skipAssembly>${skip.assembly}</skipAssembly>-->
+                    <outputDirectory>${basedir}/target/docker-stage</outputDirectory>
+                    <descriptors>
+                        <descriptor>src/main/docker/distribution.xml</descriptor>
+                    </descriptors>
+                    <tarLongFileMode>posix</tarLongFileMode>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>${assembly.id}</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.groovy.maven</groupId>
+                <artifactId>gmaven-plugin</artifactId>
+                <version>1.0</version>
+                <executions>
+                    <execution>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>execute</goal>
+                        </goals>
+                        <configuration>
+                            <source>
+                                println project.properties['ccsdk.project.version'];
+                                def versionArray;
+                                if (project.properties['ccsdk.project.version'] != null ) {
+                                    versionArray = project.properties['ccsdk.project.version'].split('\\.');
+                                }
+
+                                if (project.properties['ccsdk.project.version'].endsWith("-SNAPSHOT"))
+                                {
+                                    project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
+                                } else {
+                                    project.properties['project.docker.latesttag.version']=versionArray[0]+'.' + versionArray[1]+"-STAGING-latest";
+                                }
+
+                                println 'New Tag for docker:' + project.properties['project.docker.latesttag.version'];
+                            </source>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+        </plugins>
+    </build>
+
+	<profiles>
+		<profile>
+			<id>docker</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>io.fabric8</groupId>
+						<artifactId>docker-maven-plugin</artifactId>
+						<version>0.26.1</version>
+						<inherited>false</inherited>
+						<configuration>
+							<images>
+								<image>
+									<name>${image.name}</name>
+									<build>
+										<cleanup>try</cleanup>
+										<dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
+										<tags>
+											<tag>${project.version}</tag>
+											<tag>${project.version}-STAGING-${maven.build.timestamp}</tag>
+											<tag>${project.docker.latesttag.version}</tag>
+										</tags>
+									</build>
+								</image>
+							</images>
+							<verbose>true</verbose>
+						</configuration>
+						<executions>
+                            <execution>
+                                <id>generate-images</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>build</goal>
+                                </goals>
+                            </execution>
+                            <execution>
+                                <id>push-images</id>
+                                <phase>${docker.push.phase}</phase>
+                                <goals>
+                                    <goal>build</goal>
+                                    <goal>push</goal>
+                                </goals>
+                            </execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+
+	</profiles>
+</project>
diff --git a/ms/controllerblueprints/pom.xml b/ms/controllerblueprints/pom.xml
index aeff4db9d..d88956f0d 100644
--- a/ms/controllerblueprints/pom.xml
+++ b/ms/controllerblueprints/pom.xml
@@ -14,9 +14,7 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
-         xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
         <groupId>org.onap.ccsdk.apps</groupId>
         <artifactId>ccsdk-apps-ms</artifactId>
@@ -45,4 +43,3 @@
         <module>distribution</module>
     </modules>
 </project>
-