Merge branch 'hotfix/1.5.1'

decisionbrain · Apr 19, 2019 · 4b0b211 · 4b0b211
2 parents 9dd8338 + ee009b2
commit 4b0b211
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -114,7 +114,7 @@ pipeline {
             steps {
                 sh "chmod ugo+x ./gradlew"
                 sh "chmod -R ugo+rx ./gradle"
-                sh "./gradlew clean build"
+                sh "./gradlew clean build -P NEXUS_URL=$NEXUS_URL -P MAVEN_USER=$NEXUS_USER_USR -P MAVEN_PASSWORD=$NEXUS_USER_PSW"
                 sh "./gradlew publish -P NEXUS_URL=$NEXUS_URL -P MAVEN_USER=$NEXUS_USER_USR -P MAVEN_PASSWORD=$NEXUS_USER_PSW"
                 sh "./gradlew publish -P NEXUS_URL=$NEXUS_URL -P NEXUS_URL_FOR_PUSH=$NEXUS_DMZ_URL -P MAVEN_USER=$NEXUS_DMZ_USER_USR -P MAVEN_PASSWORD=$NEXUS_DMZ_USER_PSW"
             }

diff --git a/gradle/cplex_plugin.gradle b/gradle/cplex_plugin.gradle
@@ -72,8 +72,8 @@ ext {
 }
 
 println("Using cplex studio: $ext.cplexStudioHome")
-println("Using native cplex path: $ext.nativeCplexPath")
 println("Using native cpo path: $ext.nativeCpoPath")
+println("Using native cplex path: $ext.nativeCplexPath")
 
 test {
     environment "PATH", "$nativeCpoPath$pathSeparator$nativeCplexPath" // For Windows dynamic library loading