Merge "Change the parent in the pom.xml to oparent"

diff --combined pom.xml
index b010b5d,af9a6f4..c72ef07
--- 1/pom.xml
--- 2/pom.xml
+++ b/pom.xml
@@@ -19,14 -19,12 +19,13 @@@
      <modelVersion>4.0.0</modelVersion>\r
      <parent>\r
          <groupId>org.onap.oparent</groupId>\r
-         <artifactId>version</artifactId>\r
+         <artifactId>oparent</artifactId>\r
          <version>1.0.0-SNAPSHOT</version>\r
-         <relativePath>../../oparent</relativePath>\r
      </parent>\r
  \r
      <groupId>org.onap.holmes.dsa</groupId>\r
      <artifactId>holmes-dsa-parent</artifactId>\r
 +    <version>1.0.0-SNAPSHOT</version>\r
      <packaging>pom</packaging>\r
      <name>holmes-dsa-parent</name>\r
      <modules>\r
@@@ -141,6 -139,5 +140,5 @@@
              </dependency>\r
          </dependencies>\r
      </dependencyManagement>\r
- \r
  </project>\r
  \r