Merging in bug fixes

[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..b8fdf9a 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
@@ -48,15 +48,8 @@
                        <groupId>org.openecomp.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>
@@ -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>
@@ -133,7 +121,7 @@
                <dependency>
                        <groupId>org.openecomp.sdnc.core</groupId>
                        <artifactId>sli-common</artifactId>
-                       <scope>compile</scope>
+                       <scope>provided</scope>
                        <!-- Added exclusion to prevent missing dependency issue on dblib -->
                        <exclusions>
                                <exclusion>
@@ -146,7 +134,7 @@
                <dependency>
                        <groupId>org.openecomp.sdnc.core</groupId>
                        <artifactId>sli-provider</artifactId>
-                       <scope>compile</scope>
+                       <scope>provided</scope>
                        <!-- Added exclusion to prevent missing dependency issue on dblib -->
                        <exclusions>
                                <exclusion>
@@ -206,8 +194,7 @@
                                                <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.*
+                                               <Import-Package>org.openecomp.sdnc.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