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/adaptors/rest-adaptor-provider/pom.xml | |
| 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/adaptors/rest-adaptor-provider/pom.xml')
| -rw-r--r-- | blueprints-processor/adaptors/rest-adaptor-provider/pom.xml | 88 |
1 files changed, 7 insertions, 81 deletions
diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml b/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml index 74175ca2e..ee5f9f675 100644 --- a/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml +++ b/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml @@ -48,68 +48,23 @@ </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.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>org.yaml</groupId>
- <artifactId>snakeyaml</artifactId>
- <version>1.17</version>
- </dependency>
- <dependency>
- <groupId>org.json</groupId>
- <artifactId>json</artifactId>
- <version>${org.json.version}</version>
- </dependency>
- <dependency>
- <groupId>com.jayway.jsonpath</groupId>
- <artifactId>json-path</artifactId>
- <version>2.3.0</version>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2.2</version>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>2.5</version>
- </dependency>
- <dependency>
<groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient-osgi</artifactId>
- <version>4.5.6</version>
+ <artifactId>httpcore</artifactId> + <version>${apache.httpcomponents.core.version}</version> </dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore-osgi</artifactId>
- <version>4.4.10</version>
+ <artifactId>httpclient</artifactId> + <version>${apache.httpcomponents.client.version}</version> </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <version>4.2.9.RELEASE</version>
+ <version>${spring.version}</version> </dependency>
<dependency>
<groupId>com.att.eelf</groupId>
@@ -117,41 +72,11 @@ <version>${eelf.version}</version>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
- <version>4.2.9.RELEASE</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-api-mockito</artifactId>
- <version>1.6.6</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-module-junit4</artifactId>
- <version>1.6.6</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-core</artifactId>
- <version>1.6.6</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-api-support</artifactId>
- <version>1.6.6</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
@@ -170,7 +95,8 @@ <extensions>true</extensions>
<configuration>
<instructions>
- <Bundle-SymbolicName>org.onap.ccsdk.config.rest.adaptor</Bundle-SymbolicName>
+ <Bundle-Name>${project.artifactId}</Bundle-Name> + <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> <Export-Package>org.onap.ccsdk.config.rest.adaptor,
org.onap.ccsdk.config.rest.adaptor.data,
org.onap.ccsdk.config.rest.adaptor.service,
|