Skip to content

Commit

Permalink
fix(deploy): Correct Maven Deploy logic (#JENKINS-52383)
Browse files Browse the repository at this point in the history
  • Loading branch information
hypery2k committed Jul 13, 2018
1 parent 8f21e9f commit 8adf86e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 11 deletions.
9 changes: 1 addition & 8 deletions Jenkinsfile_dev
Expand Up @@ -32,14 +32,7 @@ node('docker') {

stage('Deploy') {
sshagent(credentials: ['github-hypery2k']) {
def projectVersion = maven.getProjectVersion()
if (projectVersion && !projectVersion.contains('SNAPSHOT')) {
// release build
sh "./mvnw deploy -DskipTests=true"
// nightly build
} else {
sh "./mvnw deploy -DskipTests=true -DartifactSuffix=-alpha"
}
sh "./mvnw deploy -DskipTests=true"
}
}
} catch (e) {
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
@@ -1,4 +1,5 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
Expand All @@ -8,7 +9,6 @@
</parent>

<properties>
<artifactSuffix/>
<jenkins.version>1.653</jenkins.version>
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
Expand All @@ -34,7 +34,7 @@
</properties>

<name>RocketChat Notifier</name>
<artifactId>rocketchatnotifier${artifactSuffix}</artifactId>
<artifactId>rocketchatnotifier</artifactId>
<version>1.2.2-SNAPSHOT</version>
<packaging>hpi</packaging>

Expand Down

0 comments on commit 8adf86e

Please sign in to comment.