X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=appc-adapters%2Fappc-chef-adapter%2Fappc-chef-adapter-bundle%2Fpom.xml;h=1f9d5b191c6f60437c9bf081794aa88ab7d24ae8;hb=aae29911cb7837ece11eeca4fa6a66275e237118;hp=743a90ecce8ee668326acfc28702e38663d89d36;hpb=6536799456cd99ee80d6a7ce0621fb8539df7a81;p=appc.git

diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/pom.xml b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/pom.xml
index 743a90ecc..1f9d5b191 100644
--- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/pom.xml
+++ b/appc-adapters/appc-chef-adapter/appc-chef-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-2018 AT&T Intellectual Property. All rights reserved.
   ================================================================================
   Copyright (C) 2017 Amdocs
   =============================================================================
@@ -19,7 +19,6 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 
-  ECOMP is a trademark and service mark of AT&T Intellectual Property.
   ============LICENSE_END=========================================================
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -27,12 +26,15 @@
          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>
-        <artifactId>appc-chef-adapter</artifactId>
-        <version>1.3.0-SNAPSHOT</version>
+        <groupId>org.onap.appc.parent</groupId>
+        <artifactId>binding-parent</artifactId>
+        <version>2.6.0</version>
+        <relativePath />
     </parent>
 
     <artifactId>appc-chef-adapter-bundle</artifactId>
+    <groupId>org.onap.appc</groupId>
+    <version>1.6.2</version>
     <packaging>bundle</packaging>
     <name>APPC Chef Adapter - Bundle</name>
 
@@ -70,16 +72,16 @@
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcpkix-jdk15on</artifactId>
-            <version>1.55</version>
+            <version>1.60</version>
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcprov-jdk15on</artifactId>
-            <version>1.55</version>
+            <version>1.60</version>
         </dependency>
         <dependency>
-            <groupId>org.openecomp.appc</groupId>
-            <artifactId>appc-common</artifactId>
+            <groupId>org.onap.appc</groupId>
+            <artifactId>appc-common-bundle</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
@@ -91,13 +93,27 @@
         <dependency>
             <groupId>com.att.cdp</groupId>
             <artifactId>cdp-pal-common</artifactId>
+            <version>${cdp.pal.version}</version>
             <scope>compile</scope>
+            <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>
@@ -119,7 +135,7 @@
         <dependency>
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
-            <version>2.1</version>
+            <version>2.2.3</version>
         </dependency>
 
         <dependency>
@@ -138,13 +154,13 @@
         <dependency>
             <groupId>org.codehaus.jackson</groupId>
             <artifactId>jackson-jaxrs</artifactId>
-            <version>1.9.12</version>
+            <version>1.9.13</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <version>4.5.1</version>
+            <version>4.5.3</version>
         </dependency>
 
         <dependency>
@@ -152,6 +168,15 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>${assertj.version}</version>
+        </dependency>
 
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
@@ -182,6 +207,7 @@
         <dependency>
             <groupId>equinoxSDK381</groupId>
             <artifactId>org.eclipse.osgi</artifactId>
+            <version>${equinox.osgi.version}</version>
         </dependency>
 
         <dependency>
@@ -197,6 +223,7 @@
         <dependency>
             <groupId>org.mariadb.jdbc</groupId>
             <artifactId>mariadb-java-client</artifactId>
+            <version>${mariadb.client.version}</version>
         </dependency>
 
         <dependency>
@@ -224,13 +251,13 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>appc-chef-adapter</Bundle-SymbolicName>
-                        <Bundle-Activator>org.openecomp.appc.adapter.chef.ChefActivator</Bundle-Activator>
-                        <Export-Package>org.openecomp.appc.adapter.chef</Export-Package>
+                        <Bundle-Activator>org.onap.appc.adapter.chef.ChefActivator</Bundle-Activator>
+                        <Export-Package>org.onap.appc.adapter.chef</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.*
+                            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.*
                         </Import-Package>
                         <Embed-Dependency>
-                            *;scope=compile|runtime;artifactId=!sli-common|!appc-common|org.eclipse.osgi|slf4j-api|jcl-over-slf4j|mariadb-java-client|xml-apis
+                            *;scope=compile|runtime;artifactId=!sli-common|!appc-common-bundle|org.eclipse.osgi|slf4j-api|jcl-over-slf4j|mariadb-java-client|xml-apis
                         </Embed-Dependency>
                         <Embed-Transitive>true</Embed-Transitive>
                     </instructions>