diff options
| author |   Alexis de Talhouët <adetalhouet89@gmail.com> | 2018-09-12 11:15:51 -0400 |
|---|---|---|
| committer | Alexis de Talhouët <adetalhouet89@gmail.com> | 2018-09-12 15:54:38 -0400 |
| commit | 37a244dfa9b485c2832f1882930e0e67238f31fb (patch) | |
| tree | b975bd78c48e78b3a76075b0bd47937b46c3f9d4 /blueprints-processor/plugin | |
| parent | b1dd3beda4b5aa750d7fc2e1bde3ab044b6bb056 (diff) | |
Fix OSGi wiring issues
Change-Id: I84ee15ae657d6a8bb2902a785c119bc96f2674fd
Issue-ID: CCSDK-505
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
Diffstat (limited to 'blueprints-processor/plugin')
| -rw-r--r-- | blueprints-processor/plugin/assignment-provider/pom.xml | 23 | ||||
| -rw-r--r-- | blueprints-processor/plugin/generator-provider/pom.xml | 28 | ||||
| -rw-r--r-- | blueprints-processor/plugin/model-provider/pom.xml | 33 |
3 files changed, 81 insertions, 3 deletions
diff --git a/blueprints-processor/plugin/assignment-provider/pom.xml b/blueprints-processor/plugin/assignment-provider/pom.xml index e1070672c..4f6b2936e 100644 --- a/blueprints-processor/plugin/assignment-provider/pom.xml +++ b/blueprints-processor/plugin/assignment-provider/pom.xml @@ -42,6 +42,26 @@ <version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> + <version>${jackson.version}</version> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + <version>${jackson.version}</version> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-annotations</artifactId> + <version>${jackson.version}</version> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.module</groupId> + <artifactId>jackson-module-jsonSchema</artifactId> + <version>${jackson.version}</version> + </dependency> + <dependency> <groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
@@ -83,7 +103,8 @@ <extensions>true</extensions>
<configuration>
<instructions>
- <Bundle-SymbolicName>org.onap.ccsdk.config.assignment</Bundle-SymbolicName>
+ <Bundle-Name>${project.artifactId}</Bundle-Name> + <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> <Export-Package>org.onap.ccsdk.config.assignment,
org.onap.ccsdk.config.assignment.data,
org.onap.ccsdk.config.assignment.service,
diff --git a/blueprints-processor/plugin/generator-provider/pom.xml b/blueprints-processor/plugin/generator-provider/pom.xml index 106a43f37..006e378a2 100644 --- a/blueprints-processor/plugin/generator-provider/pom.xml +++ b/blueprints-processor/plugin/generator-provider/pom.xml @@ -42,6 +42,31 @@ <version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>org.onap.ccsdk.features</groupId>
+ <artifactId>blueprints-data-adaptor-provider</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.module</groupId>
+ <artifactId>jackson-module-jsonSchema</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.5</version>
@@ -80,7 +105,8 @@ <extensions>true</extensions>
<configuration>
<instructions>
- <Bundle-SymbolicName>org.onap.ccsdk.config.generator</Bundle-SymbolicName>
+ <Bundle-Name>${project.artifactId}</Bundle-Name>
+ <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
<Export-Package>
org.onap.ccsdk.config.generator,
org.onap.ccsdk.config.generator.data,
diff --git a/blueprints-processor/plugin/model-provider/pom.xml b/blueprints-processor/plugin/model-provider/pom.xml index 35264730d..e548c2e2e 100644 --- a/blueprints-processor/plugin/model-provider/pom.xml +++ b/blueprints-processor/plugin/model-provider/pom.xml @@ -37,6 +37,31 @@ <dependencies>
<dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.module</groupId>
+ <artifactId>jackson-module-jsonSchema</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.jayway.jsonpath</groupId>
+ <artifactId>json-path</artifactId>
+ <version>2.3.0</version>
+ </dependency>
+ <dependency>
<groupId>org.onap.ccsdk.features</groupId>
<artifactId>blueprints-rest-adaptor-provider</artifactId>
<version>${project.version}</version>
@@ -70,6 +95,11 @@ <version>${junit.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2.2</version>
+ </dependency>
</dependencies>
<build>
@@ -88,7 +118,8 @@ <extensions>true</extensions>
<configuration>
<instructions>
- <Bundle-SymbolicName>org.onap.ccsdk.config.model</Bundle-SymbolicName>
+ <Bundle-Name>${project.artifactId}</Bundle-Name>
+ <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
<Export-Package>org.onap.ccsdk.config.model,
org.onap.ccsdk.config.model.data,
org.onap.ccsdk.config.model.data.api,
|