Prepare for release build 91/75491/1 0.4.0
authorTimoney, Dan (dt5972) <dtimoney@att.com>
Tue, 8 Jan 2019 19:20:28 +0000 (14:20 -0500)
committerTimoney, Dan (dt5972) <dtimoney@att.com>
Tue, 8 Jan 2019 19:20:28 +0000 (14:20 -0500)
Prepare for release of early ODL-Oxygen based CCSDK Dublin

Change-Id: I322ccb15e1064a9acc7f2060c744623895766a87
Issue-ID: CCSDK-870
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
23 files changed:
blueprints-processor/adaptors/data-adaptor-provider/pom.xml
blueprints-processor/adaptors/pom.xml
blueprints-processor/adaptors/rest-adaptor-provider/pom.xml
blueprints-processor/features/ccsdk-blueprints-processor/pom.xml
blueprints-processor/features/features-blueprints-processor/pom.xml
blueprints-processor/features/pom.xml
blueprints-processor/installer/pom.xml
blueprints-processor/plugin/assignment-provider/pom.xml
blueprints-processor/plugin/generator-provider/pom.xml
blueprints-processor/plugin/model-provider/pom.xml
blueprints-processor/plugin/pom.xml
blueprints-processor/pom.xml
features/ccsdk-features-all/pom.xml
features/features-features/pom.xml
features/installer/pom.xml
features/pom.xml
pom.xml
sdnr/northbound/energysavings/features/pom.xml
sdnr/northbound/energysavings/installer/pom.xml
sdnr/northbound/energysavings/model/pom.xml
sdnr/northbound/energysavings/pom.xml
sdnr/northbound/energysavings/provider/pom.xml
version.properties

index a8e4a28..1899632 100644 (file)
@@ -7,17 +7,14 @@
        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">
+<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.parent</groupId>
                <artifactId>binding-parent</artifactId>
