Roll to initial Dublin snapshot

Roll version to initial Dublin snapshot

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

diff --git a/blueprints-processor/adaptors/data-adaptor-provider/pom.xml b/blueprints-processor/adaptors/data-adaptor-provider/pom.xml
index c1e90e3..a8e4a28 100644 (file)
--- a/blueprints-processor/adaptors/data-adaptor-provider/pom.xml
+++ b/blueprints-processor/adaptors/data-adaptor-provider/pom.xml
@@ -13,15 +13,15 @@
        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.1.1</version>
-        <relativePath/>
-    </parent>
+       <parent>
+               <groupId>org.onap.ccsdk.parent</groupId>
+               <artifactId>binding-parent</artifactId>
+               <version>1.2.0-SNAPSHOT</version>
+               <relativePath />
+       </parent>
 
        <groupId>org.onap.ccsdk.features</groupId>
-       <version>0.3.1-SNAPSHOT</version>
+       <version>0.4.0-SNAPSHOT</version>
        <artifactId>blueprints-data-adaptor-provider</artifactId>
        <packaging>bundle</packaging>
        <name>Blueprints Data Adaptor - Provider</name>

diff --git a/blueprints-processor/adaptors/pom.xml b/blueprints-processor/adaptors/pom.xml
index fbe27f0..a7c3ccb 100644 (file)
--- a/blueprints-processor/adaptors/pom.xml
+++ b/blueprints-processor/adaptors/pom.xml
@@ -17,26 +17,26 @@
 -->\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
+       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.1.1</version>\r
-        <relativePath/>\r
-    </parent>\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.3.1-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
+       <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

diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml b/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml
index 902cc9e..525ee8f 100644 (file)
--- a/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml
+++ b/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml
@@ -17,94 +17,94 @@
 -->\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
+       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.1.1</version>\r
-        <relativePath/>\r
-    </parent>\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.3.1-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
+       <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
-            <artifactId>httpcore</artifactId>
-            <version>${apache.httpcomponents.core.version}</version>
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.apache.httpcomponents</groupId>\r
-            <artifactId>httpclient</artifactId>
-            <version>${apache.httpcomponents.client.version}</version>
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.springframework</groupId>\r
-            <artifactId>spring-web</artifactId>\r
-            <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
+       <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
+                       <artifactId>httpcore</artifactId>
+                       <version>${apache.httpcomponents.core.version}</version>
+               </dependency>\r
+               <dependency>\r
+                       <groupId>org.apache.httpcomponents</groupId>\r
+                       <artifactId>httpclient</artifactId>
+                       <version>${apache.httpcomponents.client.version}</version>
+               </dependency>\r
+               <dependency>\r
+                       <groupId>org.springframework</groupId>\r
+                       <artifactId>spring-web</artifactId>\r
+                       <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
-                        <Bundle-Name>${project.artifactId}</Bundle-Name>
-                        <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.onap.ccsdk.features.rest.adaptor,\r
-                            org.onap.ccsdk.features.rest.adaptor.data,\r
-                            org.onap.ccsdk.features.rest.adaptor.service,\r
-                            org.onap.ccsdk.features.rest.adaptor.utils\r
-                        </Export-Package>\r
-                    </instructions>\r
-                </configuration>\r
-            </plugin>\r
-        </plugins>\r
-    </build>\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>
+                                               <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

diff --git a/blueprints-processor/features/ccsdk-blueprints-processor/pom.xml b/blueprints-processor/features/ccsdk-blueprints-processor/pom.xml
index 09d805a..619b080 100644 (file)
--- a/blueprints-processor/features/ccsdk-blueprints-processor/pom.xml
+++ b/blueprints-processor/features/ccsdk-blueprints-processor/pom.xml
@@ -14,86 +14,87 @@
   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>
+<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.1.1</version>
-        <relativePath/>
-    </parent>
+       <parent>
+               <groupId>org.onap.ccsdk.parent</groupId>
+               <artifactId>single-feature-parent</artifactId>
+               <version>1.2.0-SNAPSHOT</version>
+               <relativePath />
+       </parent>
 
-    <groupId>org.onap.ccsdk.features</groupId>
-    <artifactId>ccsdk-blueprints-processor</artifactId>
-    <version>0.3.1-SNAPSHOT</version>
-    <packaging>feature</packaging>
+       <groupId>org.onap.ccsdk.features</groupId>
+       <artifactId>ccsdk-blueprints-processor</artifactId>
+       <version>0.4.0-SNAPSHOT</version>
+       <packaging>feature</packaging>
 
