From 61a4e6f954371622541585ade177ba811274bd0d Mon Sep 17 00:00:00 2001
From: Guillaume Hillairet <g.hillairet@gmail.com>
Date: Wed, 5 Jun 2019 10:44:16 +0200
Subject: [PATCH 1/4] [ZEN-4908] [CI/BUILD] Use maven plugin to automatically
 update versions from branch name

---
 .mvn/extensions.xml                     |  8 ++++++++
 .mvn/maven-git-versioning-extension.xml | 18 ++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 .mvn/extensions.xml
 create mode 100644 .mvn/maven-git-versioning-extension.xml

diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
new file mode 100644
index 0000000..0843d20
--- /dev/null
+++ b/.mvn/extensions.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<extensions xmlns="http://maven.apache.org/EXTENSIONS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/EXTENSIONS/1.0.0 http://maven.apache.org/xsd/core-extensions-1.0.0.xsd">
+    <extension>
+        <groupId>me.qoomon</groupId>
+        <artifactId>maven-git-versioning-extension</artifactId>
+        <version>LATEST</version>
+    </extension>
+</extensions>
diff --git a/.mvn/maven-git-versioning-extension.xml b/.mvn/maven-git-versioning-extension.xml
new file mode 100644
index 0000000..d212d8c
--- /dev/null
+++ b/.mvn/maven-git-versioning-extension.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gitVersioning>
+    <branch>
+        <pattern>master</pattern>
+        <versionFormat>${version}</versionFormat>
+    </branch>
+    <branch>
+        <pattern><![CDATA[task/(?<task>.+)]]></pattern>
+        <versionFormat>${version.release}-${task}-SNAPSHOT</versionFormat>
+    </branch>
+    <tag>
+        <pattern><![CDATA[v(?<tagVersion>[0-9].*)]]></pattern>
+        <versionFormat>${tagVersion}</versionFormat>
+    </tag>
+    <commit>
+        <versionFormat>${commit.short}</versionFormat>
+    </commit>
+</gitVersioning>

From b0281daf0053515835f11600a26bbf4a66688d9e Mon Sep 17 00:00:00 2001
From: Guillaume Hillairet <g.hillairet@gmail.com>
Date: Wed, 5 Jun 2019 22:39:13 +0200
Subject: [PATCH 2/4] [ZEN-4908] [CI/BUILD] Use maven plugin to automatically
 update versions from branch name

Failure was due to our setup of maven source plugin, using jar-no-fork seems to solve the xtend compilation issue with maven-git-versioning-extension.
---
 modules/genflow-api/pom.xml | 29 -----------------------------
 pom.xml                     |  3 ++-
 2 files changed, 2 insertions(+), 30 deletions(-)

diff --git a/modules/genflow-api/pom.xml b/modules/genflow-api/pom.xml
index 8652ab2..bdc8e21 100644
--- a/modules/genflow-api/pom.xml
+++ b/modules/genflow-api/pom.xml
@@ -107,35 +107,6 @@
         </dependency>
     </dependencies>
     <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-sources</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <configuration>
-                    <failOnError>false</failOnError>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>attach-javadocs</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
         <resources>
             <resource>
                 <directory>${project.basedir}/src/main/resources</directory>
diff --git a/pom.xml b/pom.xml
index 5e4a984..585f8f9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -95,8 +95,9 @@
                 <executions>
                     <execution>
                         <id>attach-sources</id>
+                        <phase>verify</phase>
                         <goals>
-                            <goal>jar</goal>
+                            <goal>jar-no-fork</goal>
                         </goals>
                     </execution>
                 </executions>

From 9fa600b89b4a15e971907beb2b06d33a35c17f14 Mon Sep 17 00:00:00 2001
From: Guillaume Hillairet <g.hillairet@gmail.com>
Date: Wed, 5 Jun 2019 22:57:41 +0200
Subject: [PATCH 3/4] [ZEN-4908] [CI/BUILD] Use maven plugin to automatically
 update versions from branch name

---
 pom.xml | 52 ++++++++++++++++++++++++++--------------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/pom.xml b/pom.xml
index 585f8f9..a3ea135 100644
--- a/pom.xml
+++ b/pom.xml
@@ -362,81 +362,81 @@
             <dependency>
                 <groupId>com.reprezen.genflow</groupId>
                 <artifactId>genflow-api</artifactId>
-                <version>1.4.2-SNAPSHOT</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.reprezen.genflow</groupId>
                 <artifactId>genflow-api-openapi</artifactId>
-                <version>1.4.2-SNAPSHOT</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.reprezen.genflow</groupId>
                 <artifactId>genflow-api-rapidml</artifactId>
-                <version>1.4.2-SNAPSHOT</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.reprezen.genflow</groupId>
                 <artifactId>genflow-common</artifactId>
-                <version>1.4.2-SNAPSHOT</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.reprezen.genflow</groupId>
                 <artifactId>reprezen-openapi-gentemplates</artifactId>
