Merge commit 'c2c8cc49e79ced6770c7082956474f5bd7209015'

chocoteam · Dec 5, 2014 · 7acd02d · 7acd02d
2 parents a3e0645 + c2c8cc4
commit 7acd02d
Show file tree

Hide file tree

Showing 13 changed files with 189 additions and 117 deletions.
diff --git a/pom.xml b/pom.xml
@@ -2,14 +2,29 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>choco</groupId>
+    <groupId>org.chocosolver</groupId>
     <artifactId>choco-gui</artifactId>
-    <version>3.2.2-SNAPSHOT</version>
+    <version>3.3.0</version>
     <packaging>jar</packaging>
 
     <name>A GUI for Choco3</name>
     <url>https://github.com/chocoteam/choco-gui</url>
-
+    <description>A Graphical User Interface to plug on Choco 3.
+    </description>
+   <licenses>
+        <license>
+            <name>BSD 3-Clause License</name>
+            <url>http://opensource.org/licenses/BSD-3-Clause</url>
+        </license>
+    </licenses>
+    <developers>
+        <developer>
+            <name>Charles Prud'homme</name>
+            <email>[email protected]</email>
+            <organization>TASC, INRIA Rennes, LINA CNRS UMR 6241</organization>
+            <organizationUrl>http://www.emn.fr/z-info/ppc/</organizationUrl>
+        </developer>
+    </developers>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
@@ -20,11 +35,16 @@
         <developerConnection>scm:git:[email protected]:chocoteam/choco-gui.git</developerConnection>
         <tag>HEAD</tag>
     </scm>
+
+    <prerequisites>
+        <maven>3.2.3</maven>
+    </prerequisites>
+
     <dependencies>
         <dependency>
-            <groupId>choco</groupId>
+            <groupId>org.choco-solver</groupId>
             <artifactId>choco-solver</artifactId>
-            <version>3.2.1</version>
+            <version>3.3.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -42,69 +62,95 @@
 
     <distributionManagement>
         <repository>
-            <uniqueVersion>false</uniqueVersion>
-            <id>choco-releases</id>
-            <name>Private Maven Repository</name>
-            <url>file:///Volumes/choco-repo/publish/mvn/repository</url>
-            <layout>default</layout>
+            <id>sonatype</id>
+            <url>https://oss.sonatype.org/service/local/staging/deploy/maven2</url>
         </repository>
         <snapshotRepository>
             <uniqueVersion>true</uniqueVersion>
-            <id>choco-releases</id>
-            <name>Private Maven Repository</name>
-            <url>file:///Volumes/choco-repo/publish/mvn/repository</url>
+            <id>sonatype-snapshots</id>
+            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
             <layout>default</layout>
         </snapshotRepository>
     </distributionManagement>
 
-    <repositories>
-        <repository>
-            <id>choco.repo</id>
-            <url>http://www.emn.fr/z-info/choco-repo/mvn/repository/</url>
-        </repository>
-    </repositories>
     <build>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>2.3.2</version>
                 <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
+                    <source>1.8</source>
+                    <target>1.8</target>
                     <encoding>ISO-8859-1</encoding>
                 </configuration>
             </plugin>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>2.3</version>
+                <groupId>org.bsc.maven</groupId>
+                <artifactId>maven-processor-plugin</artifactId>
+                <version>3.1.0-beta1</version>
                 <executions>
                     <execution>
-                        <phase>package</phase>
+                        <id>process</id>
                         <goals>
-                            <goal>shade</goal>
+                            <goal>process</goal>
                         </goals>
+                        <phase>generate-sources</phase>
                         <configuration>
-                            <minimizeJar>false</minimizeJar>
-                            <artifactSet>
-                                <excludes>
-                                    <exclude>org.testng:testng</exclude>
-                                    <exclude>choco:choco-solver</exclude>
-                                    <exclude>jgrapht:jgrapht</exclude>
-                                    <exclude>dk.brics:automaton</exclude>
-                                    <exclude>org.easymock:easymock</exclude>
-                                    <!--<exclude>net.sf.trove4j:trove4j</exclude> INCLUDED because of THash being excluded with shade:minimize-->
-                                    <exclude>org.slf4j:slf4j-api</exclude>
-                                    <exclude>ch.qos.logback:logback-core</exclude>
-                                    <exclude>ch.qos.logback:logback-classic</exclude>
-                                </excludes>
-                            </artifactSet>
+                            <options>
+                                <myoption>TRUE</myoption>
+                            </options>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
-
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>2.4</version>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-gpg-plugin</artifactId>
+                <version>1.5</version>
+                <executions>
+                    <execution>
+                        <id>sign-artifacts</id>
+                        <phase>deploy</phase>
+                        <goals>
+                            <goal>sign</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.10.1</version>
+                <configuration>
+                    <doctitle>${project.groupId}-${project.artifactId} ${project.version} API</doctitle>
+                    <windowtitle>${project.groupId}-${project.artifactId} ${project.version} API</windowtitle>
+                    <!--<quiet />-->
+                    <additionalparam>-Xdoclint:none</additionalparam>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>attach-javadocs</id>
+                        <phase>deploy</phase>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/src/main/bash/release.sh b/src/main/bash/release.sh
@@ -10,37 +10,63 @@ function guess() {
     echo "${v%.*}.$((${v##*.}+1))-SNAPSHOT"
 }
 
