Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 94df9191 by Tony CHEMIT at 2018-12-10T15:56:11Z [jgitflow-maven-plugin]updating poms for branch'release/8.0-alpha-4' with non-snapshot versions[skip ci] - - - - - 929b221b by Tony CHEMIT at 2018-12-10T16:06:19Z release merge - - - - - 176e29ef by Tony CHEMIT at 2018-12-10T16:06:54Z [jgitflow-maven-plugin]merging 'release/8.0-alpha-4' into 'master' - - - - - ecce5753 by Tony CHEMIT at 2018-12-10T16:06:57Z [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 32729bda by Tony CHEMIT at 2018-12-10T16:06:58Z [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - a1b62511 by Tony CHEMIT at 2018-12-10T16:06:59Z [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 6 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/ReferenceHomeCommonUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/ReferenceHomeLonglineCommonUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/landing/ReferenceHomeLonglineLandingUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/obs/ReferenceHomeLonglineObsUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/ReferenceHomeSeineCommonUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/obs/ReferenceHomeSeineObsUIModel.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/ReferenceHomeCommonUIModel.java ===================================== @@ -1,5 +1,27 @@ package fr.ird.observe.client.ui.content.ref.common; +/*- + * #%L + * ObServe :: Client core + * %% + * Copyright (C) 2008 - 2018 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.client.ui.content.api.ref.ReferenceHomeUIModel; import fr.ird.observe.spi.DtoModelClasses; ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/ReferenceHomeLonglineCommonUIModel.java ===================================== @@ -1,5 +1,27 @@ package fr.ird.observe.client.ui.content.ref.longline; +/*- + * #%L + * ObServe :: Client core + * %% + * Copyright (C) 2008 - 2018 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.client.ui.content.api.ref.ReferenceHomeUIModel; import fr.ird.observe.spi.DtoModelClasses; ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/landing/ReferenceHomeLonglineLandingUIModel.java ===================================== @@ -1,5 +1,27 @@ package fr.ird.observe.client.ui.content.ref.longline.landing; +/*- + * #%L + * ObServe :: Client core + * %% + * Copyright (C) 2008 - 2018 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.client.ui.content.api.ref.ReferenceHomeUIModel; import fr.ird.observe.spi.DtoModelClasses; ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/obs/ReferenceHomeLonglineObsUIModel.java ===================================== @@ -1,5 +1,27 @@ package fr.ird.observe.client.ui.content.ref.longline.obs; +/*- + * #%L + * ObServe :: Client core + * %% + * Copyright (C) 2008 - 2018 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.client.ui.content.api.ref.ReferenceHomeUIModel; import fr.ird.observe.spi.DtoModelClasses; ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/ReferenceHomeSeineCommonUIModel.java ===================================== @@ -1,5 +1,27 @@ package fr.ird.observe.client.ui.content.ref.seine; +/*- + * #%L + * ObServe :: Client core + * %% + * Copyright (C) 2008 - 2018 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.client.ui.content.api.ref.ReferenceHomeUIModel; import fr.ird.observe.spi.DtoModelClasses; ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/obs/ReferenceHomeSeineObsUIModel.java ===================================== @@ -1,5 +1,27 @@ package fr.ird.observe.client.ui.content.ref.seine.obs; +/*- + * #%L + * ObServe :: Client core + * %% + * Copyright (C) 2008 - 2018 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.client.ui.content.api.ref.ReferenceHomeUIModel; import fr.ird.observe.spi.DtoModelClasses; View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/b7251858d879e88f5ed5c565cf1... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/b7251858d879e88f5ed5c565cf1... You're receiving this email because of your account on gitlab.com.