-                <version>1.4.2-SNAPSHOT</version>
+                <version>${project.version}</version>
                 <type>pom</type>
             </dependency>
             <dependency>
                 <groupId>com.reprezen.genflow</groupId>
                 <artifactId>reprezen-rapidml-gentemplates</artifactId>
-                <version>1.4.2-SNAPSHOT</version>
+                <version>${project.version}</version>
                 <type>pom</type>
             </dependency>
             <dependency>
                 <groupId>com.reprezen.genflow</groupId>
                 <artifactId>openapi-gentemplates</artifactId>
-                <version>1.4.2-SNAPSHOT</version>
+                <version>${project.version}</version>
                 <type>pom</type>
             </dependency>
             <dependency>
                 <groupId>com.reprezen.genflow</groupId>
                 <artifactId>standard-gentemplates</artifactId>
-                <version>1.4.2-SNAPSHOT</version>
+                <version>${project.version}</version>
                 <type>pom</type>
             </dependency>
             <dependency>
                 <groupId>com.reprezen.genflow</groupId>
                 <artifactId>swagger-codegen</artifactId>
-                <version>1.4.2-SNAPSHOT</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.reprezen.genflow</groupId>
                 <artifactId>openapi-diagram</artifactId>
-                <version>1.4.2-SNAPSHOT</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.reprezen.genflow</groupId>
                 <artifactId>openapi-generator</artifactId>
-                <version>1.4.2-SNAPSHOT</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.reprezen.genflow</groupId>
                 <artifactId>openapi3-doc</artifactId>
-                <version>1.4.2-SNAPSHOT</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.reprezen.genflow</groupId>
                 <artifactId>swagger-doc</artifactId>
-                <version>1.4.2-SNAPSHOT</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.reprezen.genflow</groupId>
                 <artifactId>openapi-normalizer</artifactId>
-                <version>1.4.2-SNAPSHOT</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.reprezen.genflow</groupId>
                 <artifactId>swagger-ui</artifactId>
-                <version>1.4.2-SNAPSHOT</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.reprezen.rapidml</groupId>
@@ -451,57 +451,57 @@
             <dependency>
                 <groupId>com.reprezen.genflow</groupId>
                 <artifactId>rapidml-doc</artifactId>
-                <version>1.4.2-SNAPSHOT</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.reprezen.genflow</groupId>
                 <artifactId>rapidml-diagram</artifactId>
-                <version>1.4.2-SNAPSHOT</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.reprezen.genflow</groupId>
                 <artifactId>rapidml-xsd</artifactId>
-                <version>1.4.2-SNAPSHOT</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.reprezen.genflow</groupId>
                 <artifactId>rapidml-wadl</artifactId>
-                <version>1.4.2-SNAPSHOT</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.reprezen.genflow</groupId>
                 <artifactId>rapidml-jsonschema</artifactId>
-                <version>1.4.2-SNAPSHOT</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.reprezen.genflow</groupId>
                 <artifactId>rapidml-swagger</artifactId>
-                <version>1.4.2-SNAPSHOT</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.reprezen.genflow</groupId>
                 <artifactId>rapidml-csharp</artifactId>
-                <version>1.4.2-SNAPSHOT</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.reprezen.genflow</groupId>
                 <artifactId>rapidml-nodejs</artifactId>
-                <version>1.4.2-SNAPSHOT</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.reprezen.genflow</groupId>
                 <artifactId>rapidml-jaxrs</artifactId>
-                <version>1.4.2-SNAPSHOT</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.reprezen.genflow</groupId>
                 <artifactId>swagger-nswag</artifactId>
-                <version>1.4.2-SNAPSHOT</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.reprezen.genflow</groupId>
                 <artifactId>genflow-tests</artifactId>
-                <version>1.4.2-SNAPSHOT</version>
+                <version>${project.version}</version>
                 <scope>test</scope>
             </dependency>
             <dependency>

From 1459520d487b82f7b9ca02722e264184b1b20962 Mon Sep 17 00:00:00 2001
From: Guillaume Hillairet <g.hillairet@gmail.com>
Date: Tue, 25 Jun 2019 12:58:03 +0200
Subject: [PATCH 4/4] [ZEN-4918] Component CM: Automate KZOP --> KZOE, GenFlow
 & API Studio client PR creation

---
 pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a3ea135..47b8350 100644
--- a/pom.xml
+++ b/pom.xml
@@ -272,7 +272,7 @@
             <dependency>
                 <groupId>com.reprezen.kaizen</groupId>
                 <artifactId>openapi-parser</artifactId>
-                <version>4.0.3</version>
+                <version>${kaizen-parser-version}</version>
             </dependency>
             <dependency>
                 <groupId>io.swagger.parser.v3</groupId>
@@ -552,6 +552,7 @@
         <nexus.autorelease>false</nexus.autorelease>
         <nexus.autodrop>true</nexus.autodrop>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <kaizen-parser-version>4.0.3</kaizen-parser-version>
         <xtend-version>2.12.0</xtend-version>
         <rapidml-version>0.0.10</rapidml-version>
     </properties>