-    <name>Blueprints Processor :: Features :: ${project.artifactId}</name>
+       <name>Blueprints Processor :: Features :: ${project.artifactId}</name>
 
 
 
-    <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>odl-mdsal-broker</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
+       <dependencies>
+               <dependency>
+                       <groupId>org.opendaylight.controller</groupId>
+                       <artifactId>odl-mdsal-broker</artifactId>
+                       <type>xml</type>
+                       <classifier>features</classifier>
+               </dependency>
 
-        <dependency>
-            <groupId>org.onap.ccsdk.sli.core</groupId>
-            <artifactId>ccsdk-sli</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
+               <dependency>
+                       <groupId>org.onap.ccsdk.sli.core</groupId>
+                       <artifactId>ccsdk-sli</artifactId>
+                       <type>xml</type>
+                       <classifier>features</classifier>
+               </dependency>
 
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blueprints-rest-adaptor-provider</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blueprints-data-adaptor-provider</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blueprints-model-provider</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blueprints-generator-provider</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blueprints-assignment-provider</artifactId>
-            <version>${project.version}</version>
-        </dependency>
+               <dependency>
+                       <groupId>${project.groupId}</groupId>
+                       <artifactId>blueprints-rest-adaptor-provider</artifactId>
+                       <version>${project.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>${project.groupId}</groupId>
+                       <artifactId>blueprints-data-adaptor-provider</artifactId>
+                       <version>${project.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>${project.groupId}</groupId>
+                       <artifactId>blueprints-model-provider</artifactId>
+                       <version>${project.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>${project.groupId}</groupId>
+                       <artifactId>blueprints-generator-provider</artifactId>
+                       <version>${project.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>${project.groupId}</groupId>
+                       <artifactId>blueprints-assignment-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>
-    </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>
+       </dependencies>
 </project>

diff --git a/blueprints-processor/features/features-blueprints-processor/pom.xml b/blueprints-processor/features/features-blueprints-processor/pom.xml
index 1c01a03..a8320ad 100755 (executable)
--- a/blueprints-processor/features/features-blueprints-processor/pom.xml
+++ b/blueprints-processor/features/features-blueprints-processor/pom.xml
@@ -14,32 +14,33 @@
   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>feature-repo-parent</artifactId>
-        <version>1.1.1</version>
-        <relativePath />
-    </parent>
-
-    <groupId>org.onap.ccsdk.features</groupId>
-    <artifactId>features-blueprints-processor</artifactId>
-    <version>0.3.1-SNAPSHOT</version>
-    <packaging>feature</packaging>
-
-    <name>Blueprints Processor :: CCSDK Features :: ${project.artifactId}</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>ccsdk-blueprints-processor</artifactId>
-            <version>${project.version}</version>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-
-    </dependencies>
+<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 />
+       </parent>
+
+       <groupId>org.onap.ccsdk.features</groupId>
+       <artifactId>features-blueprints-processor</artifactId>
+       <version>0.4.0-SNAPSHOT</version>
+       <packaging>feature</packaging>
+
+       <name>Blueprints Processor :: CCSDK Features :: ${project.artifactId}</name>
+
+       <dependencies>
+               <dependency>
+                       <groupId>${project.groupId}</groupId>
+                       <artifactId>ccsdk-blueprints-processor</artifactId>
+                       <version>${project.version}</version>
+                       <type>xml</type>
+                       <classifier>features</classifier>
+               </dependency>
+
+       </dependencies>
 </project>

diff --git a/blueprints-processor/features/pom.xml b/blueprints-processor/features/pom.xml
index a4aa4ad..cbc4707 100755 (executable)
--- a/blueprints-processor/features/pom.xml
+++ b/blueprints-processor/features/pom.xml
@@ -14,26 +14,27 @@
   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>
+<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.1.1</version>
-        <relativePath/>
-    </parent>
+       <parent>
+               <groupId>org.onap.ccsdk.parent</groupId>
+               <artifactId>odlparent-lite</artifactId>
+               <version>1.2.0-SNAPSHOT</version>
+               <relativePath />
+       </parent>
 
-    <groupId>org.onap.ccsdk.features</groupId>
-    <artifactId>blueprints-processor-features</artifactId>
-    <version>0.3.1-SNAPSHOT</version>
-    <packaging>pom</packaging>
+       <groupId>org.onap.ccsdk.features</groupId>
+       <artifactId>blueprints-processor-features</artifactId>
+       <version>0.4.0-SNAPSHOT</version>
+       <packaging>pom</packaging>
 
-    <name>Blueprints Processor :: Features aggregator :: ${project.artifactId}</name>
+       <name>Blueprints Processor :: Features aggregator :: ${project.artifactId}</name>
 
-    <modules>
-        <module>ccsdk-blueprints-processor</module>
-        <module>features-blueprints-processor</module>
-    </modules>
+       <modules>
+               <module>ccsdk-blueprints-processor</module>
+               <module>features-blueprints-processor</module>
+       </modules>
 </project>

diff --git a/blueprints-processor/installer/pom.xml b/blueprints-processor/installer/pom.xml
index 56e5455..417ddbb 100644 (file)
--- a/blueprints-processor/installer/pom.xml
+++ b/blueprints-processor/installer/pom.xml
@@ -23,13 +23,13 @@
        <parent>\r
                <groupId>org.onap.ccsdk.parent</groupId>\r
                <artifactId>odlparent-lite</artifactId>\r
-               <version>1.1.1</version>\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.3.1-SNAPSHOT</version>\r
+       <version>0.4.0-SNAPSHOT</version>\r
        <packaging>pom</packaging>\r
        <name>Blueprints Processor :: ${project.artifactId}</name>\r
 \r

diff --git a/blueprints-processor/plugin/assignment-provider/pom.xml b/blueprints-processor/plugin/assignment-provider/pom.xml
index 34d8e54..776a10f 100644 (file)
--- a/blueprints-processor/plugin/assignment-provider/pom.xml
+++ b/blueprints-processor/plugin/assignment-provider/pom.xml
@@ -17,103 +17,103 @@
 -->\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
+       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.1.1</version>\r
-        <relativePath/>\r
-    </parent>\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.3.1-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
+       <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
-            <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>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
+       <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
+                       <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>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
-                        <Bundle-Name>${project.artifactId}</Bundle-Name>
-                        <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>org.onap.ccsdk.features.assignment,\r
-                            org.onap.ccsdk.features.assignment.data,\r
-                            org.onap.ccsdk.features.assignment.service,\r
-                            org.onap.ccsdk.features.assignment.processor,\r
-                            org.onap.ccsdk.features.assignment.processor.custom\r
-                        </Export-Package>\r
-                    </instructions>\r
-                </configuration>\r
-            </plugin>\r
-        </plugins>\r
-    </build>\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>
+                                               <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

diff --git a/blueprints-processor/plugin/generator-provider/pom.xml b/blueprints-processor/plugin/generator-provider/pom.xml
index 7afd15f..8720388 100644 (file)
--- a/blueprints-processor/plugin/generator-provider/pom.xml
+++ b/blueprints-processor/plugin/generator-provider/pom.xml
@@ -17,105 +17,105 @@
 -->\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
+       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.1.1</version>\r
-        <relativePath/>\r
-    </parent>\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.3.1-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
+       <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
+       <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
+       <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

diff --git a/blueprints-processor/plugin/model-provider/pom.xml b/blueprints-processor/plugin/model-provider/pom.xml
index d61dea4..0b9b4de 100644 (file)
--- a/blueprints-processor/plugin/model-provider/pom.xml
+++ b/blueprints-processor/plugin/model-provider/pom.xml
@@ -17,121 +17,121 @@
 -->\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
+       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.1.1</version>\r
-        <relativePath/>\r
-    </parent>\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.3.1-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
+       <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
+       <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
+       <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

diff --git a/blueprints-processor/plugin/pom.xml b/blueprints-processor/plugin/pom.xml
index f52d15e..2626c42 100644 (file)
--- a/blueprints-processor/plugin/pom.xml
+++ b/blueprints-processor/plugin/pom.xml
@@ -16,27 +16,27 @@
 -->\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
+       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.1.1</version>\r
-        <relativePath/>\r
-    </parent>\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.3.1-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
+       <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

diff --git a/blueprints-processor/pom.xml b/blueprints-processor/pom.xml
index fa2c096..fabdc02 100644 (file)
--- a/blueprints-processor/pom.xml
+++ b/blueprints-processor/pom.xml
@@ -24,13 +24,13 @@
        <parent>\r
                <groupId>org.onap.ccsdk.parent</groupId>\r
                <artifactId>odlparent-lite</artifactId>\r
-               <version>1.1.1</version>\r
-               <relativePath/>\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.3.1-SNAPSHOT</version>\r
+       <version>0.4.0-SNAPSHOT</version>\r
        <packaging>pom</packaging>\r
 \r
        <name>Blueprints Processor Module</name>\r

diff --git a/features/ccsdk-features-all/pom.xml b/features/ccsdk-features-all/pom.xml
index 0c11f13..849aaee 100644 (file)
--- a/features/ccsdk-features-all/pom.xml
+++ b/features/ccsdk-features-all/pom.xml
@@ -15,52 +15,52 @@
   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>
+       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.1.1</version>
-        <relativePath/>
-    </parent>
+       <parent>
+               <groupId>org.onap.ccsdk.parent</groupId>
+               <artifactId>single-feature-parent</artifactId>
+               <version>1.2.0-SNAPSHOT</version>
+               <relativePath />
+       </parent>
 
-    <groupId>org.onap.ccsdk.features</groupId>
-    <artifactId>ccsdk-features-all</artifactId>
-    <version>0.3.1-SNAPSHOT</version>
-    <packaging>feature</packaging>
+       <groupId>org.onap.ccsdk.features</groupId>
+       <artifactId>ccsdk-features-all</artifactId>
+       <version>0.4.0-SNAPSHOT</version>
+       <packaging>feature</packaging>
 
-    <name>ccsdk-features :: features :: ${project.artifactId}</name>
+       <name>ccsdk-features :: features :: ${project.artifactId}</name>
 
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>mdsal-model-artifacts</artifactId>
-                <version>${odl.mdsal.model.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>mdsal-artifacts</artifactId>
-                <version>${odl.mdsal.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
+       <dependencyManagement>
+               <dependencies>
+                       <dependency>
+                               <groupId>org.opendaylight.mdsal.model</groupId>
+                               <artifactId>mdsal-model-artifacts</artifactId>
+                               <version>${odl.mdsal.model.version}</version>
+                               <type>pom</type>
+                               <scope>import</scope>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.opendaylight.controller</groupId>
+                               <artifactId>mdsal-artifacts</artifactId>
+                               <version>${odl.mdsal.version}</version>
+                               <type>pom</type>
+                               <scope>import</scope>
+                       </dependency>
+               </dependencies>
+       </dependencyManagement>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.onap.ccsdk.features</groupId>
-            <artifactId>ccsdk-blueprints-processor</artifactId>
-            <version>${project.version}</version>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
+       <dependencies>
+               <dependency>
+                       <groupId>org.onap.ccsdk.features</groupId>
+                       <artifactId>ccsdk-blueprints-processor</artifactId>
+                       <version>${project.version}</version>
+                       <type>xml</type>
+                       <classifier>features</classifier>
+               </dependency>
 
-    </dependencies>
+       </dependencies>
 </project>

diff --git a/features/features-features/pom.xml b/features/features-features/pom.xml
index 2c37bde..3d4a668 100644 (file)
--- a/features/features-features/pom.xml
+++ b/features/features-features/pom.xml
@@ -14,31 +14,32 @@
   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>
+<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.1.1</version>
-        <relativePath/>
-    </parent>
+       <parent>
+               <groupId>org.onap.ccsdk.parent</groupId>
+               <artifactId>feature-repo-parent</artifactId>
+               <version>1.2.0-SNAPSHOT</version>
+               <relativePath />
+       </parent>
 
-    <groupId>org.onap.ccsdk.features</groupId>
-    <artifactId>features-features</artifactId>
-    <version>0.3.1-SNAPSHOT</version>
-    <packaging>feature</packaging>
+       <groupId>org.onap.ccsdk.features</groupId>
+       <artifactId>features-features</artifactId>
+       <version>0.4.0-SNAPSHOT</version>
+       <packaging>feature</packaging>
 
-    <name>Blueprints Processor :: features :: ${project.artifactId}</name>
+       <name>Blueprints Processor :: features :: ${project.artifactId}</name>
 
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>ccsdk-features-all</artifactId>
-            <version>${project.version}</version>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-    </dependencies>
+       <dependencies>
+               <dependency>
+                       <groupId>${project.groupId}</groupId>
+                       <artifactId>ccsdk-features-all</artifactId>
+                       <version>${project.version}</version>
+                       <type>xml</type>
+                       <classifier>features</classifier>
+               </dependency>
+       </dependencies>
 </project>

diff --git a/features/installer/pom.xml b/features/installer/pom.xml
index 3c58633..adb93a5 100755 (executable)
--- a/features/installer/pom.xml
+++ b/features/installer/pom.xml
@@ -14,140 +14,141 @@
   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>
+<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.1.1</version>
-        <relativePath/>
-    </parent>
+       <parent>
+               <groupId>org.onap.ccsdk.parent</groupId>
+               <artifactId>odlparent-lite</artifactId>
+               <version>1.2.0-SNAPSHOT</version>
+               <relativePath />
+       </parent>
 
-    <groupId>org.onap.ccsdk.features</groupId>
-    <artifactId>features-installer</artifactId>
-    <version>0.3.1-SNAPSHOT</version>
-    <packaging>pom</packaging>
+       <groupId>org.onap.ccsdk.features</groupId>
+       <artifactId>features-installer</artifactId>
+       <version>0.4.0-SNAPSHOT</version>
+       <packaging>pom</packaging>
 
-    <name>Blueprints Processor :: features :: ${project.artifactId}</name>
+       <name>Blueprints Processor :: features :: ${project.artifactId}</name>
 
-    <properties>
-        <application.name>ccsdk-features-all</application.name>
-        <features.boot>${application.name}</features.boot>
-        <features.repositories>mvn:org.onap.ccsdk.features/${features.boot}/${project.version}/xml/features
-        </features.repositories>
-        <include.transitive.dependencies>false</include.transitive.dependencies>
-    </properties>
+       <properties>
+               <application.name>ccsdk-features-all</application.name>
+               <features.boot>${application.name}</features.boot>
+               <features.repositories>mvn:org.onap.ccsdk.features/${features.boot}/${project.version}/xml/features
+               </features.repositories>
+               <include.transitive.dependencies>false</include.transitive.dependencies>
+       </properties>
 
-    <dependencies>
+       <dependencies>
 
-        <dependency>
-            <groupId>org.onap.ccsdk.features</groupId>
-            <artifactId>${application.name}</artifactId>
-            <version>${project.version}</version>
-            <type>xml</type>
-            <classifier>features</classifier>
-            <exclusions>
-                <exclusion>
-                    <groupId>*</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
+               <dependency>
+                       <groupId>org.onap.ccsdk.features</groupId>
+                       <artifactId>${application.name}</artifactId>
+                       <version>${project.version}</version>
+                       <type>xml</type>
+                       <classifier>features</classifier>
+                       <exclusions>
+                               <exclusion>
+                                       <groupId>*</groupId>
+                                       <artifactId>*</artifactId>
+                               </exclusion>
+                       </exclusions>
+               </dependency>
 
 
-    </dependencies>
+       </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>
+       <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>
+                               </executions>
+                       </plugin>
 
-        </plugins>
-    </build>
+               </plugins>
+       </build>
 </project>

diff --git a/features/pom.xml b/features/pom.xml
index bd58334..61c752d 100755 (executable)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -14,27 +14,28 @@
   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>
+<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.1.1</version>
-        <relativePath/>
-    </parent>
+       <parent>
+               <groupId>org.onap.ccsdk.parent</groupId>
+               <artifactId>odlparent-lite</artifactId>
+               <version>1.2.0-SNAPSHOT</version>
+               <relativePath />
+       </parent>
 
-    <groupId>org.onap.ccsdk.features</groupId>
-    <artifactId>ccsdk-feature-aggregator</artifactId>
-    <version>0.3.1-SNAPSHOT</version>
-    <packaging>pom</packaging>
+       <groupId>org.onap.ccsdk.features</groupId>
+       <artifactId>ccsdk-feature-aggregator</artifactId>
+       <version>0.4.0-SNAPSHOT</version>
+       <packaging>pom</packaging>
 
-    <name>Blueprints Processor :: features</name>
+       <name>Blueprints Processor :: features</name>
 
-    <modules>
-        <module>ccsdk-features-all</module>
-        <module>features-features</module>
-        <module>installer</module>
-    </modules>
+       <modules>
+               <module>ccsdk-features-all</module>
+               <module>features-features</module>
+               <module>installer</module>
+       </modules>
 </project>

diff --git a/pom.xml b/pom.xml
index 9cb1bb6..ac8f243 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -7,13 +7,13 @@
        <parent>\r
                <groupId>org.onap.ccsdk.parent</groupId>\r
                <artifactId>odlparent-lite</artifactId>\r
-               <version>1.1.1</version>\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.3.1-SNAPSHOT</version>\r
+       <version>0.4.0-SNAPSHOT</version>\r
        <packaging>pom</packaging>\r
 \r
        <name>ccsdk-features</name>\r

diff --git a/version.properties b/version.properties
index e5ea9c7..aa6328e 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -5,11 +5,11 @@
 
 
 release_name=0
-sprint_number=3
-feature_revision=1
+sprint_number=4
+feature_revision=0
 
 base_version=${release_name}.${sprint_number}.${feature_revision}
 
-release_version=${base_version}
+release_version=${base_version}-STAGING
 snapshot_version=${base_version}-SNAPSHOT