From c22d524d3972d5b28f0da93932c24ab5c613f383 Mon Sep 17 00:00:00 2001
From: Dmitry Puzikov <dmitry.puzikov@tieto.com>
Date: Thu, 29 Aug 2019 11:49:09 +0200
Subject: Fix project version parsing

Change-Id: I4733b72bb1d150203de764e06eefb39c75b5c300
Issue-ID: INT-803
Signed-off-by: Dmitry Puzikov <dmitry.puzikov@tieto.com>
(cherry picked from commit 8c9c7b61a0f984a92dfcc3b12d66c97bb5800f86)
---
 aai-schema-service/pom.xml | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'aai-schema-service')

diff --git a/aai-schema-service/pom.xml b/aai-schema-service/pom.xml
index 874d6eb..80adff9 100644
--- a/aai-schema-service/pom.xml
+++ b/aai-schema-service/pom.xml
@@ -89,8 +89,10 @@
         <!-- Start of Default ONAP Schema Properties -->
         <schema.source.name>onap</schema.source.name>
         <schema.configuration.location>N/A</schema.configuration.location>
-        <schema.nodes.location>${project.basedir}/src/main/resources/schema/${schema.source.name}/oxm</schema.nodes.location>
-        <schema.edges.location>${project.basedir}/src/main/resources/schema/${schema.source.name}/dbedgerules</schema.edges.location>
+        <schema.nodes.location>${project.basedir}/src/main/resources/schema/${schema.source.name}/oxm
+        </schema.nodes.location>
+        <schema.edges.location>${project.basedir}/src/main/resources/schema/${schema.source.name}/dbedgerules
+        </schema.edges.location>
         <schema.version.depth.start>v10</schema.version.depth.start>
         <schema.version.related.link.start>v10</schema.version.related.link.start>
         <schema.version.app.root.start>v11</schema.version.app.root.start>
@@ -112,10 +114,13 @@
                     <plugin>
                         <groupId>org.codehaus.groovy.maven</groupId>
                         <artifactId>gmaven-plugin</artifactId>
-                        <version>1.0</version>
                         <executions>
                             <execution>
-                                <phase>prepare-package</phase>
+                                <phase>pre-clean</phase>
+                            </execution>
+                            <execution>
+                                <id>parse-base</id>
+                                <phase>pre-clean</phase>
                                 <goals>
                                     <goal>execute</goal>
                                 </goals>
-- 
cgit 1.2.3-korg