Fix OSGi wiring issues

Change-Id: I84ee15ae657d6a8bb2902a785c119bc96f2674fd
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 4fdf824..f328ea9 100644 (file)
--- a/blueprints-processor/adaptors/data-adaptor-provider/pom.xml
+++ b/blueprints-processor/adaptors/data-adaptor-provider/pom.xml
@@ -61,18 +61,12 @@
         <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
+            <version>${spring.version}</version>
         </dependency>\r
         <dependency>\r
             <groupId>org.springframework</groupId>\r
             <artifactId>spring-jdbc</artifactId>\r
-            <version>4.2.9.RELEASE</version>\r
+            <version>${spring.version}</version>
         </dependency>\r
         <dependency>\r
             <groupId>com.att.eelf</groupId>\r
@@ -82,7 +76,7 @@
         <dependency>\r
             <groupId>org.springframework</groupId>\r
             <artifactId>spring-test</artifactId>\r
-            <version>4.2.9.RELEASE</version>\r
+            <version>${spring.version}</version>
             <scope>test</scope>\r
         </dependency>\r
         <dependency>\r
@@ -115,7 +109,8 @@
                 <extensions>true</extensions>\r
                 <configuration>\r
                     <instructions>\r
-                        <Bundle-SymbolicName>org.onap.ccsdk.config.data.adaptor</Bundle-SymbolicName>\r
+                        <Bundle-Name>${project.artifactId}</Bundle-Name>
+                        <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
                         <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

diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml b/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml
index 74175ca..ee5f9f6 100644 (file)
--- a/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml
+++ b/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml
@@ -46,112 +46,37 @@
             <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.17</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
+            <artifactId>httpcore</artifactId>
+            <version>${apache.httpcomponents.core.version}</version>
         </dependency>\r
         <dependency>\r
             <groupId>org.apache.httpcomponents</groupId>\r
-            <artifactId>httpcore-osgi</artifactId>\r
-            <version>4.4.10</version>\r
+            <artifactId>httpclient</artifactId>
+            <version>${apache.httpcomponents.client.version}</version>
         </dependency>\r
         <dependency>\r
             <groupId>org.springframework</groupId>\r
             <artifactId>spring-web</artifactId>\r
-            <version>4.2.9.RELEASE</version>\r
+            <version>${spring.version}</version>
         </dependency>\r
         <dependency>\r
             <groupId>com.att.eelf</groupId>\r
             <artifactId>eelf-core</artifactId>\r
             <version>${eelf.version}</version>\r
         </dependency>\r
-        <dependency>\r
-            <groupId>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
@@ -170,7 +95,8 @@
                 <extensions>true</extensions>\r
                 <configuration>\r
                     <instructions>\r
-                        <Bundle-SymbolicName>org.onap.ccsdk.config.rest.adaptor</Bundle-SymbolicName>\r
+                        <Bundle-Name>${project.artifactId}</Bundle-Name>
+                        <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
                         <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

diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/AbstractConfigRestClientAdapter.java b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/AbstractConfigRestClientAdapter.java
index 9730262..7829ee6 100644 (file)
--- a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/AbstractConfigRestClientAdapter.java
+++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/AbstractConfigRestClientAdapter.java
@@ -147,8 +147,8 @@ abstract class AbstractConfigRestClientAdapter implements ConfigRestClientServic
 \r
     public <T> T exchangeResource(HttpHeaders headers, String url, Object request, Class<T> responseType, String method)\r
             throws ConfigRestAdaptorException {\r
-        ResponseEntity<T> response = exchangeForEntity(headers, url, HttpMethod.resolve(method), request, responseType);\r
-        return processResponse(response, url, HttpMethod.resolve(method));\r
+        ResponseEntity<T> response = exchangeForEntity(headers, url, HttpMethod.valueOf(method), request, responseType);
+        return processResponse(response, url, HttpMethod.valueOf(method));
     }\r
 \r
     public RestResponse getResource(HttpHeaders headers, String url) throws ConfigRestAdaptorException {\r
@@ -162,7 +162,7 @@ abstract class AbstractConfigRestClientAdapter implements ConfigRestClientServic
 \r
     public RestResponse exchangeResource(HttpHeaders headers, String url, Object request, String method)\r
             throws ConfigRestAdaptorException {\r
-        return exchangeForEntity(headers, url, HttpMethod.resolve(method), request);\r
+        return exchangeForEntity(headers, url, HttpMethod.valueOf(method), request);
     }\r
 \r
     private RestResponse exchangeForEntity(HttpHeaders headers, String url, HttpMethod httpMethod, Object request)\r

diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/utils/BasicAuthorizationInterceptor.java b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/utils/BasicAuthorizationInterceptor.java
index 2318fd6..b28c2c1 100644 (file)
--- a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/utils/BasicAuthorizationInterceptor.java
+++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/utils/BasicAuthorizationInterceptor.java
@@ -1,13 +1,13 @@
 /*\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
@@ -19,12 +19,12 @@ package org.onap.ccsdk.config.rest.adaptor.utils;
 \r
 import java.io.IOException;\r
 import java.nio.charset.Charset;\r
+import java.util.Base64;
 import org.springframework.http.HttpRequest;\r
 import org.springframework.http.client.ClientHttpRequestExecution;\r
 import org.springframework.http.client.ClientHttpRequestInterceptor;\r
 import org.springframework.http.client.ClientHttpResponse;\r
 import org.springframework.util.Assert;\r
-import org.springframework.util.Base64Utils;\r
 \r
 public class BasicAuthorizationInterceptor implements ClientHttpRequestInterceptor {\r
     private static final Charset UTF_8 = Charset.forName("UTF-8");\r
@@ -49,7 +49,7 @@ public class BasicAuthorizationInterceptor implements ClientHttpRequestIntercept
     public ClientHttpResponse intercept(HttpRequest request, byte[] body, ClientHttpRequestExecution execution)\r
             throws IOException {\r
 \r
-        String token = Base64Utils.encodeToString((this.username + ":" + this.pass).getBytes(UTF_8));\r
+        String token = Base64.getEncoder().encodeToString((this.username + ":" + this.pass).getBytes(UTF_8));
         request.getHeaders().add("Authorization", "Basic " + token);\r
         return execution.execute(request, body);\r
     }\r

diff --git a/blueprints-processor/features/ccsdk-blueprints-processor/pom.xml b/blueprints-processor/features/ccsdk-blueprints-processor/pom.xml
index 125012e..4f396b7 100644 (file)
--- a/blueprints-processor/features/ccsdk-blueprints-processor/pom.xml
+++ b/blueprints-processor/features/ccsdk-blueprints-processor/pom.xml
@@ -32,17 +32,6 @@
 
     <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>
@@ -84,90 +73,25 @@
             <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>-->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.module</groupId>
+            <artifactId>jackson-module-jsonSchema</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
     </dependencies>
 </project>

diff --git a/blueprints-processor/plugin/assignment-provider/pom.xml b/blueprints-processor/plugin/assignment-provider/pom.xml
index e107067..4f6b293 100644 (file)
--- a/blueprints-processor/plugin/assignment-provider/pom.xml
+++ b/blueprints-processor/plugin/assignment-provider/pom.xml
@@ -42,6 +42,26 @@
             <version>${project.version}</version>\r
         </dependency>\r
         <dependency>\r
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.module</groupId>
+            <artifactId>jackson-module-jsonSchema</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+        <dependency>
             <groupId>junit</groupId>\r
             <artifactId>junit</artifactId>\r
             <version>${junit.version}</version>\r
@@ -83,7 +103,8 @@
                 <extensions>true</extensions>\r
                 <configuration>\r
                     <instructions>\r
-                        <Bundle-SymbolicName>org.onap.ccsdk.config.assignment</Bundle-SymbolicName>\r
+                        <Bundle-Name>${project.artifactId}</Bundle-Name>
+                        <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
                         <Export-Package>org.onap.ccsdk.config.assignment,\r
                             org.onap.ccsdk.config.assignment.data,\r
                             org.onap.ccsdk.config.assignment.service,\r

diff --git a/blueprints-processor/plugin/generator-provider/pom.xml b/blueprints-processor/plugin/generator-provider/pom.xml
index 106a43f..006e378 100644 (file)
--- a/blueprints-processor/plugin/generator-provider/pom.xml
+++ b/blueprints-processor/plugin/generator-provider/pom.xml
@@ -41,6 +41,31 @@
             <artifactId>blueprints-model-provider</artifactId>\r
             <version>${project.version}</version>\r
         </dependency>\r
+        <dependency>\r
+            <groupId>org.onap.ccsdk.features</groupId>\r
+            <artifactId>blueprints-data-adaptor-provider</artifactId>\r
+            <version>${project.version}</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>com.fasterxml.jackson.core</groupId>\r
+            <artifactId>jackson-core</artifactId>\r
+            <version>${jackson.version}</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>com.fasterxml.jackson.core</groupId>\r
+            <artifactId>jackson-databind</artifactId>\r
+            <version>${jackson.version}</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>com.fasterxml.jackson.core</groupId>\r
+            <artifactId>jackson-annotations</artifactId>\r
+            <version>${jackson.version}</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>com.fasterxml.jackson.module</groupId>\r
+            <artifactId>jackson-module-jsonSchema</artifactId>\r
+            <version>${jackson.version}</version>\r
+        </dependency>\r
         <dependency>\r
             <groupId>commons-io</groupId>\r
             <artifactId>commons-io</artifactId>\r
@@ -80,7 +105,8 @@
                 <extensions>true</extensions>\r
                 <configuration>\r
                     <instructions>\r
-                        <Bundle-SymbolicName>org.onap.ccsdk.config.generator</Bundle-SymbolicName>\r
+                        <Bundle-Name>${project.artifactId}</Bundle-Name>\r
+                        <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>\r
                         <Export-Package>\r
                             org.onap.ccsdk.config.generator,\r
                             org.onap.ccsdk.config.generator.data,\r

diff --git a/blueprints-processor/plugin/model-provider/pom.xml b/blueprints-processor/plugin/model-provider/pom.xml
index 3526473..e548c2e 100644 (file)
--- a/blueprints-processor/plugin/model-provider/pom.xml
+++ b/blueprints-processor/plugin/model-provider/pom.xml
@@ -36,6 +36,31 @@
     <url>http://maven.apache.org</url>\r
 \r
     <dependencies>\r
+        <dependency>\r
+            <groupId>com.fasterxml.jackson.core</groupId>\r
+            <artifactId>jackson-core</artifactId>\r
+            <version>${jackson.version}</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>com.fasterxml.jackson.core</groupId>\r
+            <artifactId>jackson-databind</artifactId>\r
+            <version>${jackson.version}</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>com.fasterxml.jackson.core</groupId>\r
+            <artifactId>jackson-annotations</artifactId>\r
+            <version>${jackson.version}</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>com.fasterxml.jackson.module</groupId>\r
+            <artifactId>jackson-module-jsonSchema</artifactId>\r
+            <version>${jackson.version}</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>com.jayway.jsonpath</groupId>\r
+            <artifactId>json-path</artifactId>\r
+            <version>2.3.0</version>\r
+        </dependency>\r
         <dependency>\r
             <groupId>org.onap.ccsdk.features</groupId>\r
             <artifactId>blueprints-rest-adaptor-provider</artifactId>\r
@@ -70,6 +95,11 @@
             <version>${junit.version}</version>\r
             <scope>test</scope>\r
         </dependency>\r
+        <dependency>\r
+            <groupId>commons-collections</groupId>\r
+            <artifactId>commons-collections</artifactId>\r
+            <version>3.2.2</version>\r
+        </dependency>\r
     </dependencies>\r
 \r
     <build>\r
@@ -88,7 +118,8 @@
                 <extensions>true</extensions>\r
                 <configuration>\r
                     <instructions>\r
-                        <Bundle-SymbolicName>org.onap.ccsdk.config.model</Bundle-SymbolicName>\r
+                        <Bundle-Name>${project.artifactId}</Bundle-Name>\r
+                        <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</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

diff --git a/features/ccsdk-features-adaptors-all/pom.xml b/features/ccsdk-features-all/pom.xml
similarity index 96%
rename from features/ccsdk-features-adaptors-all/pom.xml
rename to features/ccsdk-features-all/pom.xml
index 03c4d73..34496a6 100644 (file)
--- a/features/ccsdk-features-adaptors-all/pom.xml
+++ b/features/ccsdk-features-all/pom.xml
@@ -31,7 +31,7 @@
     <version>0.3.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
-    <name>Blueprints Processor :: features :: ${project.artifactId}</name>
+    <name>ccsdk-features :: features :: ${project.artifactId}</name>
     <dependencyManagement>
         <dependencies>
             <dependency>

diff --git a/features/features-features-adaptors/pom.xml b/features/features-features/pom.xml
similarity index 100%
rename from features/features-features-adaptors/pom.xml
rename to features/features-features/pom.xml

diff --git a/features/pom.xml b/features/pom.xml
index 946f226..665efe8 100755 (executable)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -33,8 +33,8 @@
     <name>Blueprints Processor :: features</name>
 
     <modules>
-        <module>ccsdk-features-adaptors-all</module>
-        <module>features-features-adaptors</module>
+        <module>ccsdk-features-all</module>
+        <module>features-features</module>
         <module>installer</module>
     </modules>
 </project>