Change parent version

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

diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/pom.xml b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/pom.xml
index fe7cc43..576613b 100644 (file)
--- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/pom.xml
+++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-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,16 @@
   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-dmaap-adapter</artifactId>
-               <version>1.3.0-SNAPSHOT</version>
+               <groupId>org.onap.appc.parent</groupId>
+               <artifactId>binding-parent</artifactId>
+               <version>2.5.0</version>
+                <relativePath />
        </parent>
-
+        <groupId>org.onap.appc</groupId>
        <artifactId>appc-dmaap-adapter-bundle</artifactId>
        <packaging>bundle</packaging>
        <name>DMaaP Adapter - bundle</name>
@@ -45,21 +45,32 @@
                </dependency>
                <dependency>
                        <groupId>org.onap.appc</groupId>
-                       <artifactId>appc-common</artifactId>
+                       <artifactId>appc-common-bundle</artifactId>
                        <version>${project.version}</version>
                </dependency>
 
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>${logback.version}</version>
+        </dependency>
+       <dependency>
+            <groupId>com.att.eelf</groupId>
+            <artifactId>eelf-core</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>ch.qos.logback</groupId>
+                    <artifactId>logback-classic</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
                <dependency>
                        <groupId>junit</groupId>
                        <artifactId>junit</artifactId>
                        <scope>test</scope>
                </dependency>
 
-               <dependency>
-                       <groupId>equinoxSDK381</groupId>
-                       <artifactId>org.eclipse.osgi</artifactId>
-               </dependency>
-
                <dependency>
                        <groupId>commons-codec</groupId>
                        <artifactId>commons-codec</artifactId>
@@ -87,6 +98,11 @@
                        <groupId>org.mockito</groupId>
                        <artifactId>mockito-core</artifactId>
                        </dependency>
+               <dependency>
+                       <groupId>org.osgi</groupId>
+                       <artifactId>org.osgi.core</artifactId>
+                       <scope>provided</scope>
+               </dependency>
                <dependency>
                        <groupId>org.powermock</groupId>
                        <artifactId>powermock-api-mockito</artifactId>
@@ -107,7 +123,7 @@
                        <artifactId>powermock-module-junit4</artifactId>
                        <scope>test</scope>
                </dependency>
-        <dependency>
+        <!-- <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
@@ -115,7 +131,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>jcl-over-slf4j</artifactId>
-            </dependency>
+            </dependency>-->
                <dependency>
                        <groupId>org.onap.ccsdk.sli.core</groupId>
                        <artifactId>sli-common</artifactId>
@@ -148,11 +164,11 @@
 
                <!-- DMaaP Client -->
                <dependency> 
-                       <groupId>com.att.nsa</groupId> 
+                       <groupId>org.onap.dmaap.messagerouter.dmaapclient</groupId> 
                        <artifactId>dmaapClient</artifactId>
-            <version>0.2.12</version> 
-<!--                   <version>${dmaap.client.version}</version>  -->
-               </dependency> 
+            <version>${dmaap.client.version}</version>
+            <classifier>jar-with-dependencies</classifier>
+               </dependency>
 
                <dependency>
                        <groupId>org.json</groupId>
@@ -177,8 +193,9 @@
                                                <!--<Bundle-SymbolicName>org.onap.appc.adapter.messaging.dmaap</Bundle-SymbolicName>-->
                                                <Bundle-Activator>org.onap.appc.adapter.messaging.dmaap.AppcDmaapAdapterActivator</Bundle-Activator>
                                                <Export-Package>org.onap.appc.adapter.messaging.*</Export-Package>
-                                               <Import-Package>!org.slf4j.event,org.onap.appc.adapter.message.*,org.onap.appc.metricservice.*,com.att.nsa.*,org.onap.ccsdk.sli.core.sli.*,org.osgi.framework.*,!org.osgi.service.event.*,org.osgi.service.*,org.osgi.util.*,org.slf4j.*,com.vmware.*,org.apache.xerces.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.*,javax.naming.*,javax.crypto.*, com.sun.jersey.spi.container.servlet,org.eclipse.jetty.servlets,org.w3c.*</Import-Package>
-                                               <Embed-Dependency>*;scope=compile|runtime;artifactId=!appc-metric-bundle|appc-message-adapter-api|sli-common|org.eclipse.osgi|slf4j-api|jcl-over-slf4j|mariadb-java-client|xml-apis|pax-*</Embed-Dependency>
+                                               <Import-Package>com.att.eelf.configuration,*;resolution:=optional</Import-Package>
+                                               <!-- <Embed-Dependency>dmaapClient,eelf-core</Embed-Dependency>-->
+                        <Embed-Dependency>logback-classic, logback-core,dmaapClient;scope=compile|runtime;artifactId=!org.eclipse.osgi|slf4j-api|slf4j-simple|jcl-over-slf4j|</Embed-Dependency>                                               
                                                <Embed-Transitive>true</Embed-Transitive>
                                                <Bundle-Blueprint>OSGI-INF/blueprint/blueprint.xml</Bundle-Blueprint>
                                        </instructions>
@@ -186,4 +203,5 @@
                        </plugin>
                </plugins>
        </build>
-</project>
+       <version>1.5.0-SNAPSHOT</version>
+</project>
\ No newline at end of file