From 568673b4864110b115893befe6b0ba21fe22cf7b Mon Sep 17 00:00:00 2001
From: Ziver Koc <ziver.koc@ericsson.com>
Date: Tue, 11 Feb 2020 15:09:50 +0100
Subject: [PATCH] Moved to Multi Module Maven Release Plugin

---
 Jenkinsfile |  4 ++--
 Zutil.iml   | 16 ++++++++--------
 pom.xml     |  9 +++++++--
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 475944f..e352e03 100755
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -14,7 +14,7 @@ node {
     }
 
     withMaven(mavenConfiguration) {
-        def mvnParams = "-Dbuild.number=${BUILD_NUMBER} -Dbuild.development=false"
+        def mvnParams = "-Dbuild.number=1.0.${BUILD_NUMBER} -Dbuild.development=false"
 
         stage('Build') {
             sh "mvn ${mvnParams} clean compile"
@@ -29,7 +29,7 @@ node {
         }
 
         stage('Deploy') {
-            sh "mvn ${mvnParams} -DskipStatic -DskipTests deploy"
+            sh "mvn ${mvnParams} releaser:release"
             sh "mvn ${mvnParams} scm:tag"
         }
     }
diff --git a/Zutil.iml b/Zutil.iml
index 01ebede..6d12f97 100755
--- a/Zutil.iml
+++ b/Zutil.iml
@@ -35,23 +35,23 @@
         <jarDirectory url="file://$MODULE_DIR$/lib" recursive="false" type="SOURCES" />
       </library>
     </orderEntry>
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.openjfx:javafx-controls:linux:11" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.openjfx:javafx-graphics:linux:11" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.openjfx:javafx-base:linux:11" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.openjfx:javafx-fxml:linux:11" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.openjfx:javafx-controls:win:11" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.openjfx:javafx-graphics:win:11" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.openjfx:javafx-base:win:11" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.openjfx:javafx-fxml:win:11" level="project" />
     <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.4" level="project" />
     <orderEntry type="library" name="Maven: commons-io:commons-io:2.5" level="project" />
     <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
     <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.openjfx:javafx-controls:11" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.openjfx:javafx-controls:win:11" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.openjfx:javafx-controls:linux:11" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.openjfx:javafx-graphics:11" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.openjfx:javafx-graphics:win:11" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.openjfx:javafx-graphics:linux:11" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.openjfx:javafx-base:11" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.openjfx:javafx-base:win:11" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.openjfx:javafx-base:linux:11" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.openjfx:javafx-fxml:11" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.openjfx:javafx-fxml:win:11" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.openjfx:javafx-fxml:linux:11" level="project" />
     <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.36" level="project" />
     <orderEntry type="library" name="Maven: org.xerial:sqlite-jdbc:3.8.11.2" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
diff --git a/pom.xml b/pom.xml
index 08c39e8..d25e662 100755
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>se.koc</groupId>
     <artifactId>zutil</artifactId>
-    <version>1.0.${build.number}</version>
+    <version>${revision}</version>
     <packaging>jar</packaging>
 
     <name>Zutil</name>
@@ -34,7 +34,7 @@
     </scm>
 
     <properties>
-        <build.number>0-SNAPSHOT</build.number>
+        <build.version>1.0.0-SNAPSHOT</build.version>
         <build.development>true</build.development>
         <java.version>1.8</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -193,6 +193,11 @@
                     <connectionType>developerConnection</connectionType>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>com.github.danielflower.mavenplugins</groupId>
+                <artifactId>multi-module-maven-release-plugin</artifactId>
+                <version>3.2.0</version>
+            </plugin>
         </plugins>
     </build>