Merge pull request #14 from ebocher/fixLicence

Fix licence (same as H2GIS) and update JGRAPHT to 0.9.2

pom.xml

@@ -14,8 +14,8 @@
     <url>http://www.orbisgis.org</url>
     <licenses>
         <license>
-            <name>GNU General Public License (GPLV3+)</name>
-            <url>http://www.gnu.org/licenses/gpl-3.0.html</url>
+            <name>GNU Lesser General Public License (LGPLV3+)</name>
+            <url>http://www.gnu.org/licenses/lgpl-3.0.html</url>
         </license>
     </licenses>
     <developers>
@@ -35,6 +35,8 @@
     </scm>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>1.7</maven.compiler.source>
+        <maven.compiler.target>1.7</maven.compiler.target>
     </properties>
     <parent>
         <groupId>org.orbisgis</groupId>
@@ -52,7 +54,7 @@
         <dependency>
             <groupId>org.jgrapht</groupId>
             <artifactId>jgrapht-core</artifactId>
-            <version>0.9.0</version>
+            <version>0.9.2</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -87,10 +89,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>2.3.2</version>
-                <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                </configuration>
             </plugin>
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>

src/main/java/org/javanetworkanalyzer/alg/BFS.java

@@ -15,22 +15,22 @@
  * Institut Universitaire de Technologie de Vannes
  * 8, Rue Montaigne - BP 561 56017 Vannes Cedex
  * 
- * Java Network Analyzer is distributed under GPL 3 license.
+ * Java Network Analyzer is distributed under LGPL 3 license.
  *
  * Copyright (C) 2012-2014 CNRS (IRSTV CNRS FR 2488)
- * Copyright (C) 2015-2017 CNRS (Lab-STICC CNRS UMR 6285)
+ * Copyright (C) 2015-2018 CNRS (Lab-STICC CNRS UMR 6285)
  *
  * Java Network Analyzer is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by the Free
+ * it under the terms of the GNU Lesser General Public License as published by the Free
  * Software Foundation, either version 3 of the License, or (at your option) any
  * later version.
  *
  * Java Network Analyzer is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
  * details.
  *
- * You should have received a copy of the GNU General Public License along with
+ * You should have received a copy of the GNU Lesser General Public License along with
  * Java Network Analyzer. If not, see <http://www.gnu.org/licenses/>.
  * 
  * For more information, please consult: <http://www.orbisgis.org/>
