Author: echatellier Date: 2014-02-05 12:00:49 +0100 (Wed, 05 Feb 2014) New Revision: 3883 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3883 Log: Fix licenses Modified: branches/4.0.1/src/license/THIRD-PARTY.properties branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/ContinuousPanel.java Modified: branches/4.0.1/src/license/THIRD-PARTY.properties =================================================================== --- branches/4.0.1/src/license/THIRD-PARTY.properties 2014-02-05 10:46:03 UTC (rev 3882) +++ branches/4.0.1/src/license/THIRD-PARTY.properties 2014-02-05 11:00:49 UTC (rev 3883) @@ -1,23 +1,25 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : -# - ASM License -# - Apache Software License -# - Apache Software License, Version 2.0 +# - Apache License 2.0 # - BSD License # - BSD-style license # - Bouncy Castle License # - CDDL # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Common Development and Distribution License # - Common Public License Version 1.0 +# - Eclipse Public License - v 1.0 # - GNU General Public License - Version 2 with the class path exception +# - GNU General Public License, Version 2 with the Classpath Exception # - GNU Lesser General Public Licence +# - GNU Lesser General Public License, version 2.1 # - GNU Library or Lesser General Public License # - GPL # - GPL (with dual licensing option) +# - GPLv2 # - GPLv2+CE # - Indiana University Extreme! Lab Software License, vesion 1.1.1 -# - Java Transaction API (JTA) License # - LGPL, version 2.1 # - Lesser General Public License (LGPL v. 2.1) # - Lesser General Public License (LGPL) @@ -26,12 +28,12 @@ # - Lesser General Public License (LPGL) v 2.1 # - MIT License # - MPL 1.1 +# - Modified BSD License # - Mozilla Public License # - New BSD License # - OpenMap Software License Agreement # - Revised BSD # - Sequence Library License -# - Sun's Binary Code License # - TMate Open Source License (with dual licensing option) # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 @@ -42,24 +44,12 @@ # Please fill the missing licenses for dependencies : # # -#Mon Mar 11 14:26:22 CET 2013 -antlr--antlr--2.7.6=BSD License -aspectwerkz--aspectwerkz--2.0=GNU Lesser General Public License -aspectwerkz--aspectwerkz-core--2.0=GNU Lesser General Public License -aspectwerkz--aspectwerkz-jdk5--2.0=GNU Lesser General Public License -com.sun--tools--1.6.0.16=Sun's Binary Code License +#Wed Feb 05 11:48:25 CET 2014 commons-jxpath--commons-jxpath--1.3=The Apache Software License, Version 2.0 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License javax.activation--activation--1.1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -javax.transaction--jta--1.1=Java Transaction API (JTA) License -jrexx--jrexx--1.1.1=Apache Software License org.antlr--antlr-runtime--3.4=BSD License org.nuiton.thirdparty--JRI--0.8-4=Lesser General Public License (LGPL v. 2.1) org.nuiton.thirdparty--REngine--0.6-1=Lesser General Public License (LGPL v. 2.1) org.nuiton.thirdparty--Rserve--0.6-1=Lesser General Public License (LGPL v. 2.1) -org.nuiton.thirdparty--asm--1.5.4-snapshot=ASM License -org.nuiton.thirdparty--asm-attrs--1.5.4-snapshot=ASM License -org.nuiton.thirdparty--asm-util--1.5.4-snapshot=ASM License -qdox--qdox--1.4=Apache Software License, Version 2.0 -trove--trove--1.0.2=Lesser General Public License (LGPL) Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/ContinuousPanel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/ContinuousPanel.java 2014-02-05 10:46:03 UTC (rev 3882) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/ContinuousPanel.java 2014-02-05 11:00:49 UTC (rev 3883) @@ -1,25 +1,23 @@ /* * #%L - * - * * $Id$ * $HeadURL$ * %% * Copyright (C) 2012 Codelutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program 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 Lesser Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Lesser Public + * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */