Prepare for release build
authorTimoney, Dan (dt5972) <dtimoney@att.com>
Tue, 8 Jan 2019 19:40:54 +0000 (14:40 -0500)
committerTimoney, Dan (dt5972) <dtimoney@att.com>
Thu, 10 Jan 2019 11:55:26 +0000 (06:55 -0500)
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>
ms/controllerblueprints/application/pom.xml
ms/controllerblueprints/distribution/pom.xml
ms/controllerblueprints/pom.xml

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