From e4c1df7fe59c7f0aa57d04740ec38949c3ee0f72 Mon Sep 17 00:00:00 2001 From: cprudhom Date: Fri, 7 Jan 2022 16:02:06 +0100 Subject: [PATCH] initiate release 4.10.8 --- CHANGES.md | 2 +- LICENSE | 2 +- README.md | 6 +++--- examples/pom.xml | 2 +- parsers/pom.xml | 2 +- parsers/src/main/minizinc/choco.msc | 2 +- parsers/src/main/minizinc/docker/Dockerfile_Choco.dms | 2 +- parsers/src/main/minizinc/fzn-choco | 2 +- pom.xml | 2 +- scripts/set_version.sh | 2 +- solver/pom.xml | 2 +- .../java/org/chocosolver/solver/trace/IOutputFactory.java | 2 +- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 383f53c14a..8ae2381951 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.8 - 07 Jan 2022 ------------------- ### Major features: diff --git a/LICENSE b/LICENSE index c41e72a0a0..95264b39af 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ BSD 4-Clause License -Copyright (c) 2021, IMT Atlantique +Copyright (c) 2022, IMT Atlantique All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/README.md b/README.md index c57fefb332..ae7476f12e 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.7 (11 Oct 2021). +Current stable version is 4.10.8 (07 Jan 2022). Choco-solver comes with: - various type of variables (integer, boolean, set, graph and real), @@ -26,7 +26,7 @@ Choco-solver comes with: But also, facilities to interact with the search loop, factories to help modelling, many samples, etc. -Choco-solver is distributed under BSD 4-Clause License (Copyright (c) 1999-2021, IMT Atlantique). +Choco-solver is distributed under BSD 4-Clause License (Copyright (c) 1999-2022, IMT Atlantique). Contact: [Choco-solver on Gitter](https://gitter.im/chocoteam/choco-solver#) @@ -119,7 +119,7 @@ So you only have to edit your `pom.xml` to declare the following library depende org.choco-solver choco-solver - 4.10.7 + 4.10.8 ``` diff --git a/examples/pom.xml b/examples/pom.xml index 25ec3fd701..75443dcfc1 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -17,7 +17,7 @@ org.choco-solver choco - 4.10.8-SNAPSHOT + 4.10.8 examples jar diff --git a/parsers/pom.xml b/parsers/pom.xml index 6bd3621348..816af13e6f 100644 --- a/parsers/pom.xml +++ b/parsers/pom.xml @@ -17,7 +17,7 @@ org.choco-solver choco - 4.10.8-SNAPSHOT + 4.10.8 choco-parsers jar diff --git a/parsers/src/main/minizinc/choco.msc b/parsers/src/main/minizinc/choco.msc index 829c261340..f9a39dbc62 100644 --- a/parsers/src/main/minizinc/choco.msc +++ b/parsers/src/main/minizinc/choco.msc @@ -2,7 +2,7 @@ "id": "org.choco.choco", "name": "Choco-solver", "description": "Choco FlatZinc executable", - "version": "4.10.7", + "version": "4.10.8", "mznlib": "/Users/kyzrsoze/Sources/CHOCO/continuous-branch/parsers/src/main/minizinc/mzn_lib", "executable": "/Users/kyzrsoze/Sources/CHOCO/continuous-branch/parsers/src/main/minizinc/fzn-choco", "tags": ["cp","int"], diff --git a/parsers/src/main/minizinc/docker/Dockerfile_Choco.dms b/parsers/src/main/minizinc/docker/Dockerfile_Choco.dms index 2ed383d941..899c273d1b 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 RUN cd /choco-solver/ && \ - git fetch -q && git checkout -q master && \ + git fetch -q && git checkout -q 4.10.8 && \ mvn -q clean install -DskipTests && \ cd .. #------------------------------------------------------------------------------# diff --git a/parsers/src/main/minizinc/fzn-choco b/parsers/src/main/minizinc/fzn-choco index 44c670da8b..2d6802c689 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.7/choco-parsers-4.10.7-jar-with-dependencies.jar +CHOCO_JAR=~/.m2/repository/org/choco-solver/choco-parsers/4.10.8/choco-parsers-4.10.8-jar-with-dependencies.jar #${DIR}/${JAR_NAME} usage="\ diff --git a/pom.xml b/pom.xml index 753add1bf5..a61306e3b2 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ 4.0.0 org.choco-solver choco - 4.10.8-SNAPSHOT + 4.10.8 pom choco http://choco-solver.org/ diff --git a/scripts/set_version.sh b/scripts/set_version.sh index 188c14a15b..64a05cb8f2 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 c4e6736e34..3e91e392fe 100644 --- a/solver/pom.xml +++ b/solver/pom.xml @@ -17,7 +17,7 @@ org.choco-solver choco - 4.10.8-SNAPSHOT + 4.10.8 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 96ce404f7e..e2a7c56288 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.7 (2021-10) : Constraint Programming Solver, Copyright (c) 2010-2021"; + "** Choco 4.10.8 (2022-01) : Constraint Programming Solver, Copyright (c) 2010-2022"; /** * Print the version message.