Commit 456a7667 authored by LAVENIER's avatar LAVENIER
Browse files

Merge branch 'release/1.8.0' into develop

parents 9eb5de2c 2218f023
......@@ -3,7 +3,7 @@
<groupId>net.sumaris</groupId>
<artifactId>sumaris-pod</artifactId>
<version>1.7.3-SNAPSHOT</version>
<version>1.8.0</version>
<packaging>pom</packaging>
<name>SUMARiS</name>
<description>SUMARiS :: Maven parent</description>
......
......@@ -5,7 +5,7 @@
<parent>
<groupId>net.sumaris</groupId>
<artifactId>sumaris-pod</artifactId>
<version>1.7.3-SNAPSHOT</version>
<version>1.8.0</version>
</parent>
<artifactId>sumaris-core-extraction</artifactId>
......
......@@ -3,7 +3,7 @@
<parent>
<artifactId>sumaris-pod</artifactId>
<groupId>net.sumaris</groupId>
<version>1.7.3-SNAPSHOT</version>
<version>1.8.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -3,7 +3,7 @@
<parent>
<artifactId>sumaris-pod</artifactId>
<groupId>net.sumaris</groupId>
<version>1.7.3-SNAPSHOT</version>
<version>1.8.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -4,7 +4,7 @@
<parent>
<groupId>net.sumaris</groupId>
<artifactId>sumaris-pod</artifactId>
<version>1.7.3-SNAPSHOT</version>
<version>1.8.0</version>
</parent>
<artifactId>sumaris-core-shared</artifactId>
......
package net.sumaris.core.dao.technical.cache;
/*-
* #%L
* SUMARiS:: Core shared
* %%
* Copyright (C) 2018 - 2021 SUMARiS Consortium
* %%
* 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.Maps;
import lombok.NonNull;
import lombok.extern.slf4j.Slf4j;
......@@ -209,4 +231,4 @@ public class Caches {
}
return result;
}
}
\ No newline at end of file
}
......@@ -17,6 +17,8 @@ sumaris.config.option.app.version.description=
sumaris.config.option.attribute.separator.description=
sumaris.config.option.basedir.description=
sumaris.config.option.cache.directory.description=
sumaris.config.option.cli.filter.tripId.description=
sumaris.config.option.cli.filter.year.description=
sumaris.config.option.cli.output.file.description=
sumaris.config.option.cli.output.force.description=
sumaris.config.option.csv.separator.description=
......@@ -115,6 +117,9 @@ sumaris.config.option.synchro.useServer.description=
sumaris.config.option.synchro.zipFile.prefix.description=
sumaris.config.option.timezone.description=
sumaris.config.option.tmp.directory.description=
sumaris.config.option.trip.operation.batch.taxonGroup.enable.description=
sumaris.config.option.trip.operation.batch.taxonGroups.noWeight.description=
sumaris.config.option.trip.operation.batch.taxonName.enable.description=
sumaris.config.option.value.separator.description=
sumaris.config.parse.error=Error while reading configuration
sumaris.persistence.bindingQuery.error=
......
......@@ -17,6 +17,8 @@ sumaris.config.option.app.version.description=
sumaris.config.option.attribute.separator.description=
sumaris.config.option.basedir.description=
sumaris.config.option.cache.directory.description=
sumaris.config.option.cli.filter.tripId.description=
sumaris.config.option.cli.filter.year.description=
sumaris.config.option.cli.output.file.description=
sumaris.config.option.cli.output.force.description=
sumaris.config.option.csv.separator.description=
......@@ -115,6 +117,9 @@ sumaris.config.option.synchro.useServer.description=
sumaris.config.option.synchro.zipFile.prefix.description=
sumaris.config.option.timezone.description=
sumaris.config.option.tmp.directory.description=
sumaris.config.option.trip.operation.batch.taxonGroup.enable.description=
sumaris.config.option.trip.operation.batch.taxonGroups.noWeight.description=
sumaris.config.option.trip.operation.batch.taxonName.enable.description=
sumaris.config.option.value.separator.description=
sumaris.config.parse.error=Erreur lors de la lecture de la ligne de commande
sumaris.persistence.bindingQuery.error=
......
......@@ -4,7 +4,7 @@
<parent>
<groupId>net.sumaris</groupId>
<artifactId>sumaris-pod</artifactId>
<version>1.7.3-SNAPSHOT</version>
<version>1.8.0</version>
</parent>
<artifactId>sumaris-core</artifactId>
......
......@@ -5,6 +5,7 @@ sumaris.action.noOutput.error=Option %s is mandatory for %s
sumaris.action.outputNotADirectory.error=Given output is not a directory\: %s
sumaris.action.outputNotAFile.error=A file with this name already exists\: %s. Please choose another filename, or delete existing file.
sumaris.action.outputNotEmptyDirectory.error=The output directory should be empty\: %s
sumaris.cli.config.actions=
sumaris.config=
sumaris.config.option.admin.email.description=Administrator email (multiple emails if separated by ;)
sumaris.config.option.attribute.separator.description=
......
sumaris-db-enumerations.config=Options de configuration définissant des valeurs dans base de données
sumaris.cli.config.actions=Actions de la ligne de commande (CLI)
sumaris.action.noOutput.error=Option %s est obligatoire pour %s
sumaris.action.outputNotADirectory.error=L'emplacement de sortie n'est pas un répertoire \: %s
sumaris.action.outputNotAFile.error=Un fichier de même nom existe déjà \: %s. Veuillez choisir un autre nom ou supprimer le fichier existant.
sumaris.action.outputNotEmptyDirectory.error=Le répertoire de sortie n'est pas vide \: %s
sumaris.cli.config.actions=Actions de la ligne de commande (CLI)
sumaris.config=Options de configuration disponibles pour l'API Sumaris (cliente et serveur)
sumaris.config.option.admin.email.description=Adresse email du guichet d'assistance (plusieurs adresses possibles si séparées par ;)
sumaris.config.option.attribute.separator.description=Séparateur d'attributs (ex\: Survey.surveyDt) utilisé en base (notamment pour les contrôles et les filtres)
......
......@@ -4,7 +4,7 @@
<parent>
<groupId>net.sumaris</groupId>
<artifactId>sumaris-pod</artifactId>
<version>1.7.3-SNAPSHOT</version>
<version>1.8.0</version>
</parent>
<artifactId>sumaris-server</artifactId>
......
......@@ -7,17 +7,18 @@ package net.sumaris.server.http.security.ldap;
* Copyright (C) 2017 - 2020 Ifremer
* %%
* 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.
* 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 Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* 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%
*/
......
......@@ -7,17 +7,18 @@ package net.sumaris.server.http.security.ldap;
* Copyright (C) 2017 - 2020 Ifremer
* %%
* 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.
* 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 Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* 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%
*/
......
......@@ -35,7 +35,11 @@ sumaris.config.option.spring.activemq.broker-url.description=
sumaris.config.option.spring.activemq.broker-username.description=
sumaris.config.option.spring.activemq.pool.enabled.description=
sumaris.config.option.spring.activemq.prefetch.limit.description=
sumaris.config.option.spring.auth.token.type.description=
sumaris.config.option.spring.mail.enabled.description=
sumaris.config.option.spring.security.basic.enabled.description=
sumaris.config.option.spring.security.ldap.enabled.description=
sumaris.config.option.spring.security.token.enabled.description=
sumaris.config.option.sumaris.app.version.min.description=
sumaris.config.option.sumaris.site.name.description=Name of the instance of the website.
sumaris.config.option.upload.directory.description=
......
......@@ -32,7 +32,11 @@ sumaris.config.option.spring.activemq.broker-url.description=
sumaris.config.option.spring.activemq.broker-username.description=
sumaris.config.option.spring.activemq.pool.enabled.description=
sumaris.config.option.spring.activemq.prefetch.limit.description=
sumaris.config.option.spring.auth.token.type.description=
sumaris.config.option.spring.mail.enabled.description=
sumaris.config.option.spring.security.basic.enabled.description=
sumaris.config.option.spring.security.ldap.enabled.description=
sumaris.config.option.spring.security.token.enabled.description=
sumaris.config.option.sumaris.app.version.min.description=
sumaris.config.option.sumaris.site.name.description=Nom de l'instance du site web.
sumaris.config.option.upload.directory.description=
......
package net.sumaris.server.http.graphql;
/*-
* #%L
* SUMARiS:: Server
* %%
* Copyright (C) 2018 - 2021 SUMARiS Consortium
* %%
* 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.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
......
......@@ -7,17 +7,18 @@ package net.sumaris.server.http.graphql.security;
* Copyright (C) 2017 - 2020 Ifremer
* %%
* 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.
* 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 Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* 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%
*/
......
......@@ -4,7 +4,7 @@
<parent>
<groupId>net.sumaris</groupId>
<artifactId>sumaris-pod</artifactId>
<version>1.7.3-SNAPSHOT</version>
<version>1.8.0</version>
</parent>
<artifactId>sumaris-test-shared</artifactId>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment