Release appc

[appc.git] / appc-adapters / appc-rest-adapter / appc-rest-adapter-bundle / pom.xml

diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/pom.xml b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/pom.xml
index 699921d..ce2894a 100644 (file)
--- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/pom.xml
+++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/pom.xml
@@ -3,7 +3,7 @@
   ============LICENSE_START=======================================================
   ONAP : APPC
   ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+  Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
   Copyright (C) 2017 Amdocs
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,16 +18,17 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   ============LICENSE_END=========================================================
-  ECOMP is a trademark and service mark of AT&T Intellectual Property.
   -->
 <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.appc</groupId>
-               <artifactId>appc-rest-adapter</artifactId>
-               <version>1.4.0-SNAPSHOT</version>
+               <groupId>org.onap.appc.parent</groupId>
+               <artifactId>binding-parent</artifactId>
+               <version>2.6.0-SNAPSHOT</version>
+                <relativePath />
        </parent>
 
+        <groupId>org.onap.appc</groupId>
        <artifactId>appc-rest-adapter-bundle</artifactId>
        <packaging>bundle</packaging>
        <name>rest Adapter - bundle</name>
@@ -44,24 +45,9 @@
                        <version>4.4.4</version>
                </dependency>
                <dependency>
-                       <groupId>org.bouncycastle</groupId>
-                       <artifactId>bcpkix-jdk15on</artifactId>
-                       </dependency>
-               <dependency>
-                       <groupId>org.bouncycastle</groupId>
-                       <artifactId>bcprov-jdk15on</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.appc</groupId>
-                       <artifactId>appc-common</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-                       <dependency>
                        <groupId>org.onap.appc</groupId>
-                       <artifactId>appc-common</artifactId>
+                       <artifactId>appc-common-bundle</artifactId>
                        <version>${project.version}</version>
-                       <classifier>jar-with-dependencies</classifier>
-                       <scope>test</scope>
                </dependency>
                <dependency>
                        <groupId>javax</groupId>
@@ -79,12 +65,26 @@
                        <groupId>com.att.cdp</groupId>
                        <artifactId>cdp-pal-common</artifactId>
                        <scope>compile</scope>
+                        <version>${cdp.pal.version}</version>
+                        <exclusions>
+                            <exclusion>
+                                 <groupId>ch.qos.logback</groupId>
+                                 <artifactId>logback-classic</artifactId>
+                            </exclusion>
+                        </exclusions>
                </dependency>
 
                <dependency>
                        <groupId>com.att.cdp</groupId>
                        <artifactId>cdp-pal-openstack</artifactId>
                        <scope>compile</scope>
+                        <version>${cdp.pal.version}</version>
+                        <exclusions>
+                            <exclusion>
+                                 <groupId>com.att.cdp</groupId>
+                                 <artifactId>cdp-pal-common</artifactId>
+                            </exclusion>
+                        </exclusions>
                </dependency>
 
                <dependency>
@@ -127,11 +127,6 @@
             <scope>test</scope>
                </dependency>
 
-               <dependency>
-                       <groupId>org.codehaus.jackson</groupId>
-                       <artifactId>jackson-jaxrs</artifactId>
-                       <version>1.9.13</version>
-               </dependency>
 
                <dependency>
                        <groupId>commons-codec</groupId>
@@ -183,12 +178,19 @@
                <dependency>
                        <groupId>org.slf4j</groupId>
                        <artifactId>jcl-over-slf4j</artifactId>
-                       </dependency>
+               </dependency>
 
                        <dependency>
                                <groupId>org.mariadb.jdbc</groupId>
                                <artifactId>mariadb-java-client</artifactId>
-                       </dependency>
+                <version>${mariadb.client.version}</version>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.osgi</groupId>
+                       <artifactId>org.osgi.core</artifactId>
+                       <scope>provided</scope>
+               </dependency>
 
                <dependency>
                        <groupId>com.vmware</groupId>
@@ -218,11 +220,12 @@
                                                <Bundle-Activator>org.onap.appc.adapter.rest.RestActivator</Bundle-Activator>
                                                <Export-Package>org.onap.appc.adapter.rest</Export-Package>
                                                <Import-Package>org.onap.ccsdk.sli.core.sli.*,org.osgi.framework.*,org.slf4j.*,com.vmware.*,org.apache.xerces.*,javax.net.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.bind.*,javax.naming.*</Import-Package>
-                                               <Embed-Dependency>*;scope=compile|runtime;artifactId=!sli-common|org.eclipse.osgi|slf4j-api|jcl-over-slf4j|mariadb-java-client|xml-apis|jaxp-api</Embed-Dependency>
+            <Embed-Dependency>*;scope=compile|runtime;artifactId=!sli-common|org.eclipse.osgi|slf4j-api|jcl-over-slf4j|mariadb-java-client|xml-apis|jaxp-api</Embed-Dependency>
                                                <Embed-Transitive>true</Embed-Transitive>
                                        </instructions>
                                </configuration>
                        </plugin>
                </plugins>
        </build>
+       <version>1.6.0</version>
 </project>