Skip to content

Commit

Permalink
initiate release 4.10.10
Browse files Browse the repository at this point in the history
  • Loading branch information
cprudhom committed Oct 11, 2022
1 parent 7e2f01e commit 60b2499
Show file tree
Hide file tree
Showing 10 changed files with 25 additions and 25 deletions.
2 changes: 1 addition & 1 deletion CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.10 - 11 Oct 2022
-------------------

### Major features:
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

Choco-solver is an open-source Java library for Constraint Programming.

Current stable version is 4.10.9 (22 Aug 2022).
Current stable version is 4.10.10 (11 Oct 2022).

Choco-solver comes with:
- various type of variables (integer, boolean, set, graph and real),
Expand Down Expand Up @@ -123,7 +123,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.9</version>
<version>4.10.10</version>
</dependency>
```

Expand Down
2 changes: 1 addition & 1 deletion examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<parent>
<groupId>org.choco-solver</groupId>
<artifactId>choco</artifactId>
<version>4.10.10-SNAPSHOT</version>
<version>4.10.10</version>
</parent>
<artifactId>examples</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion parsers/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<parent>
<groupId>org.choco-solver</groupId>
<artifactId>choco</artifactId>
<version>4.10.10-SNAPSHOT</version>
<version>4.10.10</version>
</parent>
<artifactId>choco-parsers</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion parsers/src/main/minizinc/choco.msc
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"id": "org.choco.choco",
"name": "Choco-solver",
"description": "Choco FlatZinc executable",
"version": "4.10.9",
"version": "4.10.10",
"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"],
Expand Down
2 changes: 1 addition & 1 deletion parsers/src/main/minizinc/fzn-choco
Original file line number Diff line number Diff line change
Expand Up @@ -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/choco-parsers-4.10.9-jar-with-dependencies.jar
CHOCO_JAR=~/.m2/repository/org/choco-solver/choco-parsers/4.10.10/choco-parsers-4.10.10-jar-with-dependencies.jar
#${DIR}/${JAR_NAME}
usage="\
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.choco-solver</groupId>
<artifactId>choco</artifactId>
<version>4.10.10-SNAPSHOT</version>
<version>4.10.10</version>
<packaging>pom</packaging>
<name>choco</name>
<url>http://choco-solver.org/</url>
Expand Down
30 changes: 15 additions & 15 deletions scripts/set_version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ source "${dir}"/commons.sh
#Script to notify the website about a release

function sedInPlace() {
if [ $(uname) = "Darwin" ]; then
if [ "$(uname)" = "Darwin" ]; then
sed -i '' "$1" $2
else
sed -i'' "$1" $2
Expand Down Expand Up @@ -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

Expand All @@ -57,18 +57,18 @@ else

# shellcheck disable=SC2016
sedInPlace '6 i\
\
NEXT MILESTONE\
-------------------\
\
### Major features:\
\
### Deprecated API (to be removed in next release):\
\
### Other closed issues and pull requests:\
See [milestone '${VERSION%%-SNAPSHOT}'](https://github.com/chocoteam/choco-solver/milestone/xx)\
\
#### Contributors to this release:\
\
\
NEXT MILESTONE\
-------------------\
\
### Major features:\
\
### Deprecated API (to be removed in next release):\
\
### Other closed issues and pull requests:\
See [milestone '${VERSION%%-SNAPSHOT}'](https://github.com/chocoteam/choco-solver/milestone/xx)\
\
#### Contributors to this release:\
\
' CHANGES.md
fi
2 changes: 1 addition & 1 deletion solver/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<parent>
<groupId>org.choco-solver</groupId>
<artifactId>choco</artifactId>
<version>4.10.10-SNAPSHOT</version>
<version>4.10.10</version>
</parent>
<artifactId>choco-solver</artifactId>
<packaging>jar</packaging>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public interface IOutputFactory extends ISelf<Solver> {
* Default welcome message
*/
String WELCOME_MESSAGE =
"** Choco 4.10.9 (2022-08) : Constraint Programming Solver, Copyright (c) 2010-2022";
"** Choco 4.10.10 (2022-10) : Constraint Programming Solver, Copyright (c) 2010-2022";

/**
* Print the version message.
Expand Down

0 comments on commit 60b2499

Please sign in to comment.