Update jaxb-api to 2.2.3 or later

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

diff --git a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/pom.xml b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/pom.xml
index 094ca9a..134c7f0 100644 (file)
--- a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/pom.xml
+++ b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/pom.xml
@@ -2,9 +2,9 @@
 <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.openecomp.appc</groupId>
+               <groupId>org.onap.appc</groupId>
                <artifactId>appc-rest-healthcheck-adapter</artifactId>
-               <version>1.1.0-SNAPSHOT</version>
+               <version>1.3.0-SNAPSHOT</version>
        </parent>
 
        <artifactId>appc-rest-healthcheck-adapter-bundle</artifactId>
@@ -45,18 +45,11 @@
                        <version>1.47</version>
                </dependency>
                <dependency>
-                       <groupId>org.openecomp.appc</groupId>
+                       <groupId>org.onap.appc</groupId>
                        <artifactId>appc-common</artifactId>
                        <version>${project.version}</version>
-                       <classifier>jar-with-dependencies</classifier>
                        <scope>compile</scope>
                </dependency>
-               <dependency>
-                       <groupId>org.openecomp.appc</groupId>
-                       <artifactId>appc-common</artifactId>
-                       <version>${project.version}</version>
-                       <scope>test</scope>
-               </dependency>
 
                <dependency>
                        <groupId>javax</groupId>
@@ -96,7 +89,7 @@
                <dependency>
                        <groupId>javax.xml.bind</groupId>
                        <artifactId>jaxb-api</artifactId>
-                       <version>2.1</version>
+                       <version>2.2.3</version>
                </dependency>
 
                <dependency>
@@ -110,6 +103,7 @@
                        <groupId>org.glassfish.jersey.core</groupId>
                        <artifactId>jersey-common</artifactId>
                        <version>2.9.1</version>
+            <scope>test</scope>
                </dependency>
 
                <dependency>
@@ -118,12 +112,6 @@
                        <version>1.9.12</version>
                </dependency>
 
-               <dependency>
-                       <groupId>org.apache.httpcomponents</groupId>
-                       <artifactId>httpclient</artifactId>
-                       <version>4.5.1</version>
-               </dependency>
-
                <dependency>
                        <groupId>junit</groupId>
                        <artifactId>junit</artifactId>
@@ -131,26 +119,26 @@
                </dependency>
 
                <dependency>
-                       <groupId>org.openecomp.sdnc.core</groupId>
+                       <groupId>org.onap.ccsdk.sli.core</groupId>
                        <artifactId>sli-common</artifactId>
-                       <scope>compile</scope>
+                       <scope>provided</scope>
                        <!-- Added exclusion to prevent missing dependency issue on dblib -->
                        <exclusions>
                                <exclusion>
-                                       <groupId>org.openecomp.sdnc.core</groupId>
+                                       <groupId>org.onap.ccsdk.sli.core</groupId>
                                        <artifactId>dblib-provider</artifactId>
                                </exclusion>
                        </exclusions>
                </dependency>
                
                <dependency>
-                       <groupId>org.openecomp.sdnc.core</groupId>
+                       <groupId>org.onap.ccsdk.sli.core</groupId>
                        <artifactId>sli-provider</artifactId>
-                       <scope>compile</scope>
+                       <scope>provided</scope>
                        <!-- Added exclusion to prevent missing dependency issue on dblib -->
                        <exclusions>
                                <exclusion>
-                                       <groupId>org.openecomp.sdnc.core</groupId>
+                                       <groupId>org.onap.ccsdk.sli.core</groupId>
                                        <artifactId>dblib-provider</artifactId>
                                </exclusion>
                        </exclusions>
@@ -172,11 +160,8 @@
                </dependency>
 
                <dependency>
-                       <groupId>mysql</groupId>
-                       <artifactId>mysql-connector-java</artifactId>
-                       <version>5.1.31</version>
-                       <type>jar</type>
-                       <scope>compile</scope>
+            <groupId>org.mariadb.jdbc</groupId>
+                       <artifactId>mariadb-java-client</artifactId>
                </dependency>
 
                <dependency>
@@ -204,10 +189,9 @@
                                <configuration>
                                        <instructions>
                                                <Bundle-SymbolicName>appc-rest-healthcheck-adapter</Bundle-SymbolicName>
-                                               <Bundle-Activator>org.openecomp.appc.adapter.restHealthcheck.RestHealthcheckActivator</Bundle-Activator>
-                                               <Export-Package>org.openecomp.appc.adapter.restHealthcheck</Export-Package>
-                                               <Import-Package>
-                                                       org.openecomp.sdnctl.sli.*,org.osgi.framework.*,org.slf4j.*,com.vmware.*,org.apache.xerces.*,javax.net.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.bind.*,javax.naming.*,javax.security.auth.*
+                                               <Bundle-Activator>org.onap.appc.adapter.restHealthcheck.RestHealthcheckActivator</Bundle-Activator>
+                                               <Export-Package>org.onap.appc.adapter.restHealthcheck</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.*,javax.security.auth.*
                                                </Import-Package>
                                                <Embed-Dependency>
                                                        *;scope=compile|runtime;artifactId=!sli-common|!appc-common|org.eclipse.osgi|slf4j-api|jcl-over-slf4j|xml-apis