Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: ec066c75 by Tony CHEMIT at 2017-09-04T00:42:45+02:00 optimize dependencies - - - - - 7 changed files: - dto/pom.xml - dto/src/main/java/fr/ird/observe/spi/DtoModelClasses.java - persistence/pom.xml - persistence/src/main/resources/db/migration/6.901/09_fill_object_material-common.sql - persistence/src/test/java/fr/ird/observe/spi/DbModelHelperTest.java - services-client/pom.xml - services-client/src/license/THIRD-PARTY.properties Changes: ===================================== dto/pom.xml ===================================== --- a/dto/pom.xml +++ b/dto/pom.xml @@ -62,6 +62,7 @@ <dependency> <groupId>io.ultreia.java4all.http</groupId> <artifactId>http-api</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>io.ultreia.java4all.i18n</groupId> ===================================== dto/src/main/java/fr/ird/observe/spi/DtoModelClasses.java ===================================== --- a/dto/src/main/java/fr/ird/observe/spi/DtoModelClasses.java +++ b/dto/src/main/java/fr/ird/observe/spi/DtoModelClasses.java @@ -1,5 +1,27 @@ package fr.ird.observe.spi; +/*- + * #%L + * ObServe :: Dto + * %% + * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io + * %% + * This program 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 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.google.common.collect.ImmutableSet; import fr.ird.observe.dto.data.DataDto; import fr.ird.observe.dto.data.longline.ActivityLonglineDto; ===================================== persistence/pom.xml ===================================== --- a/persistence/pom.xml +++ b/persistence/pom.xml @@ -84,6 +84,7 @@ <dependency> <groupId>io.ultreia.java4all.http</groupId> <artifactId>http-api</artifactId> + <scope>provided</scope> </dependency> <!-- commons --> ===================================== persistence/src/main/resources/db/migration/6.901/09_fill_object_material-common.sql ===================================== --- a/persistence/src/main/resources/db/migration/6.901/09_fill_object_material-common.sql +++ b/persistence/src/main/resources/db/migration/6.901/09_fill_object_material-common.sql @@ -1,3 +1,24 @@ +--- +-- #%L +-- ObServe :: Persistence +-- %% +-- Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io +-- %% +-- This program 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 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 General Public +-- License along with this program. If not, see +-- <http://www.gnu.org/licenses/gpl-3.0.html>. +-- #L% +--- INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.1' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , 'FAD' , '1' , NULL , 'FAD' , 'FAD' , 'FAD' , false, false, false, NULL , NULL , false, false); INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.2' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '16' , 'DFAD' , '1-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.1' , 'DFAD (drifting FAD)' , 'DFAD (FAD dérivant)' , 'DFAD (FAD a la deriva)' , true , true , false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.3' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 0, '19' , NULL , '1-1-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.2' , 'Experimental FAD' , 'Objet expérimental' , 'Objeto experimental' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); ===================================== persistence/src/test/java/fr/ird/observe/spi/DbModelHelperTest.java ===================================== --- a/persistence/src/test/java/fr/ird/observe/spi/DbModelHelperTest.java +++ b/persistence/src/test/java/fr/ird/observe/spi/DbModelHelperTest.java @@ -1,5 +1,27 @@ package fr.ird.observe.spi; +/*- + * #%L + * ObServe :: Persistence + * %% + * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io + * %% + * This program 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 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ird.observe.binder.data.DataDtoReferenceBinderSupport; import fr.ird.observe.binder.referential.ReferentialDtoReferenceBinderSupport; import fr.ird.observe.dto.data.DataDto; ===================================== services-client/pom.xml ===================================== --- a/services-client/pom.xml +++ b/services-client/pom.xml @@ -62,10 +62,6 @@ </dependency> <dependency> <groupId>fr.ird.observe.toolkit</groupId> - <artifactId>common-db</artifactId> - </dependency> - <dependency> - <groupId>fr.ird.observe.toolkit</groupId> <artifactId>common-service</artifactId> </dependency> ===================================== services-client/src/license/THIRD-PARTY.properties ===================================== --- a/services-client/src/license/THIRD-PARTY.properties +++ b/services-client/src/license/THIRD-PARTY.properties @@ -2,26 +2,22 @@ #------------------------------------------------------------------------------- # Already used licenses in project : # - Apache 2.0 -# - Apache License 2.0 # - BSD License # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Eclipse Public License 1.0 -# - GNU Lesser Public License # - General Public License (GPL) -# - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - Indiana University Extreme! Lab Software License, version 1.1.1 # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 # - Lesser General Public License (LPGL) # - Lesser General Public License (LPGL) v 2.1 # - MIT License -# - MPL 1.1 # - New BSD License # - The Apache Software License, Version 2.0 -# - The New BSD License -# - WTFPL +# - The MIT License #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Thu Sep 01 11:23:55 CEST 2016 +#Mon Sep 04 00:38:17 CEST 2017 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/ec066c75c39c2f03a7d3d08e1b47... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/ec066c75c39c2f03a7d3d08e1b47... You're receiving this email because of your account on gitlab.com.
participants (1)
-
Tony CHEMIT