Update parent pom to conform to CCSDK structure

Change-Id: Ie99cd61cc83dff14b2e1a1a1014411342031e27f
Issue-ID: CCSDK-505
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>

diff --git a/blueprints-processor/adaptors/data-adaptor-provider/pom.xml b/blueprints-processor/adaptors/data-adaptor-provider/pom.xml
index d73a21c..a965c7f 100644 (file)
--- a/blueprints-processor/adaptors/data-adaptor-provider/pom.xml
+++ b/blueprints-processor/adaptors/data-adaptor-provider/pom.xml
@@ -17,96 +17,126 @@
 -->\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.config</groupId>\r
-               <artifactId>blueprints-processor-adaptors</artifactId>\r
-               <version>0.0.1-SNAPSHOT</version>\r
-       </parent>\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
-       <artifactId>blueprints-data-adaptor-provider</artifactId>\r
-       <packaging>bundle</packaging>\r
-       <name>Blueprints Data Adaptor - Provider</name>\r
-       <url>http://maven.apache.org</url>\r
+    <parent>\r
+        <groupId>org.onap.ccsdk.parent</groupId>\r
+        <artifactId>binding-parent</artifactId>\r
+        <version>1.1.0-SNAPSHOT</version>\r
+        <relativePath/>\r
+    </parent>\r
 \r
