Commit 2aa2214f authored by LAVENIER's avatar LAVENIER
Browse files

Merge branch 'release/1.9.0' into develop

parents 2a2ee0b6 cd837d60
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<groupId>net.sumaris</groupId> <groupId>net.sumaris</groupId>
<artifactId>sumaris-pod</artifactId> <artifactId>sumaris-pod</artifactId>
<version>1.8.8-SNAPSHOT</version> <version>1.9.0</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>SUMARiS</name> <name>SUMARiS</name>
<description>SUMARiS :: Maven parent</description> <description>SUMARiS :: Maven parent</description>
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>net.sumaris</groupId> <groupId>net.sumaris</groupId>
<artifactId>sumaris-pod</artifactId> <artifactId>sumaris-pod</artifactId>
<version>1.8.8-SNAPSHOT</version> <version>1.9.0</version>
</parent> </parent>
<artifactId>sumaris-core-extraction</artifactId> <artifactId>sumaris-core-extraction</artifactId>
......
sumaris.config.option.auth.allExtractionTypeAccess.role.description= sumaris.config.option.auth.allExtractionTypeAccess.role.description=
sumaris.config.option.extraction.accessNotSelfExtraction.role.description=
sumaris.config.option.extraction.cli.frequency.description= sumaris.config.option.extraction.cli.frequency.description=
sumaris.config.option.extraction.cli.output.format.description= sumaris.config.option.extraction.cli.output.format.description=
sumaris.config.option.extraction.enabled.description= sumaris.config.option.extraction.enabled.description=
......
sumaris.config.option.auth.allExtractionTypeAccess.role.description= sumaris.config.option.auth.allExtractionTypeAccess.role.description=
sumaris.config.option.extraction.accessNotSelfExtraction.role.description=
sumaris.config.option.extraction.cli.frequency.description= sumaris.config.option.extraction.cli.frequency.description=
sumaris.config.option.extraction.cli.output.format.description= sumaris.config.option.extraction.cli.output.format.description=
sumaris.config.option.extraction.enabled.description= sumaris.config.option.extraction.enabled.description=
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<parent> <parent>
<artifactId>sumaris-pod</artifactId> <artifactId>sumaris-pod</artifactId>
<groupId>net.sumaris</groupId> <groupId>net.sumaris</groupId>
<version>1.8.8-SNAPSHOT</version> <version>1.9.0</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<parent> <parent>
<artifactId>sumaris-pod</artifactId> <artifactId>sumaris-pod</artifactId>
<groupId>net.sumaris</groupId> <groupId>net.sumaris</groupId>
<version>1.8.8-SNAPSHOT</version> <version>1.9.0</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>net.sumaris</groupId> <groupId>net.sumaris</groupId>
<artifactId>sumaris-pod</artifactId> <artifactId>sumaris-pod</artifactId>
<version>1.8.8-SNAPSHOT</version> <version>1.9.0</version>
</parent> </parent>
<artifactId>sumaris-core-shared</artifactId> <artifactId>sumaris-core-shared</artifactId>
......
package net.sumaris.core.dao.technical.jdbc; package net.sumaris.core.dao.technical.jdbc;
/*-
* #%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 java.sql.Connection; import java.sql.Connection;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
import java.sql.SQLException; import java.sql.SQLException;
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>net.sumaris</groupId> <groupId>net.sumaris</groupId>
<artifactId>sumaris-pod</artifactId> <artifactId>sumaris-pod</artifactId>
<version>1.8.8-SNAPSHOT</version> <version>1.9.0</version>
</parent> </parent>
<artifactId>sumaris-core</artifactId> <artifactId>sumaris-core</artifactId>
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>net.sumaris</groupId> <groupId>net.sumaris</groupId>
<artifactId>sumaris-pod</artifactId> <artifactId>sumaris-pod</artifactId>
<version>1.8.8-SNAPSHOT</version> <version>1.9.0</version>
</parent> </parent>
<artifactId>sumaris-server</artifactId> <artifactId>sumaris-server</artifactId>
......
...@@ -7,6 +7,8 @@ sumaris.config.option.auth.notSelfData.role.description= ...@@ -7,6 +7,8 @@ sumaris.config.option.auth.notSelfData.role.description=
sumaris.config.option.auth.notSelfDataAccess.role.description= sumaris.config.option.auth.notSelfDataAccess.role.description=
sumaris.config.option.auth.session.duration= sumaris.config.option.auth.session.duration=
sumaris.config.option.auth.session.duration.description= sumaris.config.option.auth.session.duration.description=
sumaris.config.option.data.accessNotSelfData.department.ids.description=
sumaris.config.option.data.accessNotSelfData.role.description=
sumaris.config.option.download.directory.description= sumaris.config.option.download.directory.description=
sumaris.config.option.favicon.description= sumaris.config.option.favicon.description=
sumaris.config.option.gravatar.enable.description= sumaris.config.option.gravatar.enable.description=
......
...@@ -4,6 +4,8 @@ sumaris.config.option.android.install.url.description= ...@@ -4,6 +4,8 @@ sumaris.config.option.android.install.url.description=
sumaris.config.option.auth.challenge.lifeTime.description= sumaris.config.option.auth.challenge.lifeTime.description=
sumaris.config.option.auth.notSelfDataAccess.role.description=Role minimum pour pouvoir accéder aux données saisies par d'autres sumaris.config.option.auth.notSelfDataAccess.role.description=Role minimum pour pouvoir accéder aux données saisies par d'autres
sumaris.config.option.auth.session.duration.description= sumaris.config.option.auth.session.duration.description=
sumaris.config.option.data.accessNotSelfData.department.ids.description=
sumaris.config.option.data.accessNotSelfData.role.description=
sumaris.config.option.download.directory.description= sumaris.config.option.download.directory.description=
sumaris.config.option.favicon.description= sumaris.config.option.favicon.description=
sumaris.config.option.gravatar.enable.description= sumaris.config.option.gravatar.enable.description=
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>net.sumaris</groupId> <groupId>net.sumaris</groupId>
<artifactId>sumaris-pod</artifactId> <artifactId>sumaris-pod</artifactId>
<version>1.8.8-SNAPSHOT</version> <version>1.9.0</version>
</parent> </parent>
<artifactId>sumaris-test-shared</artifactId> <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