Merge commit '4436126e4d420ba03c24d9dcc129e13d46d24693'

chocoteam · May 11, 2015 · 10cd32a · 10cd32a
2 parents 927f03d + 4436126
commit 10cd32a
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 13 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -6,6 +6,10 @@ This file is dedicated to sum up the new features added and bugs fixed in Choco
 NEXT MILESTONE
 -------------------
 
+
+3.3.1 - 11 May 2015
+-------------------
+
 - Change the default propagation engine (default is now SevenQueuesPropagatorEngine)
 - Add clause_channeling constraint
 - Remove IntVar.wipeOut(...)

diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2014,
+Copyright (c) 2015,
       Charles Prud'homme (TASC, ARMINES, INRIA Rennes, LINA CNRS UMR 6241),
       Jean-Guillaume Fages (COSLING S.A.S.).
 All rights reserved.

diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ Choco3 is an open-source Java library for Constraint Programming.
 
 Choco3 is not the continuation of Choco2, but a completely rewritten version and there is no backward compatibility.
 
-Current stable version is 3.3.0 (04 Dec 2014).
+Current stable version is 3.3.1 (11 May 2015).
 
 Choco3 comes with:
 - various type of variables (integer, boolean, set, graph and real),
@@ -14,7 +14,7 @@ Choco3 comes with:
 
 But also, facilities to interact with the search loop, factories to help modelling, many samples, etc.
 
-Choco3 is distributed under BSD licence (Copyright (c) 1999-2014, Ecole des Mines de Nantes).
+Choco3 is distributed under BSD licence (Copyright (c) 1999-2015, Ecole des Mines de Nantes).
 
 Contact: [email protected]
 
@@ -48,7 +48,7 @@ In the following, we distinguish two usages of Choco:
 - as a standalone application: the jar file includes all required dependencies and configuration file (that is, `logback.xml`),
 - as a library: the jar file excludes all dependencies and configuration file (that is, `logback.xml`).
 
-The name of the jar file terms the packaging: `choco-solver-3.3.0-with-dependencies.jar` or `choco-solver-3.3.0.jar`.
+The name of the jar file terms the packaging: `choco-solver-3.3.1-with-dependencies.jar` or `choco-solver-3.3.1.jar`.
 
 The jar files can be downloaded from this URL:
 
@@ -77,7 +77,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>3.3.0</version>
+   <version>3.3.1</version>
 </dependency>
 ```
 

diff --git a/choco-samples/pom.xml b/choco-samples/pom.xml
@@ -30,7 +30,7 @@
     <parent>
         <artifactId>choco</artifactId>
         <groupId>org.choco-solver</groupId>
-        <version>3.3.1-SNAPSHOT</version>
+        <version>3.3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>choco-samples</artifactId>

diff --git a/choco-solver/pom.xml b/choco-solver/pom.xml
@@ -31,7 +31,7 @@
     <parent>
         <artifactId>choco</artifactId>
         <groupId>org.choco-solver</groupId>
-        <version>3.3.1-SNAPSHOT</version>
+        <version>3.3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>choco-solver</artifactId>

diff --git a/choco-solver/src/main/java/org/chocosolver/solver/Settings.java b/choco-solver/src/main/java/org/chocosolver/solver/Settings.java
@@ -54,7 +54,7 @@ public enum Idem {
      * Return the welcome message
      */
     default public String getWelcomeMessage() {
-        return "** Choco 3.3.0 (2014-12) : Constraint Programming Solver, Copyleft (c) 2010-2014";
+        return "** Choco 3.3.1 (2015-05) : Constraint Programming Solver, Copyleft (c) 2010-2015";
     }
 
     /**

diff --git a/docs/source/3_solving.rst b/docs/source/3_solving.rst
@@ -617,7 +617,7 @@ On a call to ``Chatterbox.printVersion()``, the following message will be printe
 
 .. code-block:: none
 
-    ** Choco 3.3.0 (2014-12) : Constraint Programming Solver, Copyleft (c) 2010-2014
+    ** Choco 3.3.1 (2015-05) : Constraint Programming Solver, Copyleft (c) 2010-2015
 
 On a call to ``Chatterbox.printVersion()``, the following message will be printed:
 

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -49,7 +49,7 @@
 
 # General information about the project.
 project = u'Choco3'
-copyright = u'2014, Jean-Guillaume Fages, Xavier Lorca, Charles Prud\'homme'
+copyright = u'2015, Jean-Guillaume Fages, Xavier Lorca, Charles Prud\'homme'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -58,7 +58,7 @@
 # The short X.Y version.
 version = '3'
 # The full version, including alpha/beta/rc tags.
-release = '3.3.0'
+release = '3.3.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -175,7 +175,7 @@
 #html_show_sphinx = True
 
 # If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
-#html_show_copyright = u'2014, Jean-Guillaume Fages, Xavier Lorca, Charles Prud\'homme'
+#html_show_copyright = u'2015, Jean-Guillaume Fages, Xavier Lorca, Charles Prud\'homme'
 
 # If true, an OpenSearch description file will be output, and all pages will
 # contain a <link> tag referring to it.  The value of this option must be the

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <groupId>org.choco-solver</groupId>
     <artifactId>choco</artifactId>
     <packaging>pom</packaging>
-    <version>3.3.1-SNAPSHOT</version>
+    <version>3.3.1</version>
     <name>Choco-${project.version}: an Open-Source Constraint Solver</name>
     <url>http://choco-solver.org/</url>
     <description>Choco is a Free and Open-Source Software dedicated to Constraint Programming.

diff --git a/user_guide.pdf b/user_guide.pdf