summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2019-10-23 16:38:11 +0000
committerGerrit Code Review <gerrit@onap.org>2019-10-23 16:38:11 +0000
commit985fee3d36c25611094145399e494972176612cd (patch)
treeef9768b9687edbc35d2c44f1da37ceb788c65d25
parentfe8c4ae15a2301db06f1a1b217b8db82f4716211 (diff)
parent441e0ff67598193571f791e2406aa7f9e2730edd (diff)
Merge "pom changes"
-rwxr-xr-xaai-service/provider/pom.xml43
1 files changed, 8 insertions, 35 deletions
diff --git a/aai-service/provider/pom.xml b/aai-service/provider/pom.xml
index 5055c6499..e3145451b 100755
--- a/aai-service/provider/pom.xml
+++ b/aai-service/provider/pom.xml
@@ -15,10 +15,8 @@
<packaging>bundle</packaging>
<name>ccsdk-sli-adaptors :: aai-service :: ${project.artifactId}</name>
- <url>http://maven.apache.org</url>
<properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<ccsdk.sli.adaptors.version>${project.version}</ccsdk.sli.adaptors.version>
</properties>
@@ -48,23 +46,15 @@
<dependency>
<groupId>org.onap.ccsdk.sli.core</groupId>
<artifactId>sli-common</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.onap.ccsdk.sli.core</groupId>
- <artifactId>sli-provider</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.onap.ccsdk.sli.core</groupId>
- <artifactId>utils-provider</artifactId>
- <version>${ccsdk.sli.core.version}</version>
+ <scope>provided</scope>
</dependency>
+ <!-- let filters project deliver this to the karaf container -->
<dependency>
<groupId>org.onap.logging-analytics</groupId>
<artifactId>logging-filter-base</artifactId>
<version>1.5.0</version>
- </dependency>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
@@ -74,26 +64,10 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.core</groupId>
- <artifactId>jersey-client</artifactId>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.core</groupId>
- <artifactId>jersey-common</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- </dependency>
+ <dependency>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>javax.ws.rs-api</artifactId>
+ </dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
@@ -114,7 +88,6 @@
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</dependency>
-
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>