diff --git a/CHANGES.md b/CHANGES.md index 5e6f284e5e..5b78ffe1a0 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.9 - 22 Aug 2022 ------------------- ### Major features: diff --git a/README.md b/README.md index ea1e17b168..f1127bb59e 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Choco-solver is an open-source Java library for Constraint Programming. -Current stable version is 4.10.8 (07 Jan 2022). +Current stable version is 4.10.9 (22 Aug 2022). Choco-solver comes with: - various type of variables (integer, boolean, set, graph and real), @@ -122,7 +122,7 @@ So you only have to edit your `pom.xml` to declare the following library depende org.choco-solver choco-solver - 4.10.8 + 4.10.9 ``` diff --git a/examples/pom.xml b/examples/pom.xml index 15df9e66d3..1cda80c9f7 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -17,7 +17,7 @@ org.choco-solver choco - 4.10.9-SNAPSHOT + 4.10.9 examples jar diff --git a/parsers/pom.xml b/parsers/pom.xml index cd1ed8dbd2..417be2fe35 100644 --- a/parsers/pom.xml +++ b/parsers/pom.xml @@ -17,7 +17,7 @@ org.choco-solver choco - 4.10.9-SNAPSHOT + 4.10.9 choco-parsers jar diff --git a/parsers/src/main/minizinc/docker/Dockerfile_Choco.dms b/parsers/src/main/minizinc/docker/Dockerfile_Choco.dms index f19573d7b3..e357746a19 100644 --- a/parsers/src/main/minizinc/docker/Dockerfile_Choco.dms +++ b/parsers/src/main/minizinc/docker/Dockerfile_Choco.dms @@ -23,7 +23,7 @@ WORKDIR /src # Get and build of Choco-solver RUN git clone https://github.com/chocoteam/choco-solver.git /choco-solver && \ cd /choco-solver/ && \ - git fetch -q && git checkout -q master && \ + git fetch -q && git checkout -q 4.10.9 && \ git log --format="%H" -n 1 && \ mvn -q clean install -DskipTests && \ cd .. diff --git a/parsers/src/main/minizinc/fzn-choco b/parsers/src/main/minizinc/fzn-choco index 2158b9c732..88ac5e497c 100755 --- a/parsers/src/main/minizinc/fzn-choco +++ b/parsers/src/main/minizinc/fzn-choco @@ -10,7 +10,7 @@ SEED=0 NB_NODES=1 TIME_LIMIT=-1 DIR=`dirname "$0"` -CHOCO_JAR=~/.m2/repository/org/choco-solver/choco-parsers/4.10.9-SNAPSHOT/choco-parsers-4.10.9-SNAPSHOT-jar-with-dependencies.jar +CHOCO_JAR=~/.m2/repository/org/choco-solver/choco-parsers/4.10.9/choco-parsers-4.10.9-jar-with-dependencies.jar #${DIR}/${JAR_NAME} usage="\ diff --git a/pom.xml b/pom.xml index 05404b41a2..5283d793d5 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ 4.0.0 org.choco-solver choco - 4.10.9-SNAPSHOT + 4.10.9 pom choco http://choco-solver.org/ diff --git a/scripts/set_version.sh b/scripts/set_version.sh index 64a05cb8f2..3fec91ab24 100755 --- a/scripts/set_version.sh +++ b/scripts/set_version.sh @@ -44,7 +44,7 @@ then sedInPlace "s%.*Constraint Programming Solver, Copyright.*% \"** Choco $VERSION \($DAT\) : Constraint Programming Solver, Copyright \(c\) 2010-$YEAR\";%" ./solver/src/main/java/org/chocosolver/solver/trace/IOutputFactory.java ## For MiniZinc - sedInPlace "s% git fetch -q && git checkout -q master.*% git fetch -q && git checkout -q $VERSION && \\ %" ./parsers/src/main/minizinc/docker/Dockerfile_Choco.dms + sedInPlace "s% git fetch -q && git checkout -q master.*% git fetch -q && git checkout -q $VERSION && \%" ./parsers/src/main/minizinc/docker/Dockerfile_Choco.dms sedInPlace "s% \"version\": .*% \"version\": \"$VERSION\",%" ./parsers/src/main/minizinc/choco.msc sedInPlace "s%CHOCO_JAR=~/.m2/.*%CHOCO_JAR=~/.m2/repository/org/choco-solver/choco-parsers/$VERSION/choco-parsers-$VERSION-jar-with-dependencies.jar%" ./parsers/src/main/minizinc/fzn-choco diff --git a/solver/pom.xml b/solver/pom.xml index 4e8babc057..4948966077 100644 --- a/solver/pom.xml +++ b/solver/pom.xml @@ -17,7 +17,7 @@ org.choco-solver choco - 4.10.9-SNAPSHOT + 4.10.9 choco-solver jar diff --git a/solver/src/main/java/org/chocosolver/solver/trace/IOutputFactory.java b/solver/src/main/java/org/chocosolver/solver/trace/IOutputFactory.java index bef9fef537..e75d9d5e09 100644 --- a/solver/src/main/java/org/chocosolver/solver/trace/IOutputFactory.java +++ b/solver/src/main/java/org/chocosolver/solver/trace/IOutputFactory.java @@ -42,7 +42,7 @@ public interface IOutputFactory extends ISelf { * Default welcome message */ String WELCOME_MESSAGE = - "** Choco 4.10.8 (2022-01) : Constraint Programming Solver, Copyright (c) 2010-2022"; + "** Choco 4.10.9 (2022-08) : Constraint Programming Solver, Copyright (c) 2010-2022"; /** * Print the version message.