From: Dan Timoney <dtimoney@att.com>
Date: Fri, 6 Oct 2017 19:06:32 +0000 (-0400)
Subject: Fix version tag placement
X-Git-Tag: v1.1.0~12
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F09%2F17509%2F1;p=oparent.git

Fix version tag placement

oparent-odlparent Jenkins job updates the first <version> tag in
the pom.xml, so the <parent> tag must appear after the <version>
for the pom.xml itself.

Change-Id: I3369c804a2470936c51801b5fbdd53b0052ee83c
Issue-ID: INT-257
Signed-off-by: Dan Timoney <dtimoney@att.com>
---

diff --git a/oparent-odlparent/pom.xml b/oparent-odlparent/pom.xml
index a05e7bf..5ba340e 100644
--- a/oparent-odlparent/pom.xml
+++ b/oparent-odlparent/pom.xml
@@ -16,16 +16,16 @@
 -->
 <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.opendaylight.odlparent</groupId>
-        <artifactId>odlparent</artifactId>
-        <version>1.8.1-Carbon</version>
-  </parent>
   <groupId>org.onap.oparent</groupId>
   <artifactId>oparent-odlparent</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <name>oparent/odlparent-carbon</name>
   <packaging>pom</packaging>
+  <parent>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>odlparent</artifactId>
+        <version>1.8.1-Carbon</version>
+  </parent>
   <properties>
     <!--- properties from oparent/version -->
     <maven.compiler.source>1.8</maven.compiler.source>