-
 VERSION=$(getVersionToRelease)
 NEXT=$(guess $VERSION)
 TAG="choco-gui-${VERSION}"
 
 git fetch
-git checkout -b release
+git checkout -b release || exit 1
+
+mvn -q dependency:purge-local-repository
 
+echo "New version is ${VERSION}"
+#Update the poms
 mvn versions:set -DnewVersion=${VERSION} -DgenerateBackupPoms=false
 git commit -m "initiate release ${VERSION}" -a
 
+echo "Start release"
+#Extract the version
 COMMIT=$(git rev-parse HEAD)
 
-git ls-remote --exit-code --tags origin ${TAG}
+#Quit if tag already exists
+git ls-remote --exit-code --tags origin ${TAG} && quit "tag ${TAG} already exists"
+
+#Working version ?
+# Well, we assume the tests have been run before, and everything is OK for the release
+mvn clean test ||exit 1
+
+git fetch origin master:refs/remotes/origin/master||quit "Unable to fetch master"
+#Integrate with master and tag
+echo "** Integrate to master **"
+git checkout master ||quit "No master branch"
+git pull origin master || quit "Unable to pull master"
+git merge --no-ff ${COMMIT} ||quit "Unable to integrate to master"
 
-## MASTER
-git checkout master
-git merge --no-ff ${COMMIT}
-git tag ${TAG}
-git push --tags
-git pull origin master
-git push origin master
+#NOT USED FOR THE MOMENT
+##Javadoc
+#./bin/push_javadoc apidocs.git ${VERSION}
 
-## DEVELOP
-git checkout develop
-git merge --no-ff ${TAG}
+git tag ${TAG} ||quit "Unable to tag with ${TAG}"
+git push --tags ||quit "Unable to push the tag ${TAG}"
+git push origin master ||quit "Unable to push master"
+
+#    #Deploy the artifacts
+#echo "** Deploying the artifacts **"
+mvn -P release clean javadoc:jar source:jar deploy -DskipTests ||quit "Unable to deploy"
+
+#Set the next development version
+#echo "** Prepare develop for the next version **"
+git checkout develop ||quit "Unable to checkout develop"
+git pull origin develop ||quit "Unable to pull develop"
+git merge --no-ff ${TAG} ||quit "Unable to integrate to develop"
 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 commit -m "Prepare the code for the next version" -a ||quit "Unable to commit to develop"
+#
+##Push changes on develop, with the tag
+git push origin develop ||quit "Unable to push to develop"
+
+#Clean
+git branch --delete release ||quit "Unable to delete release"
 
 git checkout $TAG
 mvn clean install -DskipTests

diff --git a/src/main/java/choco/GUI.java → src/main/java/org/chocosolver/gui/GUI.java b/src/main/java/choco/GUI.java → src/main/java/org/chocosolver/gui/GUI.java
@@ -24,15 +24,15 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package choco;
+package org.chocosolver.gui;
 
-import choco.panels.Parameters;
+import org.chocosolver.gui.panels.Parameters;
 import org.jfree.ui.tabbedui.VerticalLayout;
-import solver.Solver;
-import solver.search.loop.monitors.IMonitorInitialize;
-import solver.search.loop.monitors.IMonitorOpenNode;
-import solver.search.loop.monitors.IMonitorSolution;
-import util.tools.StringUtils;
+import org.chocosolver.solver.Solver;
+import org.chocosolver.solver.search.loop.monitors.IMonitorInitialize;
+import org.chocosolver.solver.search.loop.monitors.IMonitorOpenNode;
+import org.chocosolver.solver.search.loop.monitors.IMonitorSolution;
+import org.chocosolver.util.tools.StringUtils;
 
 import javax.swing.*;
 import java.awt.*;

diff --git a/src/main/java/choco/panels/APanel.java → ...va/org/chocosolver/gui/panels/APanel.java b/src/main/java/choco/panels/APanel.java → ...va/org/chocosolver/gui/panels/APanel.java
@@ -24,11 +24,11 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package choco.panels;
+package org.chocosolver.gui.panels;
 
