Author: tchemit Date: 2014-04-22 22:59:06 +0200 (Tue, 22 Apr 2014) New Revision: 1021 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/1021 Log: prepare release Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_6_1.java trunk/echobase-domain/src/main/resources/migration/postgis-structure-2.6.1.sql trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/SpeciesExportRow.java trunk/echobase-ui/src/license/THIRD-PARTY.properties trunk/pom.xml Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_6_1.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_6_1.java 2014-04-22 20:48:57 UTC (rev 1020) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_6_1.java 2014-04-22 20:59:06 UTC (rev 1021) @@ -1,5 +1,26 @@ package fr.ifremer.echobase.persistence.migration.workingDb; +/* + * #%L + * EchoBase :: Domain + * %% + * Copyright (C) 2011 - 2014 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero 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 Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import fr.ifremer.echobase.entities.EchoBaseUserTopiaPersistenceContext; import fr.ifremer.echobase.io.EchoBaseIOUtil; import org.nuiton.topia.persistence.TopiaException; Modified: trunk/echobase-domain/src/main/resources/migration/postgis-structure-2.6.1.sql =================================================================== --- trunk/echobase-domain/src/main/resources/migration/postgis-structure-2.6.1.sql 2014-04-22 20:48:57 UTC (rev 1020) +++ trunk/echobase-domain/src/main/resources/migration/postgis-structure-2.6.1.sql 2014-04-22 20:59:06 UTC (rev 1021) @@ -1,3 +1,23 @@ +--- +-- #%L +-- EchoBase :: Domain +-- %% +-- Copyright (C) 2011 - 2014 Ifremer, Codelutin +-- %% +-- This program is free software: you can redistribute it and/or modify +-- it under the terms of the GNU Affero 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 Public License for more details. +-- +-- You should have received a copy of the GNU Affero General Public License +-- along with this program. If not, see <http://www.gnu.org/licenses/>. +-- #L% +--- -- -- echobase_delete_voyage trigger -- Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/SpeciesExportRow.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/SpeciesExportRow.java 2014-04-22 20:48:57 UTC (rev 1020) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/SpeciesExportRow.java 2014-04-22 20:59:06 UTC (rev 1021) @@ -1,5 +1,26 @@ package fr.ifremer.echobase.services.service.exportCoser; +/* + * #%L + * EchoBase :: Services + * %% + * Copyright (C) 2011 - 2014 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero 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 Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import fr.ifremer.echobase.entities.references.Species; /** Modified: trunk/echobase-ui/src/license/THIRD-PARTY.properties =================================================================== --- trunk/echobase-ui/src/license/THIRD-PARTY.properties 2014-04-22 20:48:57 UTC (rev 1020) +++ trunk/echobase-ui/src/license/THIRD-PARTY.properties 2014-04-22 20:59:06 UTC (rev 1021) @@ -1,21 +1,26 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : +# - AL 2.0 # - Affero General Public License (AGPL) # - Apache License 2.0 +# - Apache License, version 2.0 # - Apache Software License - Version 2.0 # - BSD License # - BSD-style license -# - CDDL + GPLv2 with classpath exception -# - CDDL/GPLv2+CE +# - CDDL # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Development and Distribution License # - Common Public License Version 1.0 +# - Eclipse Distribution License (EDL), Version 1.0 +# - Eclipse Public License (EPL), Version 1.0 # - Eclipse Public License - Version 1.0 +# - GNU Affero General Public License v3 # - GNU General Public License, Version 2 with the Classpath Exception -# - GNU Lesser General Public License, version 2.1 +# - GNU Lesser General Public Licence +# - GNU Lesser General Public License (LGPL), version 2.1 # - GNU Library or Lesser General Public License -# - General Public License (GPL) +# - GPLv2+CE # - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - Lesser General Public License (LGPL) v 3.0 # - Lesser General Public License (LPGL) @@ -23,16 +28,15 @@ # - MIT License # - MPL 1.1 # - New BSD License +# - Public Domain # - The Apache Software License, Version 1.1 # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 -# - license.txt #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Sun Dec 29 16:57:17 CET 2013 +#Tue Apr 22 22:57:39 CEST 2014 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License -javassist--javassist--3.11.0.GA=The Apache Software License, Version 2.0 oro--oro--2.0.8=The Apache Software License, Version 2.0 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-04-22 20:48:57 UTC (rev 1020) +++ trunk/pom.xml 2014-04-22 20:59:06 UTC (rev 1021) @@ -138,7 +138,7 @@ <!-- libraries version --> - <topiaVersion>3.0-SNAPSHOT</topiaVersion> + <topiaVersion>3.0-beta-3</topiaVersion> <nuitonUtilsVersion>3.0-rc-2</nuitonUtilsVersion> <nuitonI18nVersion>3.0</nuitonI18nVersion> <nuitonWebVersion>1.16</nuitonWebVersion>