@@ -49,7 +49,7 @@
 
 /**
  * Root Breadth First Search (BFS) class.
- * <p/>
+ * 
  * The {@link #calculate} method can be overridden in subclasses in order to
  * do graph analysis (e.g., calculating betweenness centrality).
  *

src/main/java/org/javanetworkanalyzer/alg/BFSForCentrality.java

@@ -15,22 +15,22 @@
  * Institut Universitaire de Technologie de Vannes
  * 8, Rue Montaigne - BP 561 56017 Vannes Cedex
  * 
- * Java Network Analyzer is distributed under GPL 3 license.
+ * Java Network Analyzer is distributed under LGPL 3 license.
  *
  * Copyright (C) 2012-2014 CNRS (IRSTV CNRS FR 2488)
- * Copyright (C) 2015-2017 CNRS (Lab-STICC CNRS UMR 6285)
+ * Copyright (C) 2015-2018 CNRS (Lab-STICC CNRS UMR 6285)
  *
  * Java Network Analyzer is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by the Free
+ * it under the terms of the GNU Lesser General Public License as published by the Free
  * Software Foundation, either version 3 of the License, or (at your option) any
  * later version.
  *
  * Java Network Analyzer is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
  * details.
  *
- * You should have received a copy of the GNU General Public License along with
+ * You should have received a copy of the GNU Lesser General Public License along with
  * Java Network Analyzer. If not, see <http://www.gnu.org/licenses/>.
  * 
  * For more information, please consult: <http://www.orbisgis.org/>

src/main/java/org/javanetworkanalyzer/alg/CentralityAlg.java

@@ -15,22 +15,22 @@
  * Institut Universitaire de Technologie de Vannes
  * 8, Rue Montaigne - BP 561 56017 Vannes Cedex
  * 
- * Java Network Analyzer is distributed under GPL 3 license.
+ * Java Network Analyzer is distributed under LGPL 3 license.
  *
  * Copyright (C) 2012-2014 CNRS (IRSTV CNRS FR 2488)
- * Copyright (C) 2015-2017 CNRS (Lab-STICC CNRS UMR 6285)
+ * Copyright (C) 2015-2018 CNRS (Lab-STICC CNRS UMR 6285)
  *
  * Java Network Analyzer is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by the Free
+ * it under the terms of the GNU Lesser General Public License as published by the Free
  * Software Foundation, either version 3 of the License, or (at your option) any
  * later version.
  *
  * Java Network Analyzer is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
  * details.
  *
- * You should have received a copy of the GNU General Public License along with
+ * You should have received a copy of the GNU Lesser General Public License along with
  * Java Network Analyzer. If not, see <http://www.gnu.org/licenses/>.
  * 
  * For more information, please consult: <http://www.orbisgis.org/>

src/main/java/org/javanetworkanalyzer/alg/DFS.java

@@ -15,22 +15,22 @@
  * Institut Universitaire de Technologie de Vannes
  * 8, Rue Montaigne - BP 561 56017 Vannes Cedex
  * 
- * Java Network Analyzer is distributed under GPL 3 license.
+ * Java Network Analyzer is distributed under LGPL 3 license.
  *
  * Copyright (C) 2012-2014 CNRS (IRSTV CNRS FR 2488)
- * Copyright (C) 2015-2017 CNRS (Lab-STICC CNRS UMR 6285)
+ * Copyright (C) 2015-2018 CNRS (Lab-STICC CNRS UMR 6285)
  *
  * Java Network Analyzer is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by the Free
+ * it under the terms of the GNU Lesser General Public License as published by the Free
  * Software Foundation, either version 3 of the License, or (at your option) any
  * later version.
  *
  * Java Network Analyzer is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
  * details.
  *
- * You should have received a copy of the GNU General Public License along with
+ * You should have received a copy of the GNU Lesser General Public License along with
  * Java Network Analyzer. If not, see <http://www.gnu.org/licenses/>.
  * 
  * For more information, please consult: <http://www.orbisgis.org/>

src/main/java/org/javanetworkanalyzer/alg/DFSForStrahler.java

@@ -15,22 +15,22 @@
  * Institut Universitaire de Technologie de Vannes
  * 8, Rue Montaigne - BP 561 56017 Vannes Cedex
  * 
- * Java Network Analyzer is distributed under GPL 3 license.
+ * Java Network Analyzer is distributed under LGPL 3 license.
  *
  * Copyright (C) 2012-2014 CNRS (IRSTV CNRS FR 2488)
- * Copyright (C) 2015-2017 CNRS (Lab-STICC CNRS UMR 6285)
+ * Copyright (C) 2015-2018 CNRS (Lab-STICC CNRS UMR 6285)
  *
  * Java Network Analyzer is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by the Free
+ * it under the terms of the GNU Lesser General Public License as published by the Free
  * Software Foundation, either version 3 of the License, or (at your option) any
  * later version.
  *
  * Java Network Analyzer is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
  * details.
  *
- * You should have received a copy of the GNU General Public License along with
+ * You should have received a copy of the GNU Lesser General Public License along with
  * Java Network Analyzer. If not, see <http://www.gnu.org/licenses/>.
  * 
  * For more information, please consult: <http://www.orbisgis.org/>

src/main/java/org/javanetworkanalyzer/alg/Dijkstra.java

@@ -15,22 +15,22 @@
  * Institut Universitaire de Technologie de Vannes
  * 8, Rue Montaigne - BP 561 56017 Vannes Cedex
  * 
- * Java Network Analyzer is distributed under GPL 3 license.
+ * Java Network Analyzer is distributed under LGPL 3 license.
  *
  * Copyright (C) 2012-2014 CNRS (IRSTV CNRS FR 2488)
- * Copyright (C) 2015-2017 CNRS (Lab-STICC CNRS UMR 6285)
+ * Copyright (C) 2015-2018 CNRS (Lab-STICC CNRS UMR 6285)
  *
  * Java Network Analyzer is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by the Free
+ * it under the terms of the GNU Lesser General Public License as published by the Free
  * Software Foundation, either version 3 of the License, or (at your option) any
  * later version.
  *
  * Java Network Analyzer is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
  * details.
  *
- * You should have received a copy of the GNU General Public License along with
+ * You should have received a copy of the GNU Lesser General Public License along with
  * Java Network Analyzer. If not, see <http://www.gnu.org/licenses/>.
  * 
  * For more information, please consult: <http://www.orbisgis.org/>

src/main/java/org/javanetworkanalyzer/alg/DijkstraForAccessibility.java

@@ -15,22 +15,22 @@
  * Institut Universitaire de Technologie de Vannes
  * 8, Rue Montaigne - BP 561 56017 Vannes Cedex
  * 
- * Java Network Analyzer is distributed under GPL 3 license.
+ * Java Network Analyzer is distributed under LGPL 3 license.
  *
  * Copyright (C) 2012-2014 CNRS (IRSTV CNRS FR 2488)
- * Copyright (C) 2015-2017 CNRS (Lab-STICC CNRS UMR 6285)
+ * Copyright (C) 2015-2018 CNRS (Lab-STICC CNRS UMR 6285)
  *
  * Java Network Analyzer is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by the Free
+ * it under the terms of the GNU Lesser General Public License as published by the Free
  * Software Foundation, either version 3 of the License, or (at your option) any
  * later version.
  *
  * Java Network Analyzer is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
  * details.
  *
- * You should have received a copy of the GNU General Public License along with
+ * You should have received a copy of the GNU Lesser General Public License along with
  * Java Network Analyzer. If not, see <http://www.gnu.org/licenses/>.
  * 
  * For more information, please consult: <http://www.orbisgis.org/>

src/main/java/org/javanetworkanalyzer/alg/DijkstraForCentrality.java

@@ -15,22 +15,22 @@
  * Institut Universitaire de Technologie de Vannes
  * 8, Rue Montaigne - BP 561 56017 Vannes Cedex
  * 
- * Java Network Analyzer is distributed under GPL 3 license.
+ * Java Network Analyzer is distributed under LGPL 3 license.
  *
  * Copyright (C) 2012-2014 CNRS (IRSTV CNRS FR 2488)
- * Copyright (C) 2015-2017 CNRS (Lab-STICC CNRS UMR 6285)
+ * Copyright (C) 2015-2018 CNRS (Lab-STICC CNRS UMR 6285)
  *
  * Java Network Analyzer is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by the Free
+ * it under the terms of the GNU Lesser General Public License as published by the Free
  * Software Foundation, either version 3 of the License, or (at your option) any
  * later version.
  *
  * Java Network Analyzer is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
  * details.
  *
- * You should have received a copy of the GNU General Public License along with
+ * You should have received a copy of the GNU Lesser General Public License along with
  * Java Network Analyzer. If not, see <http://www.gnu.org/licenses/>.
  * 
  * For more information, please consult: <http://www.orbisgis.org/>

src/main/java/org/javanetworkanalyzer/alg/GraphSearchAlgorithm.java

@@ -15,22 +15,22 @@
  * Institut Universitaire de Technologie de Vannes
  * 8, Rue Montaigne - BP 561 56017 Vannes Cedex
  * 
- * Java Network Analyzer is distributed under GPL 3 license.
+ * Java Network Analyzer is distributed under LGPL 3 license.
  *
  * Copyright (C) 2012-2014 CNRS (IRSTV CNRS FR 2488)
- * Copyright (C) 2015-2017 CNRS (Lab-STICC CNRS UMR 6285)
+ * Copyright (C) 2015-2018 CNRS (Lab-STICC CNRS UMR 6285)
  *
  * Java Network Analyzer is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by the Free
+ * it under the terms of the GNU Lesser General Public License as published by the Free
  * Software Foundation, either version 3 of the License, or (at your option) any
  * later version.
  *
  * Java Network Analyzer is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
  * details.
  *
- * You should have received a copy of the GNU General Public License along with
+ * You should have received a copy of the GNU Lesser General Public License along with
  * Java Network Analyzer. If not, see <http://www.gnu.org/licenses/>.
  * 
  * For more information, please consult: <http://www.orbisgis.org/>

src/main/java/org/javanetworkanalyzer/alg/TraversalAlg.java

@@ -15,22 +15,22 @@
  * Institut Universitaire de Technologie de Vannes
  * 8, Rue Montaigne - BP 561 56017 Vannes Cedex
  * 
- * Java Network Analyzer is distributed under GPL 3 license.
+ * Java Network Analyzer is distributed under LGPL 3 license.
  *
  * Copyright (C) 2012-2014 CNRS (IRSTV CNRS FR 2488)
- * Copyright (C) 2015-2017 CNRS (Lab-STICC CNRS UMR 6285)
+ * Copyright (C) 2015-2018 CNRS (Lab-STICC CNRS UMR 6285)
  *
  * Java Network Analyzer is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by the Free
+ * it under the terms of the GNU Lesser General Public License as published by the Free
  * Software Foundation, either version 3 of the License, or (at your option) any
  * later version.
  *
  * Java Network Analyzer is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
  * details.
  *
- * You should have received a copy of the GNU General Public License along with
+ * You should have received a copy of the GNU Lesser General Public License along with
  * Java Network Analyzer. If not, see <http://www.gnu.org/licenses/>.
  * 
  * For more information, please consult: <http://www.orbisgis.org/>

src/main/java/org/javanetworkanalyzer/analyzers/AccessibilityAnalyzer.java

@@ -15,22 +15,22 @@
  * Institut Universitaire de Technologie de Vannes
  * 8, Rue Montaigne - BP 561 56017 Vannes Cedex
  * 
- * Java Network Analyzer is distributed under GPL 3 license.
+ * Java Network Analyzer is distributed under LGPL 3 license.
  *
  * Copyright (C) 2012-2014 CNRS (IRSTV CNRS FR 2488)
- * Copyright (C) 2015-2017 CNRS (Lab-STICC CNRS UMR 6285)
+ * Copyright (C) 2015-2018 CNRS (Lab-STICC CNRS UMR 6285)
  *
  * Java Network Analyzer is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by the Free
+ * it under the terms of the GNU Lesser General Public License as published by the Free
  * Software Foundation, either version 3 of the License, or (at your option) any
  * later version.
  *
  * Java Network Analyzer is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
  * details.
  *
- * You should have received a copy of the GNU General Public License along with
+ * You should have received a copy of the GNU Lesser General Public License along with
  * Java Network Analyzer. If not, see <http://www.gnu.org/licenses/>.
  * 
  * For more information, please consult: <http://www.orbisgis.org/>

src/main/java/org/javanetworkanalyzer/analyzers/GeneralizedGraphAnalyzer.java

@@ -15,22 +15,22 @@
  * Institut Universitaire de Technologie de Vannes
  * 8, Rue Montaigne - BP 561 56017 Vannes Cedex
  * 
- * Java Network Analyzer is distributed under GPL 3 license.
+ * Java Network Analyzer is distributed under LGPL 3 license.
  *
  * Copyright (C) 2012-2014 CNRS (IRSTV CNRS FR 2488)
- * Copyright (C) 2015-2017 CNRS (Lab-STICC CNRS UMR 6285)
+ * Copyright (C) 2015-2018 CNRS (Lab-STICC CNRS UMR 6285)
  *
  * Java Network Analyzer is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by the Free
+ * it under the terms of the GNU Lesser General Public License as published by the Free
  * Software Foundation, either version 3 of the License, or (at your option) any
  * later version.
  *
  * Java Network Analyzer is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
  * details.
  *
- * You should have received a copy of the GNU General Public License along with
+ * You should have received a copy of the GNU Lesser General Public License along with
  * Java Network Analyzer. If not, see <http://www.gnu.org/licenses/>.
  * 
  * For more information, please consult: <http://www.orbisgis.org/>