From a909d97ad03426155084a22d775b84be7657644f Mon Sep 17 00:00:00 2001 From: cprudhom Date: Fri, 2 Oct 2020 13:22:25 +0200 Subject: [PATCH] initiate release 4.10.5 --- CHANGES.md | 7 ++++--- README.md | 6 +++--- examples/pom.xml | 2 +- parsers/pom.xml | 2 +- parsers/src/main/minizinc/docker/Dockerfile_Choco.dms | 2 +- .../java/org/chocosolver/flatzinc/PerformanceTest.java | 2 +- .../test/java/org/chocosolver/xscp/PerformanceTest.java | 2 +- pom.xml | 2 +- sat/pom.xml | 2 +- solver/pom.xml | 2 +- .../main/java/org/chocosolver/solver/DefaultSettings.java | 2 +- solver/src/main/resources/Assert.properties | 2 +- 12 files changed, 17 insertions(+), 16 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 9e1650fd36..5b4edda628 100644 --- 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 index 601728a984..479d5b7a73 100644 --- 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 org.choco-solver choco-solver - 4.10.4 + 4.10.5 ``` diff --git a/examples/pom.xml b/examples/pom.xml index ba95c7607e..c227688ee3 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -17,7 +17,7 @@ org.choco-solver choco - 4.10.5-SNAPSHOT + 4.10.5 examples jar diff --git a/parsers/pom.xml b/parsers/pom.xml index 9d3f04b5df..3edb1e41e3 100644 --- a/parsers/pom.xml +++ b/parsers/pom.xml @@ -17,7 +17,7 @@ org.choco-solver choco - 4.10.5-SNAPSHOT + 4.10.5 choco-parsers jar diff --git a/parsers/src/main/minizinc/docker/Dockerfile_Choco.dms b/parsers/src/main/minizinc/docker/Dockerfile_Choco.dms index 4deaa1e3e0..95794b8cc3 100644 --- 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 index 10b80ad574..1922f97c6c 100644 --- 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 index eb557fa6a1..eefbfcdd0e 100644 --- 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 index e0e2ef06ff..54aff183dc 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ 4.0.0 org.choco-solver choco - 4.10.5-SNAPSHOT + 4.10.5 pom choco http://choco-solver.org/ diff --git a/sat/pom.xml b/sat/pom.xml index 94487e2177..a5be52067e 100755 --- a/sat/pom.xml +++ b/sat/pom.xml @@ -16,7 +16,7 @@ org.choco-solver choco - 4.10.5-SNAPSHOT + 4.10.5 choco-sat jar diff --git a/solver/pom.xml b/solver/pom.xml index 13cd334a6c..6f5ead0ffd 100644 --- a/solver/pom.xml +++ b/solver/pom.xml @@ -17,7 +17,7 @@ org.choco-solver choco - 4.10.5-SNAPSHOT + 4.10.5 choco-solver jar diff --git a/solver/src/main/java/org/chocosolver/solver/DefaultSettings.java b/solver/src/main/java/org/chocosolver/solver/DefaultSettings.java index 4582c067fe..e54bee501a 100644 --- 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 index 59f9feea60..a131890963 100644 --- 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