Merge commit 'ccdecf8db43ffc101ad0dd0ac2977207be7baca6'

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>choco</groupId>
     <artifactId>choco-geost</artifactId>
-    <version>3.2.1-SNAPSHOT</version>
+    <version>3.2.1</version>
     <packaging>jar</packaging>
     <name>Geost constraint, developped for Choco3</name>
 
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>choco</groupId>
             <artifactId>choco-solver</artifactId>
-            <version>3.2.1-SNAPSHOT</version>
+            <version>3.2.1</version>
         </dependency>
         <dependency>
             <groupId>org.testng</groupId>
@@ -44,15 +44,11 @@
             <artifactId>slf4j-api</artifactId>
             <version>1.7.7</version>
         </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-core</artifactId>
-            <version>1.1.2</version>
-        </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
             <version>1.1.2</version>
+            <scope>test</scope>
         </dependency>
     </dependencies>
 

src/main/bash/release.sh

@@ -0,0 +1,47 @@
+#!/bin/sh
+
+function getVersionToRelease() {
+    CURRENT_VERSION=`mvn ${MVN_ARGS} org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version | grep -v "\[INFO\]"`
+    echo ${CURRENT_VERSION%%-SNAPSHOT}
+}
+
+function guess() {
+    v=$1
+    echo "${v%.*}.$((${v##*.}+1))-SNAPSHOT"
+}
+
+
+VERSION=$(getVersionToRelease)
+NEXT=$(guess $VERSION)
+TAG="choco-geost-${VERSION}"
+
+git fetch
+git checkout -b release
+
+mvn versions:set -DnewVersion=${VERSION} -DgenerateBackupPoms=false
+git commit -m "initiate release ${VERSION}" -a
+
+COMMIT=$(git rev-parse HEAD)
+
+git ls-remote --exit-code --tags origin ${TAG}
+
+## MASTER
+git checkout master
+git merge --no-ff ${COMMIT}
+git tag ${TAG}
+git push --tags
+git pull origin master
+git push origin master
+
+## DEVELOP
+git checkout develop
+git merge --no-ff ${TAG}
+mvn versions:set -DnewVersion=${NEXT} -DgenerateBackupPoms=false
+git commit -m "Prepare the code for the next version" -a
+git push origin develop
+git push --all && git push --tags
+git push origin --delete release
+
+git checkout $TAG
+mvn clean install -DskipTests
+git checkout develop

src/main/java/solver/constraints/nary/geost/PropGeost.java

@@ -42,8 +42,8 @@
 import solver.propagation.IPropagationEngine;
 import solver.propagation.NoPropagationEngine;
 import solver.search.solution.Solution;
-import solver.variables.EventType;
 import solver.variables.IntVar;
+import solver.variables.events.IntEventType;
 import util.ESat;
 
 import java.util.HashMap;
@@ -163,7 +163,7 @@ public PropGeost(IntVar[] vars, int k, List<GeostObject> objects, List<ShiftedBo
 
     @Override
     protected int getPropagationConditions(int vIdx) {
-        return EventType.INT_ALL_MASK();
+        return IntEventType.ALL_EVENTS;
     }
 
     @Override
@@ -176,11 +176,6 @@ public void propagate(int evtmask) throws ContradictionException {
         filter();
     }
 
-    @Override
-    public void propagate(int idxVarInProp, int mask) throws ContradictionException {
-        forcePropagate(EventType.FULL_PROPAGATION);
-    }
-
     @Override
     public ESat isEntailed() {
         if (isCompletelyInstantiated()) {