initiate release 4.10.5

chocoteam · Oct 2, 2020 · a909d97 · a909d97
1 parent 2f9d2e0
commit a909d97
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 16 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -4,7 +4,7 @@ Choco Solver ChangeLog
 This file is dedicated to sum up the new features added and bugs fixed in Choco-solver since the version, 4.0.0.
 **Note**: double-space is replaced by "\t" character on release process. Make sure the format is ok.
 
-NEXT MILESTONE
+4.10.5 - 02 Oct 2020
 -------------------
 
 ### Major features:
@@ -15,11 +15,12 @@ NEXT MILESTONE
 - `Settings.setEnableACOnTernarySum(boolean)` removed
 
 ### Other closed issues and pull requests:
-\#699, #709, #725, #737 
+See [milestone 4.10.5](https://github.com/chocoteam/choco-solver/milestone/29) 
 
 #### Contributors to this release:
 - [Guillaume Le Louët](https://github.com/glelouet) (glelouet)
-- [Charles Prud'homme](https://github.com/cprudhom) (cprudhom) 
+- [Charles Prud'homme](https://github.com/cprudhom) (cprudhom)
+- [João Pedro Schmitt](https://github.com/schmittjoaopedro) (schmittjoaopedro) 
 
 4.10.4 - 08 Sep 2020
 --------------------

diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@
 
 Choco-solver is an open-source Java library for Constraint Programming.
 
-Current stable version is 4.10.4 (08 Sep 2020).
+Current stable version is 4.10.5 (02 Oct 2020).
 
 Choco-solver comes with:
 - various type of variables (integer, boolean, set, graph and real),
@@ -57,7 +57,7 @@ solver.printStatistics();
 ## Documentation, Support and Issues
 
 The [latest release](https://github.com/chocoteam/choco-solver/releases/latest) points to a 
-[tarball](https://github.com/chocoteam/choco-solver/releases/download/4.10.4/choco-4.10.4.zip) which contains
+[tarball](https://github.com/chocoteam/choco-solver/releases/download/4.10.5/choco-4.10.5.zip) which contains
 the binary, the source code, the user guide (pdf) and the apidocs (zip).
 
 You can get help on our [google group](https://groups.google.com/forum/#!forum/choco-solver).
@@ -120,7 +120,7 @@ So you only have to edit your `pom.xml` to declare the following library depende
 <dependency>
    <groupId>org.choco-solver</groupId>
    <artifactId>choco-solver</artifactId>
-   <version>4.10.4</version>
+   <version>4.10.5</version>
 </dependency>
 ```
 

diff --git a/examples/pom.xml b/examples/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.choco-solver</groupId>
     <artifactId>choco</artifactId>
-    <version>4.10.5-SNAPSHOT</version>
+    <version>4.10.5</version>
   </parent>
   <artifactId>examples</artifactId>
   <packaging>jar</packaging>

diff --git a/parsers/pom.xml b/parsers/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.choco-solver</groupId>
         <artifactId>choco</artifactId>
-        <version>4.10.5-SNAPSHOT</version>
+        <version>4.10.5</version>
     </parent>
     <artifactId>choco-parsers</artifactId>
     <packaging>jar</packaging>

diff --git a/parsers/src/main/minizinc/docker/Dockerfile_Choco.dms b/parsers/src/main/minizinc/docker/Dockerfile_Choco.dms
@@ -39,7 +39,7 @@ RUN apt-get update && \
 
 # Copy Choco's executable from the previous stage across
 COPY --from=builder /choco-solver/parsers/src/main/minizinc/fzn-choco /entry_data/fzn-exec
-COPY --from=builder /choco-solver/parsers/target/choco-parsers-4.10.4-jar-with-dependencies.jar /entry_data/choco-parsers.jar
+COPY --from=builder /choco-solver/parsers/target/choco-parsers-4.10.5-jar-with-dependencies.jar /entry_data/choco-parsers.jar
 
 # Update execution script
 RUN sed -i 's&DIR=.*&DIR=/entry_data&g' /entry_data/fzn-exec

diff --git a/parsers/src/test/java/org/chocosolver/flatzinc/PerformanceTest.java b/parsers/src/test/java/org/chocosolver/flatzinc/PerformanceTest.java
@@ -1,5 +1,5 @@
 /*
- * This file is part of choco-solver, http://choco-solver.org/
+ * This file is part of choco-parsers, http://choco-solver.org/
  *
  * Copyright (c) 2020, IMT Atlantique. All rights reserved.
  *

diff --git a/parsers/src/test/java/org/chocosolver/xscp/PerformanceTest.java b/parsers/src/test/java/org/chocosolver/xscp/PerformanceTest.java
@@ -1,5 +1,5 @@
 /*
- * This file is part of choco-solver, http://choco-solver.org/
+ * This file is part of choco-parsers, http://choco-solver.org/
  *
  * Copyright (c) 2020, IMT Atlantique. All rights reserved.
  *

diff --git a/pom.xml b/pom.xml
@@ -15,7 +15,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.choco-solver</groupId>
     <artifactId>choco</artifactId>
-    <version>4.10.5-SNAPSHOT</version>
+    <version>4.10.5</version>
     <packaging>pom</packaging>
     <name>choco</name>
     <url>http://choco-solver.org/</url>

diff --git a/sat/pom.xml b/sat/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.choco-solver</groupId>
         <artifactId>choco</artifactId>
-        <version>4.10.5-SNAPSHOT</version>
+        <version>4.10.5</version>
     </parent>
     <artifactId>choco-sat</artifactId>
     <packaging>jar</packaging>

diff --git a/solver/pom.xml b/solver/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.choco-solver</groupId>
         <artifactId>choco</artifactId>
-        <version>4.10.5-SNAPSHOT</version>
+        <version>4.10.5</version>
     </parent>
     <artifactId>choco-solver</artifactId>
     <packaging>jar</packaging>

diff --git a/solver/src/main/java/org/chocosolver/solver/DefaultSettings.java b/solver/src/main/java/org/chocosolver/solver/DefaultSettings.java
@@ -34,7 +34,7 @@ public class DefaultSettings implements Settings {
      * Default welcome message
      */
     private static final String DEFAULT_WELCOME_MESSAGE =
-        "** Choco 4.10.4 (2020-09) : Constraint Programming Solver, Copyright (c) 2010-2020";
+        "** Choco 4.10.5 (2020-10) : Constraint Programming Solver, Copyright (c) 2010-2020";
 
     private static final String DEFAULT_PREFIX = "TMP_";
 

diff --git a/solver/src/main/resources/Assert.properties b/solver/src/main/resources/Assert.properties
@@ -1,7 +1,7 @@
 #Default settings for Choco
 #Tue Jul 24 11:02:06 CEST 2018
 # See Settings for definitions of each property
-welcome.message=** Choco 4.10.4 (2020-09) : Constraint Programming Solver, Copyright (c) 2010-2020;
+welcome.message=** Choco 4.10.5 (2020-10) : Constraint Programming Solver, Copyright (c) 2010-2020;
 table.substitution=true
 enumerated.threshold=32768
 constraints.check=true