Merge branch 'hotfix/1.5.2'

Author: danielgodard

README.md

@@ -26,7 +26,7 @@ If you want to play with this library and do not have a license of CPLEX, you ca
 [Community Edition of IBM ILOG CPLEX Optimization Studio](https://www-01.ibm.com/software/websphere/products/optimization/cplex-studio-community-edition/)
 
 To build this library use the Gradle wrapper provided or install [Gradle 2.10](https://gradle.org) and set the environment variable `CPLEX_STUDIO_HOME` (e.g. 
-on windows `C:\IBM\ILOG\CPLEX_Studio128`).  
+on windows `C:\IBM\ILOG\CPLEX_Studio129`). 
 
 Then do:
 

RELEASENOTES.md

@@ -1,10 +1,30 @@
 # Release Notes of cplex-scala: A Scala library for IBM ILOG CPLEX
 
+## cplex-scala v1.5.2
+
+This is a hotfix:
+
+  * Update build.gradle: use default values for environment variables for Nexus
+  
+The library cplex-scala.jar is the same as the same as in release 1.5.0. 
+
+## cplex-scala v1.5.1
+
+This is a hotfix:
+
+  * Update release notes for release 1.5.0
+  * Fix issues in Jenkinsfile
+
+The library cplex-scala.jar is the same as the same as in release 1.5.0. 
+ 
+
 ## cplex-scala v1.5.0
 
   * Update Gradle wrapper to release 5.4
   * Add API for multi-objective in MpModel: see example DietMultiObj.scala
-  * Define method apply in classes `NumArray`, `IntArray`, `NumVarArray` and `IntVarArray` for element constraint.
+  * Define method apply in classes `NumArray`, `IntArray` and `IntExprArray` for element constraint: this allows to 
+    write constructs like `cost = costs(supplier)` where costs is an array of integer, supplier is an integer variable 
+    and `cost` is an integer expression that represents the cost of the chosen supplier. See Facility.scala for a complete example..
   * Add operator * on classes `NumArray`, `IntArray`, `NumVarArray` and `IntVarArray`for scalar product.
   * Refactoring:
     * Add class Modeler to build optimization model: CpModel and MpModel now inherits from Modeler

build.gradle

@@ -5,7 +5,7 @@
  */
 
 group 'com.decisionbrain'
-version '1.5.0'
+version '1.5.2'
 
 apply plugin: 'java'
 apply plugin: 'scala'
@@ -19,6 +19,18 @@ apply from: 'gradle/cplex_plugin.gradle'
 // DecisionBrain Nexus Repository for Jar files and Docker images
 //
 
+ext {
+    if (!project.hasProperty('NEXUS_URL'))
+        NEXUS_URL = "None"
+    if (!project.hasProperty('MAVEN_USER'))
+        MAVEN_USER= "None"
+    if (!project.hasProperty('MAVEN_PASSWORD'))
+        MAVEN_PASSWORD = "None"
+}
+
+println("Nexus URL: $NEXUS_URL")
+println("Maven user: $MAVEN_USER")
+
 task sourcesJar(type: Jar) {
     archiveClassifier = 'sources'
     from sourceSets.main.allJava
@@ -73,13 +85,6 @@ repositories {
     if (!gradle.startParameter.refreshDependencies) {
         mavenLocal()
     }
-    maven {
-        credentials {
-            username "$MAVEN_USER"
-            password "$MAVEN_PASSWORD"
-        }
-        url "$NEXUS_URL/repository/public"
-    }
     mavenCentral()
 }