From bbf71ddaa0597ea99489b7ba8a7057f2dc6876b1 Mon Sep 17 00:00:00 2001
From: pierrejego <pierre.jego@jdev.fr>
Date: Fri, 8 Nov 2019 09:25:47 +0100
Subject: [PATCH] [maven-release-plugin] prepare release Cadastrapp-v1.9

---
 cadastrapp/pom.xml | 6 ++----
 pom.xml            | 3 ++-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/cadastrapp/pom.xml b/cadastrapp/pom.xml
index 97e3b3fc..98678e03 100644
--- a/cadastrapp/pom.xml
+++ b/cadastrapp/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.georchestra</groupId>
     <artifactId>cadastrapp-parent</artifactId>
-    <version>1.9-SNAPSHOT</version>
+    <version>1.9</version>
   </parent>
   <artifactId>cadastrapp</artifactId>
   <packaging>war</packaging>
@@ -604,9 +604,7 @@
                 <configuration>
                   <exportAntProperties>true</exportAntProperties>
                   <target>
-                    <condition property="project.packageVersion"
-                      value="99.master.${maven.build.timestamp}~${build.commit.id.abbrev}"
-                      else="${project.parent.version}.${maven.build.timestamp}~${build.commit.id.abbrev}">
+                    <condition property="project.packageVersion" value="99.master.${maven.build.timestamp}~${build.commit.id.abbrev}" else="${project.parent.version}.${maven.build.timestamp}~${build.commit.id.abbrev}">
                       <matches string="${project.parent.version}" pattern="SNAPSHOT$" />
                     </condition>
                   </target>
diff --git a/pom.xml b/pom.xml
index 6007bc44..06c4c987 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.georchestra</groupId>
   <artifactId>cadastrapp-parent</artifactId>
-  <version>1.9-SNAPSHOT</version>
+  <version>1.9</version>
   <packaging>pom</packaging>
   <modules>
     <module>cadastrapp</module>
@@ -15,6 +15,7 @@
     <connection>scm:git:git://github.com/georchestra/cadastrapp.git</connection>
     <developerConnection>scm:git:git://github.com/georchestra/cadastrapp.git</developerConnection>
     <url>https://github.com/georchestra/cadastrapp</url>
+    <tag>Cadastrapp-v1.9</tag>
   </scm>
   <properties>
     <project.scm.id>cadastrapp-release</project.scm.id>