-               <version>1.2.0-SNAPSHOT</version>
-               <relativePath />
+               <version>1.2.0</version>
+               <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.features</groupId>
index a7c3ccb..9d5ddc4 100644 (file)
@@ -1,42 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<!--\r
-  Copyright © 2017-2018 AT&T Intellectual Property.\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 xmlns="http://maven.apache.org/POM/4.0.0"\r
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">\r
-\r
-       <parent>\r
-               <groupId>org.onap.ccsdk.parent</groupId>\r
-               <artifactId>odlparent-lite</artifactId>\r
-               <version>1.2.0-SNAPSHOT</version>\r
-               <relativePath />\r
-       </parent>\r
-\r
-       <groupId>org.onap.ccsdk.features</groupId>\r
-       <version>0.4.0-SNAPSHOT</version>\r
-       <modelVersion>4.0.0</modelVersion>\r
-       <packaging>pom</packaging>\r
-       <artifactId>blueprints-processor-adaptors</artifactId>\r
-       <name>Blueprints Processor Adaptors - POM</name>\r
-       <url>http://wiki.sdn.labs.att.com</url>\r
-       <description>Blueprints Processor Adaptors - POM</description>\r
-       <modules>\r
-               <module>data-adaptor-provider</module>\r
-               <module>rest-adaptor-provider</module>\r
-       </modules>\r
-</project>\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/maven-v4_0_0.xsd">
+
+       <parent>
+               <groupId>org.onap.ccsdk.parent</groupId>
+               <artifactId>odlparent-lite</artifactId>
+               <version>1.2.0</version>
+               <relativePath/>
+       </parent>
+
+       <groupId>org.onap.ccsdk.features</groupId>
+       <version>0.4.0-SNAPSHOT</version>
+       <modelVersion>4.0.0</modelVersion>
+       <packaging>pom</packaging>
+       <artifactId>blueprints-processor-adaptors</artifactId>
+       <name>Blueprints Processor Adaptors - POM</name>
+       <url>http://wiki.sdn.labs.att.com</url>
+       <description>Blueprints Processor Adaptors - POM</description>
+       <modules>
+               <module>data-adaptor-provider</module>
+               <module>rest-adaptor-provider</module>
+       </modules>
+</project>
index 525ee8f..8ecf615 100644 (file)
-<?xml version="1.0" encoding="UTF-8"?>\r
-<!--\r
-  Copyright © 2017-2018 AT&T Intellectual Property.\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 xmlns="http://maven.apache.org/POM/4.0.0"\r
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
-       <modelVersion>4.0.0</modelVersion>\r
-\r
-       <parent>\r
-               <groupId>org.onap.ccsdk.parent</groupId>\r
-               <artifactId>binding-parent</artifactId>\r
-               <version>1.2.0-SNAPSHOT</version>\r
-               <relativePath />\r
-       </parent>\r
-\r
-       <groupId>org.onap.ccsdk.features</groupId>\r
-       <version>0.4.0-SNAPSHOT</version>\r
-       <artifactId>blueprints-rest-adaptor-provider</artifactId>\r
-       <packaging>bundle</packaging>\r
-       <name>Blueprints Rest Adaptor - Provider</name>\r
-       <url>http://maven.apache.org</url>\r
-\r
-       <dependencies>\r
-               <dependency>\r
-                       <groupId>org.apache.commons</groupId>\r
-                       <artifactId>commons-lang3</artifactId>\r
-                       <version>${commons.lang3.version}</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>com.fasterxml.jackson.core</groupId>\r
-                       <artifactId>jackson-databind</artifactId>\r
-                       <version>${jackson.version}</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>com.fasterxml.jackson.core</groupId>\r
-                       <artifactId>jackson-core</artifactId>\r
-                       <version>${jackson.version}</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.apache.httpcomponents</groupId>\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.parent</groupId>
+               <artifactId>binding-parent</artifactId>
+               <version>1.2.0</version>
+               <relativePath/>
+       </parent>
+
+       <groupId>org.onap.ccsdk.features</groupId>
+       <version>0.4.0-SNAPSHOT</version>
+       <artifactId>blueprints-rest-adaptor-provider</artifactId>
+       <packaging>bundle</packaging>
+       <name>Blueprints Rest Adaptor - Provider</name>
+       <url>http://maven.apache.org</url>
+
+       <dependencies>
+               <dependency>
+                       <groupId>org.apache.commons</groupId>
+                       <artifactId>commons-lang3</artifactId>
+                       <version>${commons.lang3.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>org.apache.httpcomponents</groupId>
                        <artifactId>httpcore</artifactId>
                        <version>${apache.httpcomponents.core.version}</version>
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.apache.httpcomponents</groupId>\r
+               </dependency>
+               <dependency>
+                       <groupId>org.apache.httpcomponents</groupId>
                        <artifactId>httpclient</artifactId>
                        <version>${apache.httpcomponents.client.version}</version>
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.springframework</groupId>\r
-                       <artifactId>spring-web</artifactId>\r
+               </dependency>
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-web</artifactId>
                        <version>${spring.version}</version>
-               </dependency>\r
-               <dependency>\r
-                       <groupId>com.att.eelf</groupId>\r
-                       <artifactId>eelf-core</artifactId>\r
-                       <version>${eelf.version}</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>junit</groupId>\r
-                       <artifactId>junit</artifactId>\r
-                       <version>${junit.version}</version>\r
-                       <scope>test</scope>\r
-               </dependency>\r
-       </dependencies>\r
-\r
-       <build>\r
-               <plugins>\r
-                       <plugin>\r
-                               <groupId>org.apache.maven.plugins</groupId>\r
-                               <artifactId>maven-javadoc-plugin</artifactId>\r
-                               <configuration>\r
-                                       <additionalparam>-Xdoclint:none</additionalparam>\r
-                               </configuration>\r
-                       </plugin>\r
-                       <plugin>\r
-                               <groupId>org.apache.felix</groupId>\r
-                               <artifactId>maven-bundle-plugin</artifactId>\r
-                               <version>${maven.bundle.version}</version>\r
-                               <extensions>true</extensions>\r
-                               <configuration>\r
-                                       <instructions>\r
+               </dependency>
+               <dependency>
+                       <groupId>com.att.eelf</groupId>
+                       <artifactId>eelf-core</artifactId>
+                       <version>${eelf.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>junit</groupId>
+                       <artifactId>junit</artifactId>
+                       <version>${junit.version}</version>
+                       <scope>test</scope>
+               </dependency>
+       </dependencies>
+
+       <build>
+               <plugins>
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-javadoc-plugin</artifactId>
+                               <configuration>
+                                       <additionalparam>-Xdoclint:none</additionalparam>
+                               </configuration>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.apache.felix</groupId>
+                               <artifactId>maven-bundle-plugin</artifactId>
+                               <version>${maven.bundle.version}</version>
+                               <extensions>true</extensions>
+                               <configuration>
+                                       <instructions>
                                                <Bundle-Name>${project.artifactId}</Bundle-Name>
                                                <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
                                                <Export-Package>org.onap.ccsdk.features.rest.adaptor,
                                                        org.onap.ccsdk.features.rest.adaptor.data,
                                                        org.onap.ccsdk.features.rest.adaptor.service,
-                                                       org.onap.ccsdk.features.rest.adaptor.utils\r
-                                               </Export-Package>\r
-                                       </instructions>\r
-                               </configuration>\r
-                       </plugin>\r
-               </plugins>\r
-       </build>\r
-</project>\r
+                                                       org.onap.ccsdk.features.rest.adaptor.utils
+                                               </Export-Package>
+                                       </instructions>
+                               </configuration>
+                       </plugin>
+               </plugins>
+       </build>
+</project>
index 619b080..c598319 100644 (file)
   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">
+<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.parent</groupId>
                <artifactId>single-feature-parent</artifactId>
-               <version>1.2.0-SNAPSHOT</version>
-               <relativePath />
+               <version>1.2.0</version>
+               <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.features</groupId>
index a8320ad..52b716e 100755 (executable)
   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">
+<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.parent</groupId>
                <artifactId>feature-repo-parent</artifactId>
-               <version>1.2.0-SNAPSHOT</version>
-               <relativePath />
+               <version>1.2.0</version>
+               <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.features</groupId>
index cbc4707..adbb04e 100755 (executable)
   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">
+<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.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.2.0-SNAPSHOT</version>
-               <relativePath />
+               <version>1.2.0</version>
+               <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.features</groupId>
index 417ddbb..932f757 100644 (file)
-<?xml version="1.0" encoding="UTF-8"?>\r
-<!--\r
-  Copyright © 2017-2018 AT&T Intellectual Property.\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 xmlns="http://maven.apache.org/POM/4.0.0"\r
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
-       <modelVersion>4.0.0</modelVersion>\r
-       <parent>\r
-               <groupId>org.onap.ccsdk.parent</groupId>\r
-               <artifactId>odlparent-lite</artifactId>\r
-               <version>1.2.0-SNAPSHOT</version>\r
-               <relativePath />\r
-       </parent>\r
-\r
-       <groupId>org.onap.ccsdk.features</groupId>\r
-       <artifactId>blueprints-processor-installer</artifactId>\r
-       <version>0.4.0-SNAPSHOT</version>\r
-       <packaging>pom</packaging>\r
-       <name>Blueprints Processor :: ${project.artifactId}</name>\r
-\r
-       <properties>\r
-               <application.name>blueprints-processor</application.name>\r
-               <features.boot>blueprints-processor-features</features.boot>\r
-               <features.repositories>mvn:org.onap.ccsdk.features/ccsdk-features/blueprints-processor-features/${project.version}/xml/features</features.repositories>\r
-               <include.transitive.dependencies>false</include.transitive.dependencies>\r
-       </properties>\r
-\r
-       <dependencies>\r
-               <dependency>\r
-                       <groupId>org.onap.ccsdk.features</groupId>\r
-                       <artifactId>ccsdk-blueprints-processor</artifactId>\r
-                       <version>${project.version}</version>\r
-                       <classifier>features</classifier>\r
-                       <type>xml</type>\r
-                       <exclusions>\r
-                               <exclusion>\r
-                                       <groupId>*</groupId>\r
-                                       <artifactId>*</artifactId>\r
-                               </exclusion>\r
-                       </exclusions>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.onap.ccsdk.features</groupId>\r
-                       <artifactId>blueprints-data-adaptor-provider</artifactId>\r
-                       <version>${project.version}</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.onap.ccsdk.features</groupId>\r
-                       <artifactId>blueprints-rest-adaptor-provider</artifactId>\r
-                       <version>${project.version}</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.onap.ccsdk.features</groupId>\r
-                       <artifactId>blueprints-assignment-provider</artifactId>\r
-                       <version>${project.version}</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.onap.ccsdk.features</groupId>\r
-                       <artifactId>blueprints-generator-provider</artifactId>\r
-                       <version>${project.version}</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.onap.ccsdk.features</groupId>\r
-                       <artifactId>blueprints-model-provider</artifactId>\r
-                       <version>${project.version}</version>\r
-               </dependency>\r
-       </dependencies>\r
-\r
-       <build>\r
-               <plugins>\r
-                       <plugin>\r
-                               <artifactId>maven-assembly-plugin</artifactId>\r
-                               <executions>\r
-                                       <execution>\r
-                                               <id>maven-repo-zip</id>\r
-                                               <goals>\r
-                                                       <goal>single</goal>\r
-                                               </goals>\r
-                                               <phase>package</phase>\r
-                                               <configuration>\r
-                                                       <attach>true</attach>\r
-                                                       <finalName>stage/${application.name}-${project.version}</finalName>\r
-                                                       <descriptors>\r
-                                                               <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor>\r
-                                                       </descriptors>\r
-                                                       <appendAssemblyId>true</appendAssemblyId>\r
-                                               </configuration>\r
-                                       </execution>\r
-                                       <execution>\r
-                                               <id>installer-zip</id>\r
-                                               <goals>\r
-                                                       <goal>single</goal>\r
-                                               </goals>\r
-                                               <phase>package</phase>\r
-                                               <configuration>\r
-                                                       <attach>true</attach>\r
-                                                       <finalName>${application.name}-${project.version}-installer</finalName>\r
-                                                       <descriptors>\r
-                                                               <descriptor>src/assembly/assemble_installer_zip.xml</descriptor>\r
-                                                       </descriptors>\r
-                                                       <appendAssemblyId>false</appendAssemblyId>\r
-                                               </configuration>\r
-                                       </execution>\r
-                               </executions>\r
-                       </plugin>\r
-                       <plugin>\r
-                               <groupId>org.apache.maven.plugins</groupId>\r
-                               <artifactId>maven-dependency-plugin</artifactId>\r
-                               <executions>\r
-                                       <execution>\r
-                                               <id>copy-dependencies</id>\r
-                                               <goals>\r
-                                                       <goal>copy-dependencies</goal>\r
-                                               </goals>\r
-                                               <phase>prepare-package</phase>\r
-                                               <configuration>\r
-                                                       <transitive>false</transitive>\r
-                                                       <outputDirectory>${project.build.directory}/assembly/system</outputDirectory>\r
-                                                       <overWriteReleases>false</overWriteReleases>\r
-                                                       <overWriteSnapshots>true</overWriteSnapshots>\r
-                                                       <overWriteIfNewer>true</overWriteIfNewer>\r
-                                                       <useRepositoryLayout>true</useRepositoryLayout>\r
-                                                       <addParentPoms>false</addParentPoms>\r
-                                                       <copyPom>false</copyPom>\r
-                                                       <includeGroupIds>org.onap.ccsdk.features</includeGroupIds>\r
-                                                       <scope>provided</scope>\r
-                                               </configuration>\r
-                                       </execution>\r
-                               </executions>\r
-                       </plugin>\r
-                       <plugin>\r
-                               <artifactId>maven-resources-plugin</artifactId>\r
-                               <version>2.6</version>\r
-                               <executions>\r
-                                       <execution>\r
-                                               <id>copy-version</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/stage</outputDirectory>\r
-                                                       <resources>\r
-                                                               <resource>\r
-                                                                       <directory>src/main/resources/scripts</directory>\r
-                                                                       <includes>\r
-                                                                               <include>install-feature.sh</include>\r
-                                                                       </includes>\r
-                                                                       <filtering>true</filtering>\r
-                                                               </resource>\r
-                                                       </resources>\r
-                                               </configuration>\r
-                                       </execution>\r
-                               </executions>\r
-                       </plugin>\r
-               </plugins>\r
-       </build>\r
-</project>\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.parent</groupId>
+               <artifactId>odlparent-lite</artifactId>
+               <version>1.2.0</version>
+               <relativePath/>
+       </parent>
+
+       <groupId>org.onap.ccsdk.features</groupId>
+       <artifactId>blueprints-processor-installer</artifactId>
+       <version>0.4.0-SNAPSHOT</version>
+       <packaging>pom</packaging>
+       <name>Blueprints Processor :: ${project.artifactId}</name>
+
+       <properties>
+               <application.name>blueprints-processor</application.name>
+               <features.boot>blueprints-processor-features</features.boot>
+               <features.repositories>mvn:org.onap.ccsdk.features/ccsdk-features/blueprints-processor-features/${project.version}/xml/features</features.repositories>
+               <include.transitive.dependencies>false</include.transitive.dependencies>
+       </properties>
+
+       <dependencies>
+               <dependency>
+                       <groupId>org.onap.ccsdk.features</groupId>
+                       <artifactId>ccsdk-blueprints-processor</artifactId>
+                       <version>${project.version}</version>
+                       <classifier>features</classifier>
+                       <type>xml</type>
+                       <exclusions>
+                               <exclusion>
+                                       <groupId>*</groupId>
+                                       <artifactId>*</artifactId>
+                               </exclusion>
+                       </exclusions>
+               </dependency>
+               <dependency>
+                       <groupId>org.onap.ccsdk.features</groupId>
+                       <artifactId>blueprints-data-adaptor-provider</artifactId>
+                       <version>${project.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.onap.ccsdk.features</groupId>
+                       <artifactId>blueprints-rest-adaptor-provider</artifactId>
+                       <version>${project.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.onap.ccsdk.features</groupId>
+                       <artifactId>blueprints-assignment-provider</artifactId>
+                       <version>${project.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.onap.ccsdk.features</groupId>
+                       <artifactId>blueprints-generator-provider</artifactId>
+                       <version>${project.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.onap.ccsdk.features</groupId>
+                       <artifactId>blueprints-model-provider</artifactId>
+                       <version>${project.version}</version>
+               </dependency>
+       </dependencies>
+
+       <build>
+               <plugins>
+                       <plugin>
+                               <artifactId>maven-assembly-plugin</artifactId>
+                               <executions>
+                                       <execution>
+                                               <id>maven-repo-zip</id>
+                                               <goals>
+                                                       <goal>single</goal>
+                                               </goals>
+                                               <phase>package</phase>
+                                               <configuration>
+                                                       <attach>true</attach>
+                                                       <finalName>stage/${application.name}-${project.version}</finalName>
+                                                       <descriptors>
+                                                               <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor>
+                                                       </descriptors>
+                                                       <appendAssemblyId>true</appendAssemblyId>
+                                               </configuration>
+                                       </execution>
+                                       <execution>
+                                               <id>installer-zip</id>
+                                               <goals>
+                                                       <goal>single</goal>
+                                               </goals>
+                                               <phase>package</phase>
+                                               <configuration>
+                                                       <attach>true</attach>
+                                                       <finalName>${application.name}-${project.version}-installer</finalName>
+                                                       <descriptors>
+                                                               <descriptor>src/assembly/assemble_installer_zip.xml</descriptor>
+                                                       </descriptors>
+                                                       <appendAssemblyId>false</appendAssemblyId>
+                                               </configuration>
+                                       </execution>
+                               </executions>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-dependency-plugin</artifactId>
+                               <executions>
+                                       <execution>
+                                               <id>copy-dependencies</id>
+                                               <goals>
+                                                       <goal>copy-dependencies</goal>
+                                               </goals>
+                                               <phase>prepare-package</phase>
+                                               <configuration>
+                                                       <transitive>false</transitive>
+                                                       <outputDirectory>${project.build.directory}/assembly/system</outputDirectory>
+                                                       <overWriteReleases>false</overWriteReleases>
+                                                       <overWriteSnapshots>true</overWriteSnapshots>
+                                                       <overWriteIfNewer>true</overWriteIfNewer>
+                                                       <useRepositoryLayout>true</useRepositoryLayout>
+                                                       <addParentPoms>false</addParentPoms>
+                                                       <copyPom>false</copyPom>
+                                                       <includeGroupIds>org.onap.ccsdk.features</includeGroupIds>
+                                                       <scope>provided</scope>
+                                               </configuration>
+                                       </execution>
+                               </executions>
+                       </plugin>
+                       <plugin>
+                               <artifactId>maven-resources-plugin</artifactId>
+                               <version>2.6</version>
+                               <executions>
+                                       <execution>
+                                               <id>copy-version</id>
+                                               <goals>
+                                                       <goal>copy-resources</goal>
+                                               </goals><!-- here the phase you need -->
+                                               <phase>validate</phase>
+                                               <configuration>
+                                                       <outputDirectory>${basedir}/target/stage</outputDirectory>
+                                                       <resources>
+                                                               <resource>
+                                                                       <directory>src/main/resources/scripts</directory>
+                                                                       <includes>
+                                                                               <include>install-feature.sh</include>
+                                                                       </includes>
+                                                                       <filtering>true</filtering>
+                                                               </resource>
+                                                       </resources>
+                                               </configuration>
+                                       </execution>
+                               </executions>
+                       </plugin>
+               </plugins>
+       </build>
+</project>
index 776a10f..7fbce45 100644 (file)
@@ -1,47 +1,44 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<!--\r
-  Copyright © 2017-2018 AT&T Intellectual Property.\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 xmlns="http://maven.apache.org/POM/4.0.0"\r
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
-       <modelVersion>4.0.0</modelVersion>\r
-\r
-       <parent>\r
-               <groupId>org.onap.ccsdk.parent</groupId>\r
-               <artifactId>binding-parent</artifactId>\r
-               <version>1.2.0-SNAPSHOT</version>\r
-               <relativePath />\r
-       </parent>\r
-\r
-       <groupId>org.onap.ccsdk.features</groupId>\r
-       <version>0.4.0-SNAPSHOT</version>\r
-       <artifactId>blueprints-assignment-provider</artifactId>\r
-       <packaging>bundle</packaging>\r
-       <name>Blueprints Assignment - Provider</name>\r
-       <url>http://maven.apache.org</url>\r
-\r
-       <dependencies>\r
-               <dependency>\r
-                       <groupId>org.onap.ccsdk.features</groupId>\r
-                       <artifactId>blueprints-generator-provider</artifactId>\r
-                       <version>${project.version}</version>\r
-               </dependency>\r
-               <dependency>\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.parent</groupId>
+               <artifactId>binding-parent</artifactId>
+               <version>1.2.0</version>
+               <relativePath/>
+       </parent>
+
+       <groupId>org.onap.ccsdk.features</groupId>
+       <version>0.4.0-SNAPSHOT</version>
+       <artifactId>blueprints-assignment-provider</artifactId>
+       <packaging>bundle</packaging>
+       <name>Blueprints Assignment - Provider</name>
+       <url>http://maven.apache.org</url>
+
+       <dependencies>
+               <dependency>
+                       <groupId>org.onap.ccsdk.features</groupId>
+                       <artifactId>blueprints-generator-provider</artifactId>
+                       <version>${project.version}</version>
+               </dependency>
+               <dependency>
                        <groupId>com.fasterxml.jackson.core</groupId>
                        <artifactId>jackson-core</artifactId>
                        <version>${jackson.version}</version>
                        <version>${jackson.version}</version>
                </dependency>
                <dependency>
-                       <groupId>junit</groupId>\r
-                       <artifactId>junit</artifactId>\r
-                       <version>${junit.version}</version>\r
-                       <scope>test</scope>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.apache.sling</groupId>\r
-                       <artifactId>org.apache.sling.testing.osgi-mock</artifactId>\r
-                       <version>2.3.2</version>\r
-                       <scope>test</scope>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.powermock</groupId>\r
-                       <artifactId>powermock-api-mockito</artifactId>\r
-                       <version>1.6.6</version>\r
-                       <scope>test</scope>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.powermock</groupId>\r
-                       <artifactId>powermock-module-junit4</artifactId>\r
-                       <version>1.6.6</version>\r
-                       <scope>test</scope>\r
-               </dependency>\r
-       </dependencies>\r
-\r
-       <build>\r
-               <plugins>\r
-                       <plugin>\r
-                               <groupId>org.apache.maven.plugins</groupId>\r
-                               <artifactId>maven-javadoc-plugin</artifactId>\r
-                               <configuration>\r
-                                       <additionalparam>-Xdoclint:none</additionalparam>\r
-                               </configuration>\r
-                       </plugin>\r
-                       <plugin>\r
-                               <groupId>org.apache.felix</groupId>\r
-                               <artifactId>maven-bundle-plugin</artifactId>\r
-                               <version>${maven.bundle.version}</version>\r
-                               <extensions>true</extensions>\r
-                               <configuration>\r
-                                       <instructions>\r
+                       <groupId>junit</groupId>
+                       <artifactId>junit</artifactId>
+                       <version>${junit.version}</version>
+                       <scope>test</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.apache.sling</groupId>
+                       <artifactId>org.apache.sling.testing.osgi-mock</artifactId>
+                       <version>2.3.2</version>
+                       <scope>test</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.powermock</groupId>
+                       <artifactId>powermock-api-mockito</artifactId>
+                       <version>1.6.6</version>
+                       <scope>test</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.powermock</groupId>
+                       <artifactId>powermock-module-junit4</artifactId>
+                       <version>1.6.6</version>
+                       <scope>test</scope>
+               </dependency>
+       </dependencies>
+
+       <build>
+               <plugins>
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-javadoc-plugin</artifactId>
+                               <configuration>
+                                       <additionalparam>-Xdoclint:none</additionalparam>
+                               </configuration>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.apache.felix</groupId>
+                               <artifactId>maven-bundle-plugin</artifactId>
+                               <version>${maven.bundle.version}</version>
+                               <extensions>true</extensions>
+                               <configuration>
+                                       <instructions>
                                                <Bundle-Name>${project.artifactId}</Bundle-Name>
                                                <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
                                                <Export-Package>org.onap.ccsdk.features.assignment,
                                                        org.onap.ccsdk.features.assignment.data,
                                                        org.onap.ccsdk.features.assignment.service,
                                                        org.onap.ccsdk.features.assignment.processor,
-                                                       org.onap.ccsdk.features.assignment.processor.custom\r
-                                               </Export-Package>\r
-                                       </instructions>\r
-                               </configuration>\r
-                       </plugin>\r
-               </plugins>\r
-       </build>\r
-</project>\r
+                                                       org.onap.ccsdk.features.assignment.processor.custom
+                                               </Export-Package>
+                                       </instructions>
+                               </configuration>
+                       </plugin>
+               </plugins>
+       </build>
+</project>
index 8720388..17daad8 100644 (file)
-<?xml version="1.0" encoding="UTF-8"?>\r
-<!--\r
-  Copyright © 2017-2018 AT&T Intellectual Property.\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 xmlns="http://maven.apache.org/POM/4.0.0"\r
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
-       <modelVersion>4.0.0</modelVersion>\r
-\r
-       <parent>\r
-               <groupId>org.onap.ccsdk.parent</groupId>\r
-               <artifactId>binding-parent</artifactId>\r
-               <version>1.2.0-SNAPSHOT</version>\r
-               <relativePath />\r
-       </parent>\r
-\r
-       <groupId>org.onap.ccsdk.features</groupId>\r
-       <version>0.4.0-SNAPSHOT</version>\r
-       <artifactId>blueprints-generator-provider</artifactId>\r
-       <packaging>bundle</packaging>\r
-       <name>Blueprints Generator - Provider</name>\r
-       <url>http://maven.apache.org</url>\r
-\r
-       <dependencies>\r
-               <dependency>\r
-                       <groupId>org.onap.ccsdk.features</groupId>\r
-                       <artifactId>blueprints-model-provider</artifactId>\r
-                       <version>${project.version}</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.onap.ccsdk.features</groupId>\r
-                       <artifactId>blueprints-data-adaptor-provider</artifactId>\r
-                       <version>${project.version}</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>com.fasterxml.jackson.core</groupId>\r
-                       <artifactId>jackson-core</artifactId>\r
-                       <version>${jackson.version}</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>com.fasterxml.jackson.core</groupId>\r
-                       <artifactId>jackson-databind</artifactId>\r
-                       <version>${jackson.version}</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>com.fasterxml.jackson.core</groupId>\r
-                       <artifactId>jackson-annotations</artifactId>\r
-                       <version>${jackson.version}</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>com.fasterxml.jackson.module</groupId>\r
-                       <artifactId>jackson-module-jsonSchema</artifactId>\r
-                       <version>${jackson.version}</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>commons-io</groupId>\r
-                       <artifactId>commons-io</artifactId>\r
-                       <version>2.5</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.apache.velocity</groupId>\r
-                       <artifactId>velocity</artifactId>\r
-                       <version>1.7</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.powermock</groupId>\r
-                       <artifactId>powermock-api-mockito</artifactId>\r
-                       <version>1.6.6</version>\r
-                       <scope>test</scope>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.powermock</groupId>\r
-                       <artifactId>powermock-module-junit4</artifactId>\r
-                       <version>1.6.6</version>\r
-                       <scope>test</scope>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>junit</groupId>\r
-                       <artifactId>junit</artifactId>\r
-                       <version>${junit.version}</version>\r
-                       <scope>test</scope>\r
-               </dependency>\r
-       </dependencies>\r
-\r
-       <build>\r
-               <plugins>\r
-                       <plugin>\r
-                               <groupId>org.apache.felix</groupId>\r
-                               <artifactId>maven-bundle-plugin</artifactId>\r
-                               <version>${maven.bundle.version}</version>\r
-                               <extensions>true</extensions>\r
-                               <configuration>\r
-                                       <instructions>\r
-                                               <Bundle-Name>${project.artifactId}</Bundle-Name>\r
-                                               <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>\r
-                                               <Export-Package>\r
-                                                       org.onap.ccsdk.features.generator,\r
-                                                       org.onap.ccsdk.features.generator.data,\r
-                                                       org.onap.ccsdk.features.generator.service,\r
-                                                       org.onap.ccsdk.features.generator.tool\r
-                                               </Export-Package>\r
-                                       </instructions>\r
-                               </configuration>\r
-                       </plugin>\r
-               </plugins>\r
-       </build>\r
-</project>\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.parent</groupId>
+               <artifactId>binding-parent</artifactId>
+               <version>1.2.0</version>
+               <relativePath/>
+       </parent>
+
+       <groupId>org.onap.ccsdk.features</groupId>
+       <version>0.4.0-SNAPSHOT</version>
+       <artifactId>blueprints-generator-provider</artifactId>
+       <packaging>bundle</packaging>
+       <name>Blueprints Generator - Provider</name>
+       <url>http://maven.apache.org</url>
+
+       <dependencies>
+               <dependency>
+                       <groupId>org.onap.ccsdk.features</groupId>
+                       <artifactId>blueprints-model-provider</artifactId>
+                       <version>${project.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.onap.ccsdk.features</groupId>
+                       <artifactId>blueprints-data-adaptor-provider</artifactId>
+                       <version>${project.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-databind</artifactId>
+                       <version>${jackson.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>com.fasterxml.jackson.core</groupId>
+                       <artifactId>jackson-annotations</artifactId>
+                       <version>${jackson.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>com.fasterxml.jackson.module</groupId>
+                       <artifactId>jackson-module-jsonSchema</artifactId>
+                       <version>${jackson.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>commons-io</groupId>
+                       <artifactId>commons-io</artifactId>
+                       <version>2.5</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.apache.velocity</groupId>
+                       <artifactId>velocity</artifactId>
+                       <version>1.7</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.powermock</groupId>
+                       <artifactId>powermock-api-mockito</artifactId>
+                       <version>1.6.6</version>
+                       <scope>test</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.powermock</groupId>
+                       <artifactId>powermock-module-junit4</artifactId>
+                       <version>1.6.6</version>
+                       <scope>test</scope>
+               </dependency>
+               <dependency>
+                       <groupId>junit</groupId>
+                       <artifactId>junit</artifactId>
+                       <version>${junit.version}</version>
+                       <scope>test</scope>
+               </dependency>
+       </dependencies>
+
+       <build>
+               <plugins>
+                       <plugin>
+                               <groupId>org.apache.felix</groupId>
+                               <artifactId>maven-bundle-plugin</artifactId>
+                               <version>${maven.bundle.version}</version>
+                               <extensions>true</extensions>
+                               <configuration>
+                                       <instructions>
+                                               <Bundle-Name>${project.artifactId}</Bundle-Name>
+                                               <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
+                                               <Export-Package>
+                                                       org.onap.ccsdk.features.generator,
+                                                       org.onap.ccsdk.features.generator.data,
+                                                       org.onap.ccsdk.features.generator.service,
+                                                       org.onap.ccsdk.features.generator.tool
+                                               </Export-Package>
+                                       </instructions>
+                               </configuration>
+                       </plugin>
+               </plugins>
+       </build>
+</project>
index 0b9b4de..2fbb0f0 100644 (file)
-<?xml version="1.0" encoding="UTF-8"?>\r
-<!--\r
-  Copyright © 2017-2018 AT&T Intellectual Property.\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 xmlns="http://maven.apache.org/POM/4.0.0"\r
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
-       <modelVersion>4.0.0</modelVersion>\r
-\r
-       <parent>\r
-               <groupId>org.onap.ccsdk.parent</groupId>\r
-               <artifactId>binding-parent</artifactId>\r
-               <version>1.2.0-SNAPSHOT</version>\r
-               <relativePath />\r
-       </parent>\r
-\r
-       <groupId>org.onap.ccsdk.features</groupId>\r
-       <version>0.4.0-SNAPSHOT</version>\r
-       <artifactId>blueprints-model-provider</artifactId>\r
-       <packaging>bundle</packaging>\r
-       <name>Blueprints Model - Provider</name>\r
-       <url>http://maven.apache.org</url>\r
-\r
-       <dependencies>\r
-               <dependency>\r
-                       <groupId>com.fasterxml.jackson.core</groupId>\r
-                       <artifactId>jackson-core</artifactId>\r
-                       <version>${jackson.version}</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>com.fasterxml.jackson.core</groupId>\r
-                       <artifactId>jackson-databind</artifactId>\r
-                       <version>${jackson.version}</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>com.fasterxml.jackson.core</groupId>\r
-                       <artifactId>jackson-annotations</artifactId>\r
-                       <version>${jackson.version}</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>com.fasterxml.jackson.module</groupId>\r
-                       <artifactId>jackson-module-jsonSchema</artifactId>\r
-                       <version>${jackson.version}</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>com.jayway.jsonpath</groupId>\r
-                       <artifactId>json-path</artifactId>\r
-                       <version>2.3.0</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.onap.ccsdk.features</groupId>\r
-                       <artifactId>blueprints-rest-adaptor-provider</artifactId>\r
-                       <version>${project.version}</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.onap.ccsdk.features</groupId>\r
-                       <artifactId>blueprints-data-adaptor-provider</artifactId>\r
-                       <version>${project.version}</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.powermock</groupId>\r
-                       <artifactId>powermock-api-mockito</artifactId>\r
-                       <version>1.6.6</version>\r
-                       <scope>test</scope>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.powermock</groupId>\r
-                       <artifactId>powermock-module-junit4</artifactId>\r
-                       <version>1.6.6</version>\r
-                       <scope>test</scope>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.apache.sling</groupId>\r
-                       <artifactId>org.apache.sling.testing.osgi-mock</artifactId>\r
-                       <version>2.3.2</version>\r
-                       <scope>test</scope>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>junit</groupId>\r
-                       <artifactId>junit</artifactId>\r
-                       <version>${junit.version}</version>\r
-                       <scope>test</scope>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>commons-collections</groupId>\r
-                       <artifactId>commons-collections</artifactId>\r
-                       <version>3.2.2</version>\r
-               </dependency>\r
-       </dependencies>\r
-\r
-       <build>\r
-               <plugins>\r
-                       <plugin>\r
-                               <groupId>org.apache.maven.plugins</groupId>\r
-                               <artifactId>maven-javadoc-plugin</artifactId>\r
-                               <configuration>\r
-                                       <additionalparam>-Xdoclint:none</additionalparam>\r
-                               </configuration>\r
-                       </plugin>\r
-                       <plugin>\r
-                               <groupId>org.apache.felix</groupId>\r
-                               <artifactId>maven-bundle-plugin</artifactId>\r
-                               <version>${maven.bundle.version}</version>\r
-                               <extensions>true</extensions>\r
-                               <configuration>\r
-                                       <instructions>\r
-                                               <Bundle-Name>${project.artifactId}</Bundle-Name>\r
-                                               <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>\r
-                                               <Export-Package>org.onap.ccsdk.features.model,\r
-                                                       org.onap.ccsdk.features.model.data,\r
-                                                       org.onap.ccsdk.features.model.data.api,\r
-                                                       org.onap.ccsdk.features.model.data.dict,\r
-                                                       org.onap.ccsdk.features.model.domain,\r
-                                                       org.onap.ccsdk.features.model.service,\r
-                                                       org.onap.ccsdk.features.model.utils,\r
-                                                       org.onap.ccsdk.features.model.validator\r
-                                               </Export-Package>\r
-                                       </instructions>\r
-                               </configuration>\r
-                       </plugin>\r
-               </plugins>\r
-       </build>\r
-</project>\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.parent</groupId>
+               <artifactId>binding-parent</artifactId>
+               <version>1.2.0</version>
+               <relativePath/>
+       </parent>
+
+       <groupId>org.onap.ccsdk.features</groupId>
+       <version>0.4.0-SNAPSHOT</version>
+       <artifactId>blueprints-model-provider</artifactId>
+       <packaging>bundle</packaging>
+       <name>Blueprints Model - Provider</name>
+       <url>http://maven.apache.org</url>
+
+       <dependencies>
+               <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-databind</artifactId>
+                       <version>${jackson.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>com.fasterxml.jackson.core</groupId>
+                       <artifactId>jackson-annotations</artifactId>
+                       <version>${jackson.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>com.fasterxml.jackson.module</groupId>
+                       <artifactId>jackson-module-jsonSchema</artifactId>
+                       <version>${jackson.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>com.jayway.jsonpath</groupId>
+                       <artifactId>json-path</artifactId>
+                       <version>2.3.0</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.onap.ccsdk.features</groupId>
+                       <artifactId>blueprints-rest-adaptor-provider</artifactId>
+                       <version>${project.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.onap.ccsdk.features</groupId>
+                       <artifactId>blueprints-data-adaptor-provider</artifactId>
+                       <version>${project.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.powermock</groupId>
+                       <artifactId>powermock-api-mockito</artifactId>
+                       <version>1.6.6</version>
+                       <scope>test</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.powermock</groupId>
+                       <artifactId>powermock-module-junit4</artifactId>
+                       <version>1.6.6</version>
+                       <scope>test</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.apache.sling</groupId>
+                       <artifactId>org.apache.sling.testing.osgi-mock</artifactId>
+                       <version>2.3.2</version>
+                       <scope>test</scope>
+               </dependency>
+               <dependency>
+                       <groupId>junit</groupId>
+                       <artifactId>junit</artifactId>
+                       <version>${junit.version}</version>
+                       <scope>test</scope>
+               </dependency>
+               <dependency>
+                       <groupId>commons-collections</groupId>
+                       <artifactId>commons-collections</artifactId>
+                       <version>3.2.2</version>
+               </dependency>
+       </dependencies>
+
+       <build>
+               <plugins>
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-javadoc-plugin</artifactId>
+                               <configuration>
+                                       <additionalparam>-Xdoclint:none</additionalparam>
+                               </configuration>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.apache.felix</groupId>
+                               <artifactId>maven-bundle-plugin</artifactId>
+                               <version>${maven.bundle.version}</version>
+                               <extensions>true</extensions>
+                               <configuration>
+                                       <instructions>
+                                               <Bundle-Name>${project.artifactId}</Bundle-Name>
+                                               <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
+                                               <Export-Package>org.onap.ccsdk.features.model,
+                                                       org.onap.ccsdk.features.model.data,
+                                                       org.onap.ccsdk.features.model.data.api,
+                                                       org.onap.ccsdk.features.model.data.dict,
+                                                       org.onap.ccsdk.features.model.domain,
+                                                       org.onap.ccsdk.features.model.service,
+                                                       org.onap.ccsdk.features.model.utils,
+                                                       org.onap.ccsdk.features.model.validator
+                                               </Export-Package>
+                                       </instructions>
+                               </configuration>
+                       </plugin>
+               </plugins>
+       </build>
+</project>
index 2626c42..58b3fe3 100644 (file)
@@ -1,42 +1,40 @@
-<!--\r
-  Copyright © 2017-2018 AT&T Intellectual Property.\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 xmlns="http://maven.apache.org/POM/4.0.0"\r
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
-       <modelVersion>4.0.0</modelVersion>\r
-\r
-       <parent>\r
-               <groupId>org.onap.ccsdk.parent</groupId>\r
-               <artifactId>odlparent-lite</artifactId>\r
-               <version>1.2.0-SNAPSHOT</version>\r
-               <relativePath />\r
-       </parent>\r
-\r
-       <version>0.4.0-SNAPSHOT</version>\r
-       <artifactId>blueprints-processor-plugin</artifactId>\r
-       <groupId>org.onap.ccsdk.features</groupId>\r
-       <packaging>pom</packaging>\r
-       <name>Blueprints Processor Plugins - POM</name>\r
-       <description>Blueprints Processor Plugins - POM</description>\r
-       <modules>\r
-               <module>model-provider</module>\r
-               <module>assignment-provider</module>\r
-               <module>generator-provider</module>\r
-       </modules>\r
-\r
-</project>\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.parent</groupId>
+               <artifactId>odlparent-lite</artifactId>
+               <version>1.2.0</version>
+               <relativePath/>
+       </parent>
+
+       <version>0.4.0-SNAPSHOT</version>
+       <artifactId>blueprints-processor-plugin</artifactId>
+       <groupId>org.onap.ccsdk.features</groupId>
+       <packaging>pom</packaging>
+       <name>Blueprints Processor Plugins - POM</name>
+       <description>Blueprints Processor Plugins - POM</description>
+       <modules>
+               <module>model-provider</module>
+               <module>assignment-provider</module>
+               <module>generator-provider</module>
+       </modules>
+
+</project>
index fabdc02..ea3fb29 100644 (file)
@@ -1,47 +1,44 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<!--\r
-  Copyright © 2017-2018 AT&T Intellectual Property.\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 xmlns="http://maven.apache.org/POM/4.0.0"\r
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">\r
-       <modelVersion>4.0.0</modelVersion>\r
-\r
-       <parent>\r
-               <groupId>org.onap.ccsdk.parent</groupId>\r
-               <artifactId>odlparent-lite</artifactId>\r
-               <version>1.2.0-SNAPSHOT</version>\r
-               <relativePath />\r
-       </parent>\r
-\r
-       <groupId>org.onap.ccsdk.features</groupId>\r
-       <artifactId>blueprints-processor</artifactId>\r
-       <version>0.4.0-SNAPSHOT</version>\r
-       <packaging>pom</packaging>\r
-\r
-       <name>Blueprints Processor Module</name>\r
-       <url>http://wiki.sdn.labs.att.com</url>\r
-       <description>Blueprints Processor Blueprints Processor</description>\r
-\r
-       <modules>\r
-               <module>adaptors</module>\r
-               <module>plugin</module>\r
-               <module>features</module>\r
-               <module>installer</module>\r
-       </modules>\r
-\r
-</project>\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/maven-v4_0_0.xsd">
+       <modelVersion>4.0.0</modelVersion>
+
+       <parent>
+               <groupId>org.onap.ccsdk.parent</groupId>
+               <artifactId>odlparent-lite</artifactId>
+               <version>1.2.0</version>
+               <relativePath/>
+       </parent>
+
+       <groupId>org.onap.ccsdk.features</groupId>
+       <artifactId>blueprints-processor</artifactId>
+       <version>0.4.0-SNAPSHOT</version>
+       <packaging>pom</packaging>
+
+       <name>Blueprints Processor Module</name>
+       <url>http://wiki.sdn.labs.att.com</url>
+       <description>Blueprints Processor Blueprints Processor</description>
+
+       <modules>
+               <module>adaptors</module>
+               <module>plugin</module>
+               <module>features</module>
+               <module>installer</module>
+       </modules>
+
+</project>
index 849aaee..63c066d 100644 (file)
   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">
+<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.parent</groupId>
                <artifactId>single-feature-parent</artifactId>
-               <version>1.2.0-SNAPSHOT</version>
-               <relativePath />
+               <version>1.2.0</version>
+               <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.features</groupId>
index 3d4a668..ca2fb69 100644 (file)
   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">
+<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.parent</groupId>
                <artifactId>feature-repo-parent</artifactId>
-               <version>1.2.0-SNAPSHOT</version>
-               <relativePath />
+               <version>1.2.0</version>
+               <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.features</groupId>
index adb93a5..52e5faf 100755 (executable)
   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">
+<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.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.2.0-SNAPSHOT</version>
-               <relativePath />
+               <version>1.2.0</version>
+               <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.features</groupId>
index 61c752d..a905586 100755 (executable)
   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">
+<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.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.2.0-SNAPSHOT</version>
-               <relativePath />
+               <version>1.2.0</version>
+               <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.features</groupId>
diff --git a/pom.xml b/pom.xml
index ac8f243..e38d20f 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -1,70 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<project xmlns="http://maven.apache.org/POM/4.0.0"\r
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
-       <modelVersion>4.0.0</modelVersion>\r
-\r
-       <parent>\r
-               <groupId>org.onap.ccsdk.parent</groupId>\r
-               <artifactId>odlparent-lite</artifactId>\r
-               <version>1.2.0-SNAPSHOT</version>\r
-               <relativePath />\r
-       </parent>\r
-\r
-       <groupId>org.onap.ccsdk.features</groupId>\r
-       <artifactId>ccsdk-features</artifactId>\r
-       <version>0.4.0-SNAPSHOT</version>\r
-       <packaging>pom</packaging>\r
-\r
-       <name>ccsdk-features</name>\r
-       <description>CCSDK applications</description>\r
-       <url>https://wiki.onap.org</url>\r
-       <organization>\r
-               <name>ONAP</name>\r
-       </organization>\r
-\r
-       <modules>\r
-               <module>features</module>\r
-               <module>blueprints-processor</module>\r
-       </modules>\r
-\r
-       <scm>\r
-               <connection>scm:git:ssh://git@${onap.git.host}/features.git</connection>\r
-               <developerConnection>scm:git:ssh://${onap.git.host}:${onap.git.port}/${onap.git.project}/features.git</developerConnection>\r
-               <url>${onap.git.protocol}://${onap.git.host}/projects/${onap.git.project}/repos/features/browse</url>\r
-       </scm>\r
-\r
-       <profiles>\r
-               <profile>\r
-                       <id>blackduck</id>\r
-                       <activation>\r
-                               <property>\r
-                                       <name>blackduck-scan</name>\r
-                               </property>\r
-                       </activation>\r
-                       <build>\r
-                               <plugins>\r
-                                       <plugin>\r
-                                               <groupId>com.blackducksoftware.integration</groupId>\r
-                                               <artifactId>hub-maven-plugin</artifactId>\r
-                                               <version>1.4.0</version>\r
-                                               <inherited>false</inherited>\r
-                                               <configuration>\r
-                                                       <hubProjectName>${project.name}</hubProjectName>\r
-                                                       <outputDirectory>${project.basedir}</outputDirectory>\r
-                                               </configuration>\r
-                                               <executions>\r
-                                                       <execution>\r
-                                                               <id>create-bdio-file</id>\r
-                                                               <phase>package</phase>\r
-                                                               <goals>\r
-                                                                       <goal>createHubOutput</goal>\r
-                                                               </goals>\r
-                                                       </execution>\r
-                                               </executions>\r
-                                       </plugin>\r
-                               </plugins>\r
-                       </build>\r
-               </profile>\r
-       </profiles>\r
-</project>\r
+<?xml version="1.0" encoding="UTF-8"?>
+<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.parent</groupId>
+               <artifactId>odlparent-lite</artifactId>
+               <version>1.2.0</version>
+               <relativePath/>
+       </parent>
+
+       <groupId>org.onap.ccsdk.features</groupId>
+       <artifactId>ccsdk-features</artifactId>
+       <version>0.4.0-SNAPSHOT</version>
+       <packaging>pom</packaging>
+
+       <name>ccsdk-features</name>
+       <description>CCSDK applications</description>
+       <url>https://wiki.onap.org</url>
+       <organization>
+               <name>ONAP</name>
+       </organization>
+
+       <modules>
+               <module>features</module>
+               <module>blueprints-processor</module>
+       </modules>
+
+       <scm>
+               <connection>scm:git:ssh://git@${onap.git.host}/features.git</connection>
+               <developerConnection>scm:git:ssh://${onap.git.host}:${onap.git.port}/${onap.git.project}/features.git</developerConnection>
+               <url>${onap.git.protocol}://${onap.git.host}/projects/${onap.git.project}/repos/features/browse</url>
+       </scm>
+
+       <profiles>
+               <profile>
+                       <id>blackduck</id>
+                       <activation>
+                               <property>
+                                       <name>blackduck-scan</name>
+                               </property>
+                       </activation>
+                       <build>
+                               <plugins>
+                                       <plugin>
+                                               <groupId>com.blackducksoftware.integration</groupId>
+                                               <artifactId>hub-maven-plugin</artifactId>
+                                               <version>1.4.0</version>
+                                               <inherited>false</inherited>
+                                               <configuration>
+                                                       <hubProjectName>${project.name}</hubProjectName>
+                                                       <outputDirectory>${project.basedir}</outputDirectory>
+                                               </configuration>
+                                               <executions>
+                                                       <execution>
+                                                               <id>create-bdio-file</id>
+                                                               <phase>package</phase>
+                                                               <goals>
+                                                                       <goal>createHubOutput</goal>
+                                                               </goals>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                               </plugins>
+                       </build>
+               </profile>
+       </profiles>
+</project>
index df93ee5..4cbb459 100644 (file)
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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.parent</groupId>
     <artifactId>feature-repo-parent</artifactId>
-    <version>1.0.5-SNAPSHOT</version>
-    <relativePath />
+    <version>1.2.0</version>
+    <relativePath/>
   </parent>
 
   <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
@@ -73,7 +72,7 @@
                     </goals>
                   </pluginExecutionFilter>
                   <action>
-                    <execute />
+                    <execute/>
                   </action>
                 </pluginExecution>
                 <pluginExecution>
@@ -86,7 +85,7 @@
                     </goals>
                   </pluginExecutionFilter>
                   <action>
-                    <execute />
+                    <execute/>
                   </action>
                 </pluginExecution>
               </pluginExecutions>
index 93c23c5..ad57083 100755 (executable)
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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.parent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>1.0.5-SNAPSHOT</version>
-    <relativePath />
+    <version>1.2.0</version>
+    <relativePath/>
   </parent>
 
   <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
index d22fbfc..78f9e5c 100644 (file)
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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.parent</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>1.0.5-SNAPSHOT</version>
-    <relativePath />
+    <version>1.2.0</version>
+    <relativePath/>
   </parent>
 
   <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
@@ -45,7 +44,7 @@
                     </goals>
                   </pluginExecutionFilter>
                   <action>
-                    <execute />
+                    <execute/>
                   </action>
                 </pluginExecution>
               </pluginExecutions>
index 395441a..3e049f3 100644 (file)
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.0.5-SNAPSHOT</version>
+               <version>1.2.0</version>
                <relativePath/>
        </parent>
 
index 0314acc..5201466 100644 (file)
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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.parent</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>1.0.5-SNAPSHOT</version>
-    <relativePath />
+    <version>1.2.0</version>
+    <relativePath/>
   </parent>
 
   <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
@@ -94,7 +93,7 @@
                     </goals>
                   </pluginExecutionFilter>
                   <action>
-                    <execute />
+                    <execute/>
                   </action>
                 </pluginExecution>
               </pluginExecutions>
index aa6328e..ffee02f 100644 (file)
@@ -10,6 +10,6 @@ feature_revision=0
 
 base_version=${release_name}.${sprint_number}.${feature_revision}
 
-release_version=${base_version}-STAGING
+release_version=${base_version}
 snapshot_version=${base_version}-SNAPSHOT