Migrate features to Oxygen

Change-Id: Ic9db80e71070093209b8eda1cdd12e053a18aded
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 a965c7f..9454421 100644 (file)
--- a/blueprints-processor/adaptors/data-adaptor-provider/pom.xml
+++ b/blueprints-processor/adaptors/data-adaptor-provider/pom.xml
@@ -122,18 +122,6 @@
                             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

diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/ConfigPropertyMapDaoImpl.java b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/ConfigPropertyMapDaoImpl.java
index 423e014..65e241e 100644 (file)
--- a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/ConfigPropertyMapDaoImpl.java
+++ b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/config/data/adaptor/dao/ConfigPropertyMapDaoImpl.java
@@ -25,6 +25,7 @@ import java.util.concurrent.TimeUnit;
 import org.apache.commons.lang3.StringUtils;\r
 import org.onap.ccsdk.config.data.adaptor.DataAdaptorConstants;\r
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;\r
+import org.springframework.jdbc.CannotGetJdbcConnectionException;\r
 import org.springframework.jdbc.core.JdbcTemplate;\r
 import com.att.eelf.configuration.EELFLogger;\r
 import com.att.eelf.configuration.EELFManager;\r
@@ -45,21 +46,23 @@ public class ConfigPropertyMapDaoImpl implements ConfigPropertyMapDao {
         if (!(DataAdaptorConstants.PROPERTY_ENV_PROD.equalsIgnoreCase(envType)\r
                 || DataAdaptorConstants.PROPERTY_ENV_SOLO.equalsIgnoreCase(envType))) {\r
             ScheduledExecutorService executor = Executors.newScheduledThreadPool(1);\r
-            Runnable task = () -> {\r
-                initializeMap();\r
-            };\r
+            Runnable task = this::initializeMap;\r
             executor.scheduleWithFixedDelay(task, 60, 15, TimeUnit.MINUTES);\r
         }\r
     }\r
 \r
     private void initializeMap() {\r
-        String getPropQuery = "SELECT * FROM CONFIG_PROPERTY_MAP";\r
-        jdbcTemplate.queryForList(getPropQuery).forEach(rows -> {\r
-            String key = StringUtils.trimToEmpty((String) rows.get("reference_key"));\r
-            String value = StringUtils.trimToEmpty((String) rows.get("reference_value"));\r
-            configPropertyMap.put(key, value);\r
-        });\r
-        logger.trace("loaded configPropertyMap : ({})", configPropertyMap);\r
+        try {\r
+            String getPropQuery = "SELECT * FROM CONFIG_PROPERTY_MAP";\r
+            jdbcTemplate.queryForList(getPropQuery).forEach(rows -> {\r
+                String key = StringUtils.trimToEmpty((String) rows.get("reference_key"));\r
+                String value = StringUtils.trimToEmpty((String) rows.get("reference_value"));\r
+                configPropertyMap.put(key, value);\r
+            });\r
+            logger.trace("loaded configPropertyMap : ({})", configPropertyMap);\r
+        } catch (CannotGetJdbcConnectionException e) {\r
+            // WHAT TO DO?\r
+        }\r
     }\r
 \r
     @Override\r

diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml b/blueprints-processor/adaptors/data-adaptor-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
index 4cf4d78..644fd77 100644 (file)
--- a/blueprints-processor/adaptors/data-adaptor-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
+++ b/blueprints-processor/adaptors/data-adaptor-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
@@ -24,20 +24,6 @@
 \r
        <reference id="dataSource" interface="javax.sql.DataSource" />\r
 \r
-       <!-- Expose the Common Component Bean -->\r
-\r
-       <bean id="configResourceService"\r
-               class="org.onap.ccsdk.config.data.adaptor.service.ConfigResourceServiceImpl">\r
-               <argument ref="transactionLogDao" />\r
-               <argument ref="configResourceDao" />\r
-               <argument ref="queryExecutorDao" />\r
-               <argument ref="namedQueryExecutorDao" />\r
-               <argument ref="configPropertyMapDao" />\r
-       </bean>\r
-\r
-       <service ref="configResourceService"\r
-               interface="org.onap.ccsdk.config.data.adaptor.service.ConfigResourceService" />\r
-\r
        <!-- Data SourceInitialisation -->\r
 \r
        <bean id="config.dataSource"\r