-       <dependencies>\r
-               <dependency>\r
-                       <groupId>org.apache.commons</groupId>\r
-                       <artifactId>commons-lang3</artifactId>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.onap.ccsdk.sli.core</groupId>\r
-                       <artifactId>sli-provider</artifactId>\r
-                       <scope>compile</scope>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>commons-io</groupId>\r
-                       <artifactId>commons-io</artifactId>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.mariadb.jdbc</groupId>\r
-                       <artifactId>mariadb-java-client</artifactId>\r
-                       <scope>runtime</scope>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.springframework</groupId>\r
-                       <artifactId>spring-context</artifactId>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.springframework</groupId>\r
-                       <artifactId>spring-jdbc</artifactId>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>com.att.eelf</groupId>\r
-                       <artifactId>eelf-core</artifactId>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.springframework</groupId>\r
-                       <artifactId>spring-test</artifactId>\r
-                       <scope>test</scope>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>com.h2database</groupId>\r
-                       <artifactId>h2</artifactId>\r
-                       <scope>test</scope>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>junit</groupId>\r
-                       <artifactId>junit</artifactId>\r
-                       <scope>test</scope>\r
-               </dependency>\r
-       </dependencies>\r
+    <groupId>org.onap.ccsdk.config</groupId>\r
+    <version>0.3.0-SNAPSHOT</version>\r
+    <artifactId>blueprints-data-adaptor-provider</artifactId>\r
+    <packaging>bundle</packaging>\r
+    <name>Blueprints Data Adaptor - Provider</name>\r
+    <url>http://maven.apache.org</url>\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-SymbolicName>org.onap.ccsdk.config.data.adaptor</Bundle-SymbolicName>\r
-                                               <Export-Package>org.onap.ccsdk.config.data.adaptor,\r
-                                                       org.onap.ccsdk.config.data.adaptor.dao,\r
-                                                       org.onap.ccsdk.config.data.adaptor.db,\r
-                                                       org.onap.ccsdk.config.data.adaptor.domain,\r
-                                                       org.onap.ccsdk.config.data.adaptor.service\r
-                                               </Export-Package>\r
-                                               <Import-Package>!*spring*,!joptsimple,!net.*,!bsh,\r
-                                                       !org.apache.commons.pool*,!org.apache.commons.fileupload*,!org.apache.http.*,!org.apache.logger*,\r
-                                                       !org.apache.lucene*,!org.apache.t*,!org.apache.derby*,!org.codehaus.groovy*,!org.custommonkey.xmlunit*,\r
-                                                       !org.hibernate*,!org.jruby*,!org.aspectj*,!org.mockito*,!org.openqa*,!org.skyscreamer*,!org.testng*,\r
-                                                       !com.caucho*,!com.gargoylesoftware*,!com.jamonapi*,!com.rometools*,!com.squareup*,!com.sun*,!groovy*,\r
-                                                       !javax.ejb*,!javax.enterprise*,!javax.faces*,!javax.in*,!javax.money*,!javax.portlet*,!javax.resource*,\r
-                                                       org.*,javax.*,com.google.gson*,com.google.common.*,*jackson*</Import-Package>\r
-                                               <Embed-Dependency>*;groupId=!*eelf*|*opendaylight*|*ccsdk*|*osgi*|*jackson*|*json*|*powermock*|*junit*</Embed-Dependency>\r
-                                               <Embed-Transitive>true</Embed-Transitive>\r
-                                       </instructions>\r
-                               </configuration>\r
-                       </plugin>\r
-               </plugins>\r
-       </build>\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>org.onap.ccsdk.sli.core</groupId>\r
+            <artifactId>sli-provider</artifactId>\r
+            <version>${project.version}</version>\r
+            <scope>compile</scope>\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.mariadb.jdbc</groupId>\r
+            <artifactId>mariadb-java-client</artifactId>\r
+            <version>${mariadb.connector.version}</version>\r
+            <scope>runtime</scope>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.springframework</groupId>\r
+            <artifactId>spring-context</artifactId>\r
+            <version>4.2.9.RELEASE</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.springframework</groupId>\r
+            <artifactId>spring-beans</artifactId>\r
+            <version>4.2.9.RELEASE</version>\r
+            <scope>compile</scope>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.springframework</groupId>\r
+            <artifactId>spring-jdbc</artifactId>\r
+            <version>4.2.9.RELEASE</version>\r
+        </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>org.springframework</groupId>\r
+            <artifactId>spring-test</artifactId>\r
+            <version>4.2.9.RELEASE</version>\r
+            <scope>test</scope>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>com.h2database</groupId>\r
+            <artifactId>h2</artifactId>\r
+            <version>${h2database.version}</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.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-SymbolicName>org.onap.ccsdk.config.data.adaptor</Bundle-SymbolicName>\r
+                        <Export-Package>org.onap.ccsdk.config.data.adaptor,\r
+                            org.onap.ccsdk.config.data.adaptor.dao,\r
+                            org.onap.ccsdk.config.data.adaptor.db,\r
+                            org.onap.ccsdk.config.data.adaptor.domain,\r
+                            org.onap.ccsdk.config.data.adaptor.service\r
+                        </Export-Package>\r
+                        <Import-Package>!*spring*,!joptsimple,!net.*,!bsh,\r
+                            !org.apache.commons.pool*,!org.apache.commons.fileupload*,!org.apache.http.*,!org.apache.logger*,\r
+                            !org.apache.lucene*,!org.apache.t*,!org.apache.derby*,!org.codehaus.groovy*,!org.custommonkey.xmlunit*,\r
+                            !org.hibernate*,!org.jruby*,!org.aspectj*,!org.mockito*,!org.openqa*,!org.skyscreamer*,!org.testng*,\r
+                            !com.caucho*,!com.gargoylesoftware*,!com.jamonapi*,!com.rometools*,!com.squareup*,!com.sun*,!groovy*,\r
+                            !javax.ejb*,!javax.enterprise*,!javax.faces*,!javax.in*,!javax.money*,!javax.portlet*,!javax.resource*,\r
+                            org.*,javax.*,com.google.gson*,com.google.common.*,*jackson*\r
+                        </Import-Package>\r
+                        <Embed-Dependency>\r
+                            *;groupId=!*eelf*|*opendaylight*|*ccsdk*|*osgi*|*jackson*|*json*|*powermock*|*junit*\r
+                        </Embed-Dependency>\r
+                        <Embed-Transitive>true</Embed-Transitive>\r
+                    </instructions>\r
+                </configuration>\r
+            </plugin>\r
+        </plugins>\r
+    </build>\r
 </project>\r

diff --git a/blueprints-processor/adaptors/pom.xml b/blueprints-processor/adaptors/pom.xml
index 481f48c..53b6c3f 100644 (file)
--- a/blueprints-processor/adaptors/pom.xml
+++ b/blueprints-processor/adaptors/pom.xml
@@ -17,21 +17,25 @@
 -->\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
-       <parent>\r
-               <groupId>org.onap.ccsdk.config</groupId>\r
-               <artifactId>blueprints-processor</artifactId>\r
-               <version>0.0.1-SNAPSHOT</version>\r
-       </parent>\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
+  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.0-SNAPSHOT</version>\r
+    </parent>\r
+\r
+    <groupId>org.onap.ccsdk.config</groupId>\r
+    <version>0.3.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 5e83a27..d35f1c1 100644 (file)
--- a/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml
+++ b/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml
@@ -17,133 +17,180 @@
 -->\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.config</groupId>\r
