From 544e00cd5cd8c4c7aa5fa4b92877ca7a7be0d1cc Mon Sep 17 00:00:00 2001
From: Endolf <endolf@computerbooth.com>
Date: Fri, 25 May 2018 19:50:59 +0100
Subject: [PATCH] Use the nexus staging plugin for release

---
 Jenkinsfile |  8 ++++++--
 pom.xml     | 16 ----------------
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 6e39b3c..d2b775d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -130,8 +130,12 @@ pipeline {
                         globalMavenSettingsConfig: 'global-maven-settings-ossrh',
                         mavenOpts: '-Djavax.net.ssl.trustStore=/etc/ssl/certs/java/cacerts' //Work around for JDK9 missing cacerts
                 ) {
-                    sh "mvn -P windows,linux,osx,wintab versions:set -DremoveSnapshot"
-                    sh "mvn -P windows,linux,osx,wintab versions:set -DnextSnapshot"
+                    sh "mvn -P windows,linux,osx,wintab,release versions:set -DremoveSnapshot"
+                    VERSION_TAG = sh(script: "mvn -Dexpression=project.version help:evaluate | grep -e '^[[:digit:]]'", returnStdout: true).trim()
+                    sh "git tag -a ${VERSION_TAG} -m 'Release tag ${VERSION_TAG}'"
+                    sh "mvn -P windows,linux,osx,wintab -Dmaven.antrun.skip -Dmaven.test.skip -DskipTests -DskipITs deploy"
+                    sh "mvn -P windows,linux,osx,wintab,release versions:set -DnextSnapshot"
+                    sh "git commit -m 'Next development release' ."
                 }
             }
         }
diff --git a/pom.xml b/pom.xml
index 1e19a76..b6786b7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -139,18 +139,6 @@
                         <autoReleaseAfterClose>true</autoReleaseAfterClose>
                     </configuration>
                 </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-release-plugin</artifactId>
-                    <version>2.5.3</version>
-                    <configuration>
-                        <autoVersionSubmodules>true</autoVersionSubmodules>
-                        <useReleaseProfile>false</useReleaseProfile>
-                        <releaseProfiles>release</releaseProfiles>
-                        <goals>deploy</goals>
-                        <tagNameFormat>@{project.version}</tagNameFormat>
-                    </configuration>
-                </plugin>
             </plugins>
         </pluginManagement>
         <plugins>
@@ -186,10 +174,6 @@
                             <autoReleaseAfterClose>false</autoReleaseAfterClose>
                         </configuration>
                     </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-release-plugin</artifactId>
-                    </plugin>
                 </plugins>
             </build>
         </profile>