Change rest healthcheck to use appc parent poms

Change appc-rest-healthcheck over to the new style
of features using the org.onap.appc.parent pom files
as parents.

Change-Id: I781754f3ad5c31a937d17449ff46320d60db4975
Signed-off-by: Patrick Brady <patrick.brady@att.com>
Issue-ID: APPC-1586

2 files changed, 10 insertions, 6 deletions

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 bad5d6fb7..630e8fb79 100644
--- 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
@@ -3,7 +3,7 @@
   ============LICENSE_START=======================================================
   ONAP : APPC
   ================================================================================
-  Copyright (C) 2017-2018 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");
@@ -22,11 +22,13 @@
 <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-healthcheck-adapter</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <groupId>org.onap.appc.parent</groupId>
+        <artifactId>binding-parent</artifactId>
+        <version>1.5.0-SNAPSHOT</version>
+        <relativePath />
     </parent>
 
+    <groupId>org.onap.appc</groupId>
     <artifactId>appc-rest-healthcheck-adapter-bundle</artifactId>
     <packaging>bundle</packaging>
     <name>rest healthcheck Adapter - bundle</name>
@@ -71,6 +73,7 @@
         <dependency>
             <groupId>com.att.cdp</groupId>
             <artifactId>cdp-pal-common</artifactId>
+            <version>${cdp.pal.version}</version>
             <scope>compile</scope>
             <exclusions>
                 <exclusion>
@@ -83,6 +86,7 @@
         <dependency>
             <groupId>com.att.cdp</groupId>
             <artifactId>cdp-pal-openstack</artifactId>
+            <version>${cdp.pal.version}</version>
             <scope>compile</scope>
             <exclusions>
                   <exclusion>
diff --git a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/test/java/org/onap/appc/adapter/restHealthcheck/RestHealthcheckActivatorTest.java b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/test/java/org/onap/appc/adapter/restHealthcheck/RestHealthcheckActivatorTest.java
index dd5716d9c..5bb8d1adc 100644
--- a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/test/java/org/onap/appc/adapter/restHealthcheck/RestHealthcheckActivatorTest.java
+++ b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/src/test/java/org/onap/appc/adapter/restHealthcheck/RestHealthcheckActivatorTest.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP : APPC
  * ================================================================================
- * Copyright (C) 2018 AT&T All rights reserved.
+ * Copyright (C) 2018-2019 AT&T All rights reserved.
  * =============================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,7 +41,7 @@ import org.osgi.framework.ServiceRegistration;
 public class RestHealthcheckActivatorTest {
 
     @Mock
-    private ServiceRegistration<RestHealthcheckActivator> serviceRegistration;
+    private ServiceRegistration serviceRegistration;
     @Mock
     private BundleContext bundleContext;