-               <artifactId>blueprints-processor-adaptors</artifactId>\r
-               <version>0.0.1-SNAPSHOT</version>\r
-       </parent>\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
+  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
-       <dependencies>\r
-               <dependency>\r
-                       <groupId>org.apache.commons</groupId>\r
-                       <artifactId>commons-lang3</artifactId>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>com.fasterxml.jackson.core</groupId>\r
-                       <artifactId>jackson-databind</artifactId>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>com.fasterxml.jackson.core</groupId>\r
-                       <artifactId>jackson-annotations</artifactId>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>com.fasterxml.jackson.core</groupId>\r
-                       <artifactId>jackson-core</artifactId>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>com.fasterxml.jackson.dataformat</groupId>\r
-                       <artifactId>jackson-dataformat-xml</artifactId>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>com.fasterxml.jackson.dataformat</groupId>\r
-                       <artifactId>jackson-dataformat-yaml</artifactId>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>com.fasterxml.jackson.module</groupId>\r
-                       <artifactId>jackson-module-jsonSchema</artifactId>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.yaml</groupId>\r
-                       <artifactId>snakeyaml</artifactId>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.json</groupId>\r
-                       <artifactId>json</artifactId>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>com.jayway.jsonpath</groupId>\r
-                       <artifactId>json-path</artifactId>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>commons-collections</groupId>\r
-                       <artifactId>commons-collections</artifactId>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>commons-io</groupId>\r
-                       <artifactId>commons-io</artifactId>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.apache.httpcomponents</groupId>\r
-                       <artifactId>httpclient-osgi</artifactId>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.apache.httpcomponents</groupId>\r
-                       <artifactId>httpcore-osgi</artifactId>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.springframework</groupId>\r
-                       <artifactId>spring-web</artifactId>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>com.att.eelf</groupId>\r
-                       <artifactId>eelf-core</artifactId>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.springframework</groupId>\r
-                       <artifactId>spring-test</artifactId>\r
-                       <scope>test</scope>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>junit</groupId>\r
-                       <artifactId>junit</artifactId>\r
-                       <scope>test</scope>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.powermock</groupId>\r
-                       <artifactId>powermock-api-mockito</artifactId>\r
-                       <scope>test</scope>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.powermock</groupId>\r
-                       <artifactId>powermock-module-junit4</artifactId>\r
-                       <scope>test</scope>\r
-               </dependency>\r
-       </dependencies>\r
+    <parent>\r
+        <groupId>org.onap.ccsdk.parent</groupId>\r
+        <artifactId>binding-parent</artifactId>\r
+        <version>1.1.0-SNAPSHOT</version>\r
+        <relativePath/>\r
+    </parent>\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-SymbolicName>org.onap.ccsdk.config.rest.adaptor</Bundle-SymbolicName>\r
-                                               <Export-Package>org.onap.ccsdk.config.rest.adaptor,\r
-                                                       org.onap.ccsdk.config.rest.adaptor.data,\r
-                                                       org.onap.ccsdk.config.rest.adaptor.service,\r
-                                                       org.onap.ccsdk.config.rest.adaptor.utils\r
-                                               </Export-Package>\r
-                                               <Import-Package>!*spring*,!joptsimple,!net.*,!bsh,\r
-                                                       !org.apache.commons.pool*,!org.apache.commons.fileupload*,!org.apache.http.*,!org.apache.logger*,\r
-                                                       !org.apache.lucene*,!org.apache.t*,!org.apache.derby*,!org.codehaus.groovy*,!org.custommonkey.xmlunit*,\r
-                                                       !org.hibernate*,!org.jruby*,!org.aspectj*,!org.mockito*,!org.openqa*,!org.skyscreamer*,!org.testng*,\r
-                                                       !com.caucho*,!com.gargoylesoftware*,!com.jamonapi*,!com.rometools*,!com.squareup*,!com.sun*,!groovy*,\r
-                                                       !javax.ejb*,!javax.enterprise*,!javax.faces*,!javax.in*,!javax.money*,!javax.portlet*,!javax.resource*,\r
-                                                       org.*,javax.*,com.google.gson*,com.google.common.*,*jackson*</Import-Package>\r
-                                               <Embed-Dependency>*;groupId=!*eelf*|*opendaylight*|*ccsdk*|*osgi*|*jackson*|*json*|*powermock*|*junit*</Embed-Dependency>\r
-                                               <Embed-Transitive>true</Embed-Transitive>\r
-                                       </instructions>\r
-                               </configuration>\r
-                       </plugin>\r
-               </plugins>\r
-       </build>\r
+    <groupId>org.onap.ccsdk.config</groupId>\r
+    <version>0.3.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-annotations</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>com.fasterxml.jackson.dataformat</groupId>\r
+            <artifactId>jackson-dataformat-xml</artifactId>\r
+            <version>${jackson.version}</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>com.fasterxml.jackson.dataformat</groupId>\r
+            <artifactId>jackson-dataformat-yaml</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>org.yaml</groupId>\r
+            <artifactId>snakeyaml</artifactId>\r
+            <version>1.12</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.json</groupId>\r
+            <artifactId>json</artifactId>\r
+            <version>${org.json.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>commons-collections</groupId>\r
+            <artifactId>commons-collections</artifactId>\r
+            <version>3.2.2</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.httpcomponents</groupId>\r
+            <artifactId>httpclient-osgi</artifactId>\r
+            <version>4.5.6</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.apache.httpcomponents</groupId>\r
+            <artifactId>httpcore-osgi</artifactId>\r
+            <version>4.4.10</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.springframework</groupId>\r
+            <artifactId>spring-web</artifactId>\r
+            <version>4.2.9.RELEASE</version>\r
+        </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>org.springframework</groupId>\r
+            <artifactId>spring-test</artifactId>\r
+            <version>4.2.9.RELEASE</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>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.powermock</groupId>\r
+            <artifactId>powermock-core</artifactId>\r
+            <version>1.6.6</version>\r
+            <scope>test</scope>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.powermock</groupId>\r
+            <artifactId>powermock-api-support</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-SymbolicName>org.onap.ccsdk.config.rest.adaptor</Bundle-SymbolicName>\r
+                        <Export-Package>org.onap.ccsdk.config.rest.adaptor,\r
+                            org.onap.ccsdk.config.rest.adaptor.data,\r
+                            org.onap.ccsdk.config.rest.adaptor.service,\r
+                            org.onap.ccsdk.config.rest.adaptor.utils\r
+                        </Export-Package>\r
+                        <Import-Package>!*spring*,!joptsimple,!net.*,!bsh,\r
+                            !org.apache.commons.pool*,!org.apache.commons.fileupload*,!org.apache.http.*,!org.apache.logger*,\r
+                            !org.apache.lucene*,!org.apache.t*,!org.apache.derby*,!org.codehaus.groovy*,!org.custommonkey.xmlunit*,\r
+                            !org.hibernate*,!org.jruby*,!org.aspectj*,!org.mockito*,!org.openqa*,!org.skyscreamer*,!org.testng*,\r
+                            !com.caucho*,!com.gargoylesoftware*,!com.jamonapi*,!com.rometools*,!com.squareup*,!com.sun*,!groovy*,\r
+                            !javax.ejb*,!javax.enterprise*,!javax.faces*,!javax.in*,!javax.money*,!javax.portlet*,!javax.resource*,\r
+                            org.*,javax.*,com.google.gson*,com.google.common.*,*jackson*\r
+                        </Import-Package>\r
+                        <Embed-Dependency>\r
+                            *;groupId=!*eelf*|*opendaylight*|*ccsdk*|*osgi*|*jackson*|*json*|*powermock*|*junit*\r
+                        </Embed-Dependency>\r
+                        <Embed-Transitive>true</Embed-Transitive>\r
+                    </instructions>\r
+                </configuration>\r
+            </plugin>\r
+        </plugins>\r
+    </build>\r
 </project>\r

diff --git a/blueprints-processor/features/pom.xml b/blueprints-processor/features/pom.xml
index 5b9ecfc..f80d14f 100644 (file)
--- a/blueprints-processor/features/pom.xml
+++ b/blueprints-processor/features/pom.xml
@@ -23,7 +23,7 @@
        <parent>\r
                <groupId>org.onap.ccsdk.config</groupId>\r
                <artifactId>blueprints-processor</artifactId>\r
-               <version>0.0.1-SNAPSHOT</version>\r
+               <version>0.3.0-SNAPSHOT</version>\r
        </parent>\r
 \r
        <artifactId>blueprints-processor-features</artifactId>\r

diff --git a/blueprints-processor/installer/pom.xml b/blueprints-processor/installer/pom.xml
index f8a053e..65d42ec 100644 (file)
--- a/blueprints-processor/installer/pom.xml
+++ b/blueprints-processor/installer/pom.xml
@@ -21,12 +21,15 @@
        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.config</groupId>\r
-               <artifactId>blueprints-processor</artifactId>\r
-               <version>0.0.1-SNAPSHOT</version>\r
+               <groupId>org.onap.ccsdk.parent</groupId>\r
+               <artifactId>odlparent-lite</artifactId>\r
+               <version>1.1.0-SNAPSHOT</version>\r
+               <relativePath />\r
        </parent>\r
 \r
+       <groupId>org.onap.ccsdk.config</groupId>\r
        <artifactId>blueprints-processor-installer</artifactId>\r
+       <version>0.3.0-SNAPSHOT</version>\r
        <packaging>pom</packaging>\r
        <name>Blueprints Processor :: ${project.artifactId}</name>\r
 \r
@@ -41,6 +44,7 @@
                <dependency>\r
                        <groupId>org.onap.ccsdk.config</groupId>\r
                        <artifactId>blueprints-processor-features</artifactId>\r
+                       <version>${project.version}</version>\r
                        <classifier>features</classifier>\r
                        <type>xml</type>\r
                        <exclusions>\r
@@ -53,22 +57,27 @@
                <dependency>\r
                        <groupId>org.onap.ccsdk.config</groupId>\r
                        <artifactId>blueprints-data-adaptor-provider</artifactId>\r
+                       <version>${project.version}</version>\r
                </dependency>\r
                <dependency>\r
                        <groupId>org.onap.ccsdk.config</groupId>\r
                        <artifactId>blueprints-rest-adaptor-provider</artifactId>\r
+                       <version>${project.version}</version>\r
                </dependency>\r
                <dependency>\r
                        <groupId>org.onap.ccsdk.config</groupId>\r
                        <artifactId>blueprints-assignment-provider</artifactId>\r
+                       <version>${project.version}</version>\r
                </dependency>\r
                <dependency>\r
                        <groupId>org.onap.ccsdk.config</groupId>\r
                        <artifactId>blueprints-generator-provider</artifactId>\r
+                       <version>${project.version}</version>\r
                </dependency>\r
                <dependency>\r
                        <groupId>org.onap.ccsdk.config</groupId>\r
                        <artifactId>blueprints-model-provider</artifactId>\r
+                       <version>${project.version}</version>\r
                </dependency>\r
        </dependencies>\r
 \r
@@ -84,12 +93,12 @@
                                                </goals>\r
                                                <phase>package</phase>\r
                                                <configuration>\r
-                                                       <attach>false</attach>\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>false</appendAssemblyId>\r
+                                                       <appendAssemblyId>true</appendAssemblyId>\r
                                                </configuration>\r
                                        </execution>\r
                                        <execution>\r
@@ -128,14 +137,7 @@
                                                        <useRepositoryLayout>true</useRepositoryLayout>\r
                                                        <addParentPoms>false</addParentPoms>\r
                                                        <copyPom>false</copyPom>\r
-                                                       <includeArtifactIds>\r
-                                                               blueprints-processor-features,\r
-                                                               blueprints-data-adaptor-provider,\r
-                                                               blueprints-rest-adaptor-provider,\r
-                                                               blueprints-assignment-provider,\r
-                                                               blueprints-generator-provider,commons-lang,commons-collections,\r
-                                                               blueprints-model-provider,\r
-                                                       </includeArtifactIds>\r
+                                                       <includeGroupIds>org.onap.ccsdk.config</includeGroupIds>\r
                                                        <scope>provided</scope>\r
                                                </configuration>\r
                                        </execution>\r

diff --git a/blueprints-processor/installer/src/assembly/assemble_installer_zip.xml b/blueprints-processor/installer/src/assembly/assemble_installer_zip.xml
index 88a6bb7..e803caf 100644 (file)
--- a/blueprints-processor/installer/src/assembly/assemble_installer_zip.xml
+++ b/blueprints-processor/installer/src/assembly/assemble_installer_zip.xml
@@ -1,33 +1,33 @@
 <!--\r
-  Copyright © 2017-2018 AT&T Intellectual Property.\r
-  Modifications Copyright © 2018 IBM.\r
-  \r
+  Copyright (C) 2018 AT&T, Bell Canada\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
+\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
 \r
 <!-- Defines how we build the .zip file which is our distribution. -->\r
 \r
 <assembly\r
-       xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"\r
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-       xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">\r
-       <id>bin</id>\r
+xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"\r
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
+xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">\r
+       <id>installer_zip</id>\r
        <formats>\r
                <format>zip</format>\r
        </formats>\r
 \r
-       <!-- we want "system" and related files right at the root level as this \r
-               file is suppose to be unzip on top of a karaf distro. -->\r
+       <!--  we want "system" and related files right at the root level\r
+        as this file is suppose to be unzip on top of a karaf\r
+        distro. -->\r
        <includeBaseDirectory>false</includeBaseDirectory>\r
 \r
        <fileSets>\r
@@ -50,5 +50,4 @@
        </fileSets>\r
 \r
 \r
-\r
 </assembly>\r

diff --git a/blueprints-processor/installer/src/assembly/assemble_mvnrepo_zip.xml b/blueprints-processor/installer/src/assembly/assemble_mvnrepo_zip.xml
index 44237ae..95d191a 100644 (file)
--- a/blueprints-processor/installer/src/assembly/assemble_mvnrepo_zip.xml
+++ b/blueprints-processor/installer/src/assembly/assemble_mvnrepo_zip.xml
@@ -1,33 +1,33 @@
 <!--\r
-  Copyright © 2017-2018 AT&T Intellectual Property.\r
-  Modifications Copyright © 2018 IBM.\r
-  \r
+  Copyright (C) 2018 AT&T, Bell Canada\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
+\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
 \r
 <!-- Defines how we build the .zip file which is our distribution. -->\r
 \r
 <assembly\r
-       xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"\r
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-       xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">\r
-       <id>bin</id>\r
+xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"\r
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
+xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">\r
+       <id>repo</id>\r
        <formats>\r
                <format>zip</format>\r
        </formats>\r
 \r
-       <!-- we want "system" and related files right at the root level as this \r
-               file is suppose to be unzip on top of a karaf distro. -->\r
+       <!--  we want "system" and related files right at the root level\r
+        as this file is suppose to be unzip on top of a karaf\r
+        distro. -->\r
        <includeBaseDirectory>false</includeBaseDirectory>\r
 \r
        <fileSets>\r
@@ -40,5 +40,4 @@
        </fileSets>\r
 \r
 \r
-\r
 </assembly>\r

diff --git a/blueprints-processor/plugin/assignment-provider/pom.xml b/blueprints-processor/plugin/assignment-provider/pom.xml
index b6167cf..073f9af 100644 (file)
--- a/blueprints-processor/plugin/assignment-provider/pom.xml
+++ b/blueprints-processor/plugin/assignment-provider/pom.xml
@@ -17,71 +17,89 @@
 -->\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.config</groupId>\r
-               <artifactId>blueprints-processor-plugin</artifactId>\r
-               <version>0.0.1-SNAPSHOT</version>\r
-       </parent>\r
-       <artifactId>blueprints-assignment-provider</artifactId>\r
-       <packaging>bundle</packaging>\r
-       <name>Blueprints Assignment - Provider</name>\r
-       <url>http://maven.apache.org</url>\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
-       <dependencies>\r
-               <dependency>\r
-                       <groupId>equinoxSDK381</groupId>\r
-                       <artifactId>org.eclipse.osgi</artifactId>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.onap.ccsdk.config</groupId>\r
-                       <artifactId>blueprints-generator-provider</artifactId>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>junit</groupId>\r
-                       <artifactId>junit</artifactId>\r
-                       <scope>test</scope>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.apache.sling</groupId>\r
-                       <artifactId>org.apache.sling.testing.osgi-mock</artifactId>\r
-                       <scope>test</scope>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.powermock</groupId>\r
-                       <artifactId>powermock-api-mockito</artifactId>\r
-                       <scope>test</scope>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.powermock</groupId>\r
-                       <artifactId>powermock-module-junit4</artifactId>\r
-                       <scope>test</scope>\r
-               </dependency>\r
-       </dependencies>\r
+    <parent>\r
+        <groupId>org.onap.ccsdk.parent</groupId>\r
+        <artifactId>binding-parent</artifactId>\r
+        <version>1.1.0-SNAPSHOT</version>\r
+        <relativePath/>\r
+    </parent>\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-SymbolicName>org.onap.ccsdk.config.assignment</Bundle-SymbolicName>\r
-                                               <Export-Package>org.onap.ccsdk.config.assignment,\r
-                                                       org.onap.ccsdk.config.assignment.data,\r
-                                                       org.onap.ccsdk.config.assignment.service,\r
-                                                       org.onap.ccsdk.config.assignment.processor,\r
-                                                       org.onap.ccsdk.config.assignment.processor.custom\r
-                                               </Export-Package>\r
-                                               <Import-Package>*</Import-Package>\r
-                                               <Embed-Transitive>true</Embed-Transitive>\r
-                                       </instructions>\r
-                               </configuration>\r
-                       </plugin>\r
-               </plugins>\r
-       </build>\r
+    <groupId>org.onap.ccsdk.config</groupId>\r
+    <version>0.3.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>equinoxSDK381</groupId>\r
+            <artifactId>org.eclipse.osgi</artifactId>\r
+            <version>${equinox.osgi.version}</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.onap.ccsdk.config</groupId>\r
+            <artifactId>blueprints-generator-provider</artifactId>\r
+            <version>${project.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
+        <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-SymbolicName>org.onap.ccsdk.config.assignment</Bundle-SymbolicName>\r
+                        <Export-Package>org.onap.ccsdk.config.assignment,\r
+                            org.onap.ccsdk.config.assignment.data,\r
+                            org.onap.ccsdk.config.assignment.service,\r
+                            org.onap.ccsdk.config.assignment.processor,\r
+                            org.onap.ccsdk.config.assignment.processor.custom\r
+                        </Export-Package>\r
+                        <Import-Package>*</Import-Package>\r
+                        <Embed-Transitive>true</Embed-Transitive>\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 132852e..f18170a 100644 (file)
--- a/blueprints-processor/plugin/generator-provider/pom.xml
+++ b/blueprints-processor/plugin/generator-provider/pom.xml
@@ -17,74 +17,86 @@
 -->\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.config</groupId>\r
-               <artifactId>blueprints-processor-plugin</artifactId>\r
-               <version>0.0.1-SNAPSHOT</version>\r
-       </parent>\r
-       <artifactId>blueprints-generator-provider</artifactId>\r
-       <packaging>bundle</packaging>\r
-       <name>Blueprints Generator - Provider</name>\r
-       <url>http://maven.apache.org</url>\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
-       <dependencies>\r
-               <dependency>\r
-                       <artifactId>org.eclipse.osgi</artifactId>\r
-                       <groupId>equinoxSDK381</groupId>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.onap.ccsdk.config</groupId>\r
-                       <artifactId>blueprints-model-provider</artifactId>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>commons-io</groupId>\r
-                       <artifactId>commons-io</artifactId>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.apache.velocity</groupId>\r
-                       <artifactId>velocity</artifactId>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.powermock</groupId>\r
-                       <artifactId>powermock-api-mockito</artifactId>\r
-                       <scope>test</scope>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.powermock</groupId>\r
-                       <artifactId>powermock-module-junit4</artifactId>\r
-                       <scope>test</scope>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>junit</groupId>\r
-                       <artifactId>junit</artifactId>\r
-                       <scope>test</scope>\r
-               </dependency>\r
-       </dependencies>\r
+    <parent>\r
+        <groupId>org.onap.ccsdk.parent</groupId>\r
+        <artifactId>binding-parent</artifactId>\r
+        <version>1.1.0-SNAPSHOT</version>\r
+        <relativePath/>\r
+    </parent>\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-SymbolicName>org.onap.ccsdk.config.generator</Bundle-SymbolicName>\r
-                                               <Export-Package>\r
-                                                       org.onap.ccsdk.config.generator,\r
-                                                       org.onap.ccsdk.config.generator.data,\r
-                                                       org.onap.ccsdk.config.generator.service,\r
-                                                       org.onap.ccsdk.config.generator.tool\r
-                                               </Export-Package>\r
-                                               <Import-Package>*</Import-Package>\r
-                                               <Embed-Transitive>true</Embed-Transitive>\r
-                                       </instructions>\r
-                               </configuration>\r
-                       </plugin>\r
-               </plugins>\r
-       </build>\r
+    <groupId>org.onap.ccsdk.config</groupId>\r
+    <version>0.3.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
+            <artifactId>org.eclipse.osgi</artifactId>\r
+            <groupId>equinoxSDK381</groupId>\r
+            <version>${equinox.osgi.version}</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.onap.ccsdk.config</groupId>\r
+            <artifactId>blueprints-model-provider</artifactId>\r
+            <version>${project.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-SymbolicName>org.onap.ccsdk.config.generator</Bundle-SymbolicName>\r
+                        <Export-Package>\r
+                            org.onap.ccsdk.config.generator,\r
+                            org.onap.ccsdk.config.generator.data,\r
+                            org.onap.ccsdk.config.generator.service,\r
+                            org.onap.ccsdk.config.generator.tool\r
+                        </Export-Package>\r
+                        <Import-Package>*</Import-Package>\r
+                        <Embed-Transitive>true</Embed-Transitive>\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 5e75c6a..7710fbb 100644 (file)
--- a/blueprints-processor/plugin/model-provider/pom.xml
+++ b/blueprints-processor/plugin/model-provider/pom.xml
@@ -17,81 +17,98 @@
 -->\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.config</groupId>\r
-               <artifactId>blueprints-processor-plugin</artifactId>\r
-               <version>0.0.1-SNAPSHOT</version>\r
-       </parent>\r
-       <artifactId>blueprints-model-provider</artifactId>\r
-       <packaging>bundle</packaging>\r
-       <name>Blueprints Model - Provider</name>\r
-       <url>http://maven.apache.org</url>\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
-       <dependencies>\r
-               <dependency>\r
-                       <groupId>equinoxSDK381</groupId>\r
-                       <artifactId>org.eclipse.osgi</artifactId>\r
-               </dependency>\r
+    <parent>\r
+        <groupId>org.onap.ccsdk.parent</groupId>\r
+        <artifactId>binding-parent</artifactId>\r
+        <version>1.1.0-SNAPSHOT</version>\r
+        <relativePath/>\r
+    </parent>\r
 \r
-               <dependency>\r
-                       <groupId>org.onap.ccsdk.config</groupId>\r
-                       <artifactId>blueprints-rest-adaptor-provider</artifactId>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.onap.ccsdk.config</groupId>\r
-                       <artifactId>blueprints-data-adaptor-provider</artifactId>\r
-               </dependency>\r
+    <groupId>org.onap.ccsdk.config</groupId>\r
+    <version>0.3.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
-               <dependency>\r
-                       <groupId>org.powermock</groupId>\r
-                       <artifactId>powermock-api-mockito</artifactId>\r
-                       <scope>test</scope>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.powermock</groupId>\r
-                       <artifactId>powermock-module-junit4</artifactId>\r
-                       <scope>test</scope>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.apache.sling</groupId>\r
-                       <artifactId>org.apache.sling.testing.osgi-mock</artifactId>\r
-                       <scope>test</scope>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>junit</groupId>\r
-                       <artifactId>junit</artifactId>\r
-                       <scope>test</scope>\r
-               </dependency>\r
-       </dependencies>\r
+    <dependencies>\r
+        <dependency>\r
+            <groupId>equinoxSDK381</groupId>\r
+            <artifactId>org.eclipse.osgi</artifactId>\r
+            <version>${equinox.osgi.version}</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.onap.ccsdk.config</groupId>\r
+            <artifactId>blueprints-rest-adaptor-provider</artifactId>\r
+            <version>${project.version}</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.onap.ccsdk.config</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
+    </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-SymbolicName>org.onap.ccsdk.config.model</Bundle-SymbolicName>\r
-                                               <Export-Package>org.onap.ccsdk.config.model,\r
-                                                       org.onap.ccsdk.config.model.data,\r
-                                                       org.onap.ccsdk.config.model.data.api,\r
-                                                       org.onap.ccsdk.config.model.data.custom,\r
-                                                       org.onap.ccsdk.config.model.data.custom.dict,\r
-                                                       org.onap.ccsdk.config.model.domain,\r
-                                                       org.onap.ccsdk.config.model.service,\r
-                                                       org.onap.ccsdk.config.model.utils,\r
-                                                       org.onap.ccsdk.config.model.validator\r
-                                               </Export-Package>\r
-                                               <Import-Package>*</Import-Package>\r
-                                               <Embed-Transitive>true</Embed-Transitive>\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-SymbolicName>org.onap.ccsdk.config.model</Bundle-SymbolicName>\r
+                        <Export-Package>org.onap.ccsdk.config.model,\r
+                            org.onap.ccsdk.config.model.data,\r
+                            org.onap.ccsdk.config.model.data.api,\r
+                            org.onap.ccsdk.config.model.data.custom,\r
+                            org.onap.ccsdk.config.model.data.custom.dict,\r
+                            org.onap.ccsdk.config.model.domain,\r
+                            org.onap.ccsdk.config.model.service,\r
+                            org.onap.ccsdk.config.model.utils,\r
+                            org.onap.ccsdk.config.model.validator\r
+                        </Export-Package>\r
+                        <Import-Package>*</Import-Package>\r
+                        <Embed-Transitive>true</Embed-Transitive>\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 ed7822a..4424990 100644 (file)
--- a/blueprints-processor/plugin/pom.xml
+++ b/blueprints-processor/plugin/pom.xml
@@ -16,22 +16,25 @@
 -->\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.config</groupId>\r
-               <artifactId>blueprints-processor</artifactId>\r
-               <version>0.0.1-SNAPSHOT</version>\r
-       </parent>\r
-       <artifactId>blueprints-processor-plugin</artifactId>\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
+  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.0-SNAPSHOT</version>\r
+    </parent>\r
+\r
+    <version>0.3.0-SNAPSHOT</version>\r
+    <artifactId>blueprints-processor-plugin</artifactId>\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 8e35566..3111fc9 100644 (file)
--- a/blueprints-processor/pom.xml
+++ b/blueprints-processor/pom.xml
@@ -29,7 +29,7 @@
 \r
        <groupId>org.onap.ccsdk.config</groupId>\r
        <artifactId>blueprints-processor</artifactId>\r
-       <version>0.0.1-SNAPSHOT</version>\r
+       <version>0.3.0-SNAPSHOT</version>\r
        <packaging>pom</packaging>\r
 \r
        <name>Blueprints Processor Module</name>\r