-import choco.GUI;
+import org.chocosolver.gui.GUI;
 import org.jfree.chart.ChartPanel;
-import solver.Solver;
+import org.chocosolver.solver.Solver;
 
 import javax.swing.*;
 

diff --git a/...in/java/choco/panels/BinaryTreePanel.java → ...ocosolver/gui/panels/BinaryTreePanel.java b/...in/java/choco/panels/BinaryTreePanel.java → ...ocosolver/gui/panels/BinaryTreePanel.java
@@ -24,12 +24,12 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package choco.panels;
+package org.chocosolver.gui.panels;
 
-import choco.GUI;
-import solver.search.loop.monitors.IMonitorDownBranch;
-import solver.search.loop.monitors.IMonitorRestart;
-import solver.search.loop.monitors.IMonitorUpBranch;
+import org.chocosolver.gui.GUI;
+import org.chocosolver.solver.search.loop.monitors.IMonitorDownBranch;
+import org.chocosolver.solver.search.loop.monitors.IMonitorRestart;
+import org.chocosolver.solver.search.loop.monitors.IMonitorUpBranch;
 
 import javax.swing.*;
 import java.awt.*;

diff --git a/...ava/choco/panels/ColorVariablesPanel.java → ...olver/gui/panels/ColorVariablesPanel.java b/...ava/choco/panels/ColorVariablesPanel.java → ...olver/gui/panels/ColorVariablesPanel.java
@@ -24,10 +24,10 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package choco.panels;
+package org.chocosolver.gui.panels;
 
-import choco.GUI;
-import solver.search.loop.monitors.IMonitorOpenNode;
+import org.chocosolver.gui.GUI;
+import org.chocosolver.solver.search.loop.monitors.IMonitorOpenNode;
 
 import javax.swing.*;
 import java.awt.*;

diff --git a/src/main/java/choco/panels/DepthPanel.java → ...rg/chocosolver/gui/panels/DepthPanel.java b/src/main/java/choco/panels/DepthPanel.java → ...rg/chocosolver/gui/panels/DepthPanel.java
@@ -24,14 +24,14 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package choco.panels;
+package org.chocosolver.gui.panels;
 
-import choco.GUI;
+import org.chocosolver.gui.GUI;
 import org.jfree.chart.ChartFactory;
 import org.jfree.chart.JFreeChart;
 import org.jfree.data.xy.XYSeries;
 import org.jfree.data.xy.XYSeriesCollection;
-import solver.search.loop.monitors.IMonitorOpenNode;
+import org.chocosolver.solver.search.loop.monitors.IMonitorOpenNode;
 
 import javax.swing.*;
 

diff --git a/...main/java/choco/panels/FreeVarsPanel.java → ...chocosolver/gui/panels/FreeVarsPanel.java b/...main/java/choco/panels/FreeVarsPanel.java → ...chocosolver/gui/panels/FreeVarsPanel.java
@@ -24,14 +24,14 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package choco.panels;
+package org.chocosolver.gui.panels;
 
-import choco.GUI;
+import org.chocosolver.gui.GUI;
 import org.jfree.chart.ChartFactory;
 import org.jfree.chart.JFreeChart;
 import org.jfree.data.xy.XYSeries;
 import org.jfree.data.xy.XYSeriesCollection;
-import solver.search.loop.monitors.IMonitorOpenNode;
+import org.chocosolver.solver.search.loop.monitors.IMonitorOpenNode;
 
 import javax.swing.*;
 

diff --git a/...va/choco/panels/LeftRightBranchPanel.java → ...lver/gui/panels/LeftRightBranchPanel.java b/...va/choco/panels/LeftRightBranchPanel.java → ...lver/gui/panels/LeftRightBranchPanel.java
@@ -24,16 +24,16 @@
  *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package choco.panels;
+package org.chocosolver.gui.panels;
 
-import choco.GUI;
+import org.chocosolver.gui.GUI;
 import org.jfree.chart.ChartFactory;
 import org.jfree.chart.JFreeChart;
 import org.jfree.data.xy.XYSeries;
 import org.jfree.data.xy.XYSeriesCollection;
-import solver.search.loop.monitors.IMonitorDownBranch;
-import solver.search.loop.monitors.IMonitorOpenNode;
-import solver.search.loop.monitors.IMonitorRestart;
+import org.chocosolver.solver.search.loop.monitors.IMonitorDownBranch;
+import org.chocosolver.solver.search.loop.monitors.IMonitorOpenNode;
+import org.chocosolver.solver.search.loop.monitors.IMonitorRestart;
 
 import javax.swing.*;