@@ -81,4 +67,18 @@
                <argument ref="jdbcTemplate" />\r
        </bean>\r
 \r
+       <!-- Expose the Common Component Bean -->\r
+\r
+       <bean id="configResourceService"\r
+       class="org.onap.ccsdk.config.data.adaptor.service.ConfigResourceServiceImpl">\r
+               <argument ref="transactionLogDao" />\r
+               <argument ref="configResourceDao" />\r
+               <argument ref="queryExecutorDao" />\r
+               <argument ref="namedQueryExecutorDao" />\r
+               <argument ref="configPropertyMapDao" />\r
+       </bean>\r
+\r
+       <service ref="configResourceService"\r
+       interface="org.onap.ccsdk.config.data.adaptor.service.ConfigResourceService" />\r
+\r
 </blueprint>\r

diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml b/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml
index d35f1c1..6f17a1c 100644 (file)
--- a/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml
+++ b/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml
@@ -74,7 +74,7 @@
         <dependency>\r
             <groupId>org.yaml</groupId>\r
             <artifactId>snakeyaml</artifactId>\r
-            <version>1.12</version>\r
+            <version>1.17</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.json</groupId>\r
@@ -176,18 +176,6 @@
                             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

diff --git a/blueprints-processor/features/ccsdk-blueprints-processor/pom.xml b/blueprints-processor/features/ccsdk-blueprints-processor/pom.xml
new file mode 100644 (file)
index 0000000..f53b24a
--- /dev/null
+++ b/blueprints-processor/features/ccsdk-blueprints-processor/pom.xml
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright (C) 2018 AT&T, Bell Canada
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>single-feature-parent</artifactId>
+        <version>1.1.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.onap.ccsdk.config</groupId>
+    <artifactId>ccsdk-blueprints-processor</artifactId>
+    <version>0.3.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name>Blueprints Processor :: Features :: ${project.artifactId}</name>
+
+    <properties>
+        <common.collections.version>3.2.2</common.collections.version>
+        <common.io.version>2.5</common.io.version>
+        <snakeyaml.version>1.12</snakeyaml.version>
+        <velocity.version>1.7</velocity.version>
+        <jsonpath.version>2.3.0</jsonpath.version>
+        <json-smart.version>2.3</json-smart.version>
+        <accessors-smart.version>1.2</accessors-smart.version>
+        <jsch.version>0.1.54</jsch.version>
+    </properties>
+
+    <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>${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.jcraft</groupId>-->
+            <!--<artifactId>jsch</artifactId>-->
+            <!--<version>${jsch.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>com.jayway.jsonpath</groupId>-->
+            <!--<artifactId>json-path</artifactId>-->
+            <!--<version>${jsonpath.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.json</groupId>-->
+            <!--<artifactId>json</artifactId>-->
+            <!--<version>${org.json.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.yaml</groupId>-->
+            <!--<artifactId>snakeyaml</artifactId>-->
+            <!--<version>${snakeyaml.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.apache.velocity</groupId>-->
+            <!--<artifactId>velocity</artifactId>-->
+            <!--<version>${velocity.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>commons-io</groupId>-->
+            <!--<artifactId>commons-io</artifactId>-->
+            <!--<version>${common.io.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>net.minidev</groupId>-->
+            <!--<artifactId>json-smart</artifactId>-->
+            <!--<version>2.3</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>net.minidev</groupId>-->
+            <!--<artifactId>accessors-smart</artifactId>-->
+            <!--<version>1.2</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.apache.commons</groupId>-->
+            <!--<artifactId>commons-lang3</artifactId>-->
+            <!--<version>${commons.lang3.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>commons-collections</groupId>-->
+            <!--<artifactId>commons-collections</artifactId>-->
+            <!--<version>${common.collections.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.core</groupId>-->
+            <!--<artifactId>jackson-core</artifactId>-->
+            <!--<version>${jackson.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>com.fasterxml.jackson.dataformat</groupId>-->
+            <!--<artifactId>jackson-dataformat-xml</artifactId>-->
+            <!--<version>${jackson.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>com.fasterxml.jackson.module</groupId>-->
+            <!--<artifactId>jackson-module-jaxb-annotations</artifactId>-->
+            <!--<version>${jackson.version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>com.fasterxml.jackson.dataformat</groupId>-->
+            <!--<artifactId>jackson-dataformat-yaml</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
new file mode 100755 (executable)
index 0000000..9e8c802
--- /dev/null
+++ b/blueprints-processor/features/features-blueprints-processor/pom.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright (C) 2018 AT&T, Bell Canada
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>feature-repo-parent</artifactId>
+        <version>1.1.0-SNAPSHOT</version>
+        <relativePath />
+    </parent>
+
+    <groupId>org.onap.ccsdk.config</groupId>
+    <artifactId>features-blueprints-processor</artifactId>
+    <version>0.3.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
old mode 100644 (file)
new mode 100755 (executable)
index f80d14f..5f93e83
--- a/blueprints-processor/features/pom.xml
+++ b/blueprints-processor/features/pom.xml
@@ -1,109 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<!--\r
-  Copyright © 2017-2018 AT&T Intellectual Property.\r
-  Modifications Copyright © 2018 IBM.\r
-  \r
-  Licensed under the Apache License, Version 2.0 (the "License");\r
-  you may not use this file except in compliance with the License.\r
-  You may obtain a copy of the License at\r
-  \r
-      http://www.apache.org/licenses/LICENSE-2.0\r
-  \r
-  Unless required by applicable law or agreed to in writing, software\r
-  distributed under the License is distributed on an "AS IS" BASIS,\r
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-  See the License for the specific language governing permissions and\r
-  limitations under the License.\r
--->\r
-\r
-<project xmlns="http://maven.apache.org/POM/4.0.0"\r
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/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.3.0-SNAPSHOT</version>\r
-       </parent>\r
-\r
-       <artifactId>blueprints-processor-features</artifactId>\r
-       <packaging>jar</packaging>\r
-       <name>Blueprints Processor - Features</name>\r
-\r
-       <dependencies>\r
-               <dependency>\r
-                       <groupId>org.onap.ccsdk.config</groupId>\r
-                       <artifactId>blueprints-data-adaptor-provider</artifactId>\r
-               </dependency>\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-assignment-provider</artifactId>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.onap.ccsdk.config</groupId>\r
-                       <artifactId>blueprints-generator-provider</artifactId>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.onap.ccsdk.config</groupId>\r
-                       <artifactId>blueprints-model-provider</artifactId>\r
-               </dependency>\r
-\r
-               <dependency>\r
-                       <groupId>org.opendaylight.mdsal</groupId>\r
-                       <artifactId>features-mdsal</artifactId>\r
-                       <classifier>features</classifier>\r
-                       <type>xml</type>\r
-                       <scope>runtime</scope>\r
-               </dependency>\r
-       </dependencies>\r
-\r
-       <build>\r
-               <resources>\r
-                       <resource>\r
-                               <filtering>true</filtering>\r
-                               <directory>src/main/resources</directory>\r
-                       </resource>\r
-               </resources>\r
-               <plugins>\r
-                       <plugin>\r
-                               <groupId>org.apache.maven.plugins</groupId>\r
-                               <artifactId>maven-resources-plugin</artifactId>\r
-                               <executions>\r
-                                       <execution>\r
-                                               <id>filter</id>\r
-                                               <goals>\r
-                                                       <goal>resources</goal>\r
-                                               </goals>\r
-                                               <phase>generate-resources</phase>\r
-                                       </execution>\r
-                               </executions>\r
-                       </plugin>\r
-                       <plugin>\r
-                               <groupId>org.codehaus.mojo</groupId>\r
-                               <artifactId>build-helper-maven-plugin</artifactId>\r
-                               <executions>\r
-                                       <execution>\r
-                                               <id>attach-artifacts</id>\r
-                                               <goals>\r
-                                                       <goal>attach-artifact</goal>\r
-                                               </goals>\r
-                                               <phase>package</phase>\r
-                                               <configuration>\r
-                                                       <artifacts>\r
-                                                               <artifact>\r
-                                                                       <file>${project.build.directory}/classes/${features.file}</file>\r
-                                                                       <type>xml</type>\r
-                                                                       <classifier>features</classifier>\r
-                                                               </artifact>\r
-                                                       </artifacts>\r
-                                               </configuration>\r
-                                       </execution>\r
-                               </executions>\r
-                       </plugin>\r
-               </plugins>\r
-       </build>\r
-</project>\r
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright (C) 2018 AT&T, Bell Canada
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>1.1.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+    <artifactId>blueprints-processor-features</artifactId>
+    <version>0.3.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <name>Blueprints Processor :: Features aggregator :: ${project.artifactId}</name>
+
+    <modules>
+        <module>ccsdk-blueprints-processor</module>
+        <module>features-blueprints-processor</module>
+    </modules>
+</project>

diff --git a/blueprints-processor/features/src/main/resources/features.xml b/blueprints-processor/features/src/main/resources/features.xml
deleted file mode 100644 (file)
index 4375fa9..0000000
--- a/blueprints-processor/features/src/main/resources/features.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<!--\r
-  Copyright © 2017-2018 AT&T Intellectual Property.\r
-  Modifications Copyright © 2018 IBM.\r
-  \r
-  Licensed under the Apache License, Version 2.0 (the "License");\r
-  you may not use this file except in compliance with the License.\r
-  You may obtain a copy of the License at\r
-  \r
-      http://www.apache.org/licenses/LICENSE-2.0\r
-  \r
-  Unless required by applicable law or agreed to in writing, software\r
-  distributed under the License is distributed on an "AS IS" BASIS,\r
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-  See the License for the specific language governing permissions and\r
-  limitations under the License.\r
--->\r
-\r
-<features name="blueprints-processor-${project.version}"\r
-       xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"\r
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-       xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">\r
-\r
-       <repository>mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.features.version}/xml/features</repository>\r
-\r
-       <feature name='blueprints-processor-dependency'\r
-               description="SDNC Controller: Blueprints Features Dependency"\r
-               version='${project.version}'>\r
-               <feature>ccsdk-sli</feature>\r
-\r
-               <bundle>wrap:mvn:com.jcraft/jsch/${jsch.version}</bundle>\r
-               <bundle>wrap:mvn:com.jayway.jsonpath/json-path/${jsonpath.version}</bundle>\r
-\r
-               <bundle>wrap:mvn:org.json/json/${org.json.version}</bundle>\r
-               <bundle>wrap:mvn:org.yaml/snakeyaml/${snakeyaml.version}</bundle>\r
-               <bundle>wrap:mvn:org.apache.velocity/velocity/${velocity.version}</bundle>\r
-\r
-               <bundle>wrap:mvn:commons-io/commons-io/${common.io.version}</bundle>\r
-               <bundle>wrap:mvn:net.minidev/json-smart/${json-smart.version}</bundle>\r
-               <bundle>wrap:mvn:net.minidev/accessors-smart/${accessors-smart.version}</bundle>\r
-\r
-               <bundle>mvn:commons-lang/commons-lang/${commons.lang.version}</bundle>\r
-               <bundle>mvn:commons-collections/commons-collections/${common.collections.version}</bundle>\r
-\r
-               <bundle>wrap:mvn:com.fasterxml.jackson.core/jackson-core/${jackson.version}</bundle>\r
-               <bundle>wrap:mvn:com.fasterxml.jackson.core/jackson-databind/${jackson.version}</bundle>\r
-               <bundle>wrap:mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson.version}</bundle>\r
-               <bundle>wrap:mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-xml/${jackson.version}</bundle>\r
-               <bundle>wrap:mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/${jackson.version}</bundle>\r
-               <bundle>wrap:mvn:com.fasterxml.jackson.module/jackson-module-jsonSchema/${jackson.version}</bundle>\r
-               <bundle>wrap:mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/${jackson.version}</bundle>\r
-       </feature>\r
-\r
-       <feature name='blueprints-processor-libs'\r
-               description="SDNC Controller: Blueprints Libs"\r
-               version='${project.version}'>\r
-               <feature version="${project.version}">blueprints-processor-dependency</feature>\r
-               <bundle>mvn:org.onap.ccsdk.config/blueprints-rest-adaptor-provider/${project.version}</bundle>\r
-               <bundle>mvn:org.onap.ccsdk.config/blueprints-data-adaptor-provider/${project.version}</bundle>\r
-               <bundle>mvn:org.onap.ccsdk.config/blueprints-model-provider/${project.version}</bundle>\r
-       </feature>\r
-\r
-       <feature name='blueprints-processor-features'\r
-               description="SDNC Controller: Blueprints Features"\r
-               version='${project.version}'>\r
-               <feature version="${project.version}">blueprints-processor-libs</feature>\r
-               <bundle>mvn:org.onap.ccsdk.config/blueprints-generator-provider/${project.version}</bundle>\r
-               <bundle>mvn:org.onap.ccsdk.config/blueprints-assignment-provider/${project.version}</bundle>\r
-       </feature>\r
-\r
-</features>\r

diff --git a/blueprints-processor/installer/pom.xml b/blueprints-processor/installer/pom.xml
index 65d42ec..74591e2 100644 (file)
--- a/blueprints-processor/installer/pom.xml
+++ b/blueprints-processor/installer/pom.xml
@@ -43,7 +43,7 @@
        <dependencies>\r
                <dependency>\r
                        <groupId>org.onap.ccsdk.config</groupId>\r
-                       <artifactId>blueprints-processor-features</artifactId>\r
+                       <artifactId>ccsdk-blueprints-processor</artifactId>\r
                        <version>${project.version}</version>\r
                        <classifier>features</classifier>\r
                        <type>xml</type>\r

diff --git a/blueprints-processor/plugin/assignment-provider/pom.xml b/blueprints-processor/plugin/assignment-provider/pom.xml
index 073f9af..6eeac10 100644 (file)
--- a/blueprints-processor/plugin/assignment-provider/pom.xml
+++ b/blueprints-processor/plugin/assignment-provider/pom.xml
@@ -36,11 +36,6 @@
     <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
@@ -95,8 +90,6 @@
                             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

diff --git a/blueprints-processor/plugin/assignment-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml b/blueprints-processor/plugin/assignment-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
index c880c8d..baa6bdb 100644 (file)
--- a/blueprints-processor/plugin/assignment-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
+++ b/blueprints-processor/plugin/assignment-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
@@ -35,9 +35,6 @@
        <reference id="configGeneratorService"\r
                interface="org.onap.ccsdk.config.generator.service.ConfigGeneratorService" />\r
 \r
-       <reference id="configProvDataStore"\r
-               interface="org.onap.ccsdk.config.provdata.service.ConfigProvDataStore" />\r
-\r
        <!-- Expose the Common Component Bean -->\r
        <bean id="configAssignmentNode"\r
                class="org.onap.ccsdk.config.assignment.service.ConfigAssignmentNode">\r
@@ -46,7 +43,6 @@
                <argument ref="configModelService" />\r
                <argument ref="componentNodeService" />\r
                <argument ref="configGeneratorService" />\r
-               <argument ref="configProvDataStore" />\r
        </bean>\r
 \r
        <service ref="configAssignmentNode"\r
@@ -59,7 +55,6 @@
                <argument ref="configModelService" />\r
                <argument ref="componentNodeService" />\r
                <argument ref="configGeneratorService" />\r
-               <argument ref="configProvDataStore" />\r
        </bean>\r
 \r
        <service ref="configAssignmentService"\r

diff --git a/blueprints-processor/plugin/generator-provider/pom.xml b/blueprints-processor/plugin/generator-provider/pom.xml
index f18170a..82ddd11 100644 (file)
--- a/blueprints-processor/plugin/generator-provider/pom.xml
+++ b/blueprints-processor/plugin/generator-provider/pom.xml
@@ -36,11 +36,6 @@
     <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
@@ -92,8 +87,6 @@
                             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

diff --git a/blueprints-processor/plugin/model-provider/pom.xml b/blueprints-processor/plugin/model-provider/pom.xml
index 7710fbb..f14ec3a 100644 (file)
--- a/blueprints-processor/plugin/model-provider/pom.xml
+++ b/blueprints-processor/plugin/model-provider/pom.xml
@@ -36,11 +36,6 @@
     <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-rest-adaptor-provider</artifactId>\r
@@ -97,15 +92,12 @@
                         <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.data.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

diff --git a/blueprints-processor/pom.xml b/blueprints-processor/pom.xml
index 3111fc9..ee8ce1d 100644 (file)
--- a/blueprints-processor/pom.xml
+++ b/blueprints-processor/pom.xml
@@ -36,374 +36,6 @@
        <url>http://wiki.sdn.labs.att.com</url>\r
        <description>Blueprints Processor Blueprints Processor</description>\r
 \r
-       <properties>\r
-               <maven.javadoc.failOnError>false</maven.javadoc.failOnError>\r
-               <maven.bundle.version>3.5.0</maven.bundle.version>\r
-\r
-               <odl.mdsal.features.version>2.3.3</odl.mdsal.features.version>\r
-               <odl.controller.config.api.version>0.7.3</odl.controller.config.api.version>\r
-\r
-               <spring.version>4.2.9.RELEASE</spring.version>\r
-               <apache.httpcomponents.core.version>4.4.10</apache.httpcomponents.core.version>\r
-               <apache.httpcomponents.client.version>4.5.6</apache.httpcomponents.client.version>\r
-\r
-               <common.collections.version>3.2.2</common.collections.version>\r
-               <common.io.version>2.5</common.io.version>\r
-               <snakeyaml.version>1.12</snakeyaml.version>\r
-               <velocity.version>1.7</velocity.version>\r
-\r
-               <jsonpath.version>2.3.0</jsonpath.version>\r
-               <json-smart.version>2.3</json-smart.version>\r
-\r
-               <accessors-smart.version>1.2</accessors-smart.version>\r
-               <asm.version>5.0.4</asm.version>\r
-               <jsch.version>0.1.54</jsch.version>\r
-               <jasypt.version>1.9.2</jasypt.version>\r
-               <xercesImpl.version>2.11.0</xercesImpl.version>\r
-\r
-               <!-- Test Dependencies -->\r
-               <powermock.version>1.6.6</powermock.version>\r
-               <sling.version>2.3.2</sling.version>\r
-       </properties>\r
-\r
-       <dependencyManagement>\r
-               <dependencies>\r
-                       <dependency>\r
-                               <groupId>org.onap.ccsdk.config</groupId>\r
-                               <artifactId>blueprints-processor-features</artifactId>\r
-                               <classifier>features</classifier>\r
-                               <type>xml</type>\r
-                               <version>${project.version}</version>\r
-                       </dependency>\r
-                       <dependency>\r
-                               <groupId>org.onap.ccsdk.sli.core</groupId>\r
-                               <artifactId>sli-provider</artifactId>\r
-                               <version>${ccsdk.sli.core.version}</version>\r
-                               <scope>compile</scope>\r
-                               <exclusions>\r
-                                       <exclusion>\r
-                                               <groupId>org.apache.karaf.shell</groupId>\r
-                                               <artifactId>\r
-                                               org.apache.karaf.shell.console\r
-                                       </artifactId>\r
-                                       </exclusion>\r
-                               </exclusions>\r
-                       </dependency>\r
-                       <dependency>\r
-                               <groupId>org.onap.ccsdk.sli.adaptors</groupId>\r
-                               <artifactId>sql-resource-provider</artifactId>\r
-                               <version>${ccsdk.sli.adaptors.version}</version>\r
-                               <scope>compile</scope>\r
-                       </dependency>\r
-\r
-                       <!-- ODL Features -->\r
-                       <dependency>\r
-                               <groupId>org.opendaylight.mdsal</groupId>\r
-                               <artifactId>features-mdsal</artifactId>\r
-                               <version>${odl.mdsal.features.version}</version>\r
-                               <classifier>features</classifier>\r
-                               <type>xml</type>\r
-                               <scope>runtime</scope>\r
-                       </dependency>\r
-\r
-                       <!-- Common Utils -->\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.att.eelf</groupId>\r
-                               <artifactId>eelf-core</artifactId>\r
-                               <version>${eelf.version}</version>\r
-                       </dependency>\r
-\r
-                       <dependency>\r
-                               <groupId>org.springframework</groupId>\r
-                               <artifactId>spring-core</artifactId>\r
-                               <version>${spring.version}</version>\r
-                       </dependency>\r
-                       <dependency>\r
-                               <groupId>org.springframework</groupId>\r
-                               <artifactId>spring-aop</artifactId>\r
-                               <version>${spring.version}</version>\r
-                       </dependency>\r
-                       <dependency>\r
-                               <groupId>org.springframework</groupId>\r
-                               <artifactId>spring-beans</artifactId>\r
-                               <version>${spring.version}</version>\r
-                       </dependency>\r
-                       <dependency>\r
-                               <groupId>org.springframework</groupId>\r
-                               <artifactId>spring-context</artifactId>\r
-                               <version>${spring.version}</version>\r
-                       </dependency>\r
-                       <dependency>\r
-                               <groupId>org.springframework</groupId>\r
-                               <artifactId>spring-expression</artifactId>\r
-                               <version>${spring.version}</version>\r
-                       </dependency>\r
-                       <dependency>\r
-                               <groupId>org.springframework</groupId>\r
-                               <artifactId>spring-jdbc</artifactId>\r
-                               <version>${spring.version}</version>\r
-                       </dependency>\r
-                       <dependency>\r
-                               <groupId>org.springframework</groupId>\r
-                               <artifactId>spring-tx</artifactId>\r
-                               <version>${spring.version}</version>\r
-                       </dependency>\r
-                       <dependency>\r
-                               <groupId>org.springframework</groupId>\r
-                               <artifactId>spring-web</artifactId>\r
-                               <version>${spring.version}</version>\r
-                       </dependency>\r
-                       <dependency>\r
-                               <groupId>equinoxSDK381</groupId>\r
-                               <artifactId>org.eclipse.osgi</artifactId>\r
-                               <version>${equinox.osgi.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.module</groupId>\r
-                               <artifactId>jackson-module-jaxb-annotations</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>com.fasterxml.jackson.datatype</groupId>\r
-                               <artifactId>jackson-datatype-json-org</artifactId>\r
-                               <version>${jackson.version}</version>\r
-                       </dependency>\r
-                       <dependency>\r
-                               <groupId>com.fasterxml.jackson.jaxrs</groupId>\r
-                               <artifactId>jackson-jaxrs-base</artifactId>\r
-                               <version>${jackson.version}</version>\r
-                       </dependency>\r
-                       <dependency>\r
-                               <groupId>com.fasterxml.jackson.jaxrs</groupId>\r
-                               <artifactId>jackson-jaxrs-json-provider</artifactId>\r
-                               <version>${jackson.version}</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>${jsonpath.version}</version>\r
-                       </dependency>\r
-                       <dependency>\r
-                               <groupId>org.yaml</groupId>\r
-                               <artifactId>snakeyaml</artifactId>\r
-                               <version>${snakeyaml.version}</version>\r
-                       </dependency>\r
-                       <dependency>\r
-                               <groupId>org.apache.velocity</groupId>\r
-                               <artifactId>velocity</artifactId>\r
-                               <version>${velocity.version}</version>\r
-                       </dependency>\r
-                       <dependency>\r
-                               <groupId>commons-collections</groupId>\r
-                               <artifactId>commons-collections</artifactId>\r
-                               <version>${common.collections.version}</version>\r
-                       </dependency>\r
-                       <dependency>\r
-                               <groupId>commons-io</groupId>\r
-                               <artifactId>commons-io</artifactId>\r
-                               <version>${common.io.version}</version>\r
-                       </dependency>\r
-                       <dependency>\r
-                               <groupId>org.codehaus.jettison</groupId>\r
-                               <artifactId>jettison</artifactId>\r
-                               <version>${jettison.version}</version>\r
-                               <scope>provided</scope>\r
-                       </dependency>\r
-                       <dependency>\r
-                               <groupId>com.jcraft</groupId>\r
-                               <artifactId>jsch</artifactId>\r
-                               <version>${jsch.version}</version>\r
-                       </dependency>\r
-                       <dependency>\r
-                               <groupId>org.jasypt</groupId>\r
-                               <artifactId>jasypt</artifactId>\r
-                               <version>${jasypt.version}</version>\r
-                       </dependency>\r
-                       <dependency>\r
-                               <groupId>xerces</groupId>\r
-                               <artifactId>xercesImpl</artifactId>\r
-                               <version>${xercesImpl.version}</version>\r
-                       </dependency>\r
-                       <dependency>\r
-                               <groupId>com.sun.jersey</groupId>\r
-                               <artifactId>jersey-client</artifactId>\r
-                               <version>${jersey.client.version}</version>\r
-                               <scope>provided</scope>\r
-                       </dependency>\r
-                       <dependency>\r
-                               <groupId>com.sun.jersey</groupId>\r
-                               <artifactId>jersey-core</artifactId>\r
-                               <version>${jersey.version}</version>\r
-                               <scope>provided</scope>\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
-\r
-                       <!-- Common Bundles -->\r
-                       <dependency>\r
-                               <groupId>org.apache.httpcomponents</groupId>\r
-                               <artifactId>httpclient-osgi</artifactId>\r
-                               <version>${apache.httpcomponents.client.version}</version>\r
-                       </dependency>\r
-                       <dependency>\r
-                               <groupId>org.apache.httpcomponents</groupId>\r
-                               <artifactId>httpcore-osgi</artifactId>\r
-                               <version>${apache.httpcomponents.core.version}</version>\r
-                       </dependency>\r
-\r
-                       <!-- SelfService Features -->\r
-                       <dependency>\r
-                               <groupId>org.onap.ccsdk.config</groupId>\r
-                               <artifactId>blueprints-model-provider</artifactId>\r
-                               <version>${project.version}</version>\r
-                               <scope>compile</scope>\r
-                       </dependency>\r
-                       <dependency>\r
-                               <groupId>org.onap.ccsdk.config</groupId>\r
-                               <artifactId>blueprints-data-adaptor-provider</artifactId>\r
-                               <version>${project.version}</version>\r
-                               <scope>compile</scope>\r
-                       </dependency>\r
-                       <dependency>\r
-                               <groupId>org.onap.ccsdk.config</groupId>\r
-                               <artifactId>blueprints-rest-adaptor-provider</artifactId>\r
-                               <version>${project.version}</version>\r
-                               <scope>compile</scope>\r
-                       </dependency>\r
-                       <dependency>\r
-                               <groupId>org.onap.ccsdk.config</groupId>\r
-                               <artifactId>blueprints-generator-provider</artifactId>\r
-                               <version>${project.version}</version>\r
-                               <scope>compile</scope>\r
-                       </dependency>\r
-                       <dependency>\r
-                               <groupId>org.onap.ccsdk.config</groupId>\r
-                               <artifactId>blueprints-assignment-provider</artifactId>\r
-                               <version>${project.version}</version>\r
-                               <scope>compile</scope>\r
-                       </dependency>\r
-\r
-                       <!-- Test Dependencies -->\r
-                       <dependency>\r
-                               <groupId>org.springframework</groupId>\r
-                               <artifactId>spring-test</artifactId>\r
-                               <version>${spring.version}</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>org.apache.sling</groupId>\r
-                               <artifactId>org.apache.sling.testing.osgi-mock</artifactId>\r
-                               <version>${sling.version}</version>\r
-                               <scope>test</scope>\r
-                       </dependency>\r
-                       <dependency>\r
-                               <groupId>org.mockito</groupId>\r
-                               <artifactId>mockito-core</artifactId>\r
-                               <version>${mockito.version}</version>\r
-                               <scope>test</scope>\r
-                       </dependency>\r
-                       <dependency>\r
-                               <groupId>org.powermock</groupId>\r
-                               <artifactId>powermock-api-mockito</artifactId>\r
-                               <version>${powermock.version}</version>\r
-                               <scope>test</scope>\r
-                       </dependency>\r
-                       <dependency>\r
-                               <groupId>org.powermock</groupId>\r
-                               <artifactId>powermock-api-support</artifactId>\r
-                               <version>${powermock.version}</version>\r
-                               <scope>test</scope>\r
-                       </dependency>\r
-                       <dependency>\r
-                               <groupId>org.powermock</groupId>\r
-                               <artifactId>powermock-core</artifactId>\r
-                               <version>${powermock.version}</version>\r
-                               <scope>test</scope>\r
-                       </dependency>\r
-                       <dependency>\r
-                               <groupId>org.powermock</groupId>\r
-                               <artifactId>powermock-module-junit4</artifactId>\r
-                               <version>${powermock.version}</version>\r
-                               <scope>test</scope>\r
-                       </dependency>\r
-                       <dependency>\r
-                               <groupId>org.powermock</groupId>\r
-                               <artifactId>powermock-reflect</artifactId>\r
-                               <version>${powermock.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
-       </dependencyManagement>\r
-\r
-       <build>\r
-               <plugins>\r
-                       <plugin>\r
-                               <groupId>org.apache.maven.plugins</groupId>\r
-                               <artifactId>maven-javadoc-plugin</artifactId>\r
-                               <configuration>\r
-                                       <excludePackageNames>org.opendaylight.*:io.netty.*:org.osgi.*:org.apache.*\r
-                                       </excludePackageNames>\r
-                               </configuration>\r
-                       </plugin>\r
-               </plugins>\r
-       </build>\r
-\r
        <modules>\r
                <module>adaptors</module>\r
                <module>plugin</module>\r