Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
-
752ec262
by Tony CHEMIT at 2017-10-21T12:44:19+02:00
4 changed files:
- dto/pom.xml
- persistence/pom.xml
- pom.xml
- services/src/main/java/fr/ird/observe/services/service/data/seine/TargetSampleService.java
Changes:
| ... | ... | @@ -149,7 +149,7 @@ |
| 149 | 149 |
<dependencies>
|
| 150 | 150 |
<dependency>
|
| 151 | 151 |
<groupId>fr.ird.observe.toolkit</groupId>
|
| 152 |
- <artifactId>eugene-templates-extension</artifactId>
|
|
| 152 |
+ <artifactId>eugene-templates</artifactId>
|
|
| 153 | 153 |
<version>${observeToolkitVersion}</version>
|
| 154 | 154 |
</dependency>
|
| 155 | 155 |
</dependencies>
|
| ... | ... | @@ -215,13 +215,13 @@ |
| 215 | 215 |
</dependency>
|
| 216 | 216 |
<dependency>
|
| 217 | 217 |
<groupId>fr.ird.observe.toolkit</groupId>
|
| 218 |
- <artifactId>topia-templates-extension</artifactId>
|
|
| 218 |
+ <artifactId>topia-templates</artifactId>
|
|
| 219 | 219 |
<version>${observeToolkitVersion}</version>
|
| 220 | 220 |
<scope>compile</scope>
|
| 221 | 221 |
</dependency>
|
| 222 | 222 |
<dependency>
|
| 223 | 223 |
<groupId>fr.ird.observe.toolkit</groupId>
|
| 224 |
- <artifactId>eugene-templates-extension</artifactId>
|
|
| 224 |
+ <artifactId>eugene-templates</artifactId>
|
|
| 225 | 225 |
<version>${observeToolkitVersion}</version>
|
| 226 | 226 |
</dependency>
|
| 227 | 227 |
</dependencies>
|
| ... | ... | @@ -165,14 +165,14 @@ |
| 165 | 165 |
<httpVersion>1.0.9</httpVersion>
|
| 166 | 166 |
<xworkVersion>2.3.34</xworkVersion>
|
| 167 | 167 |
<flexmarkVersion>0.27.0</flexmarkVersion>
|
| 168 |
- <hibernateVersion>5.2.11.Final</hibernateVersion>
|
|
| 168 |
+ <hibernateVersion>5.2.12.Final</hibernateVersion>
|
|
| 169 | 169 |
<sl4jVersion>1.7.25</sl4jVersion>
|
| 170 | 170 |
<swingXVersion>1.6.5-1</swingXVersion>
|
| 171 | 171 |
<reflectionsVersion>0.9.11</reflectionsVersion>
|
| 172 | 172 |
<webmotionVersion>2.5.3</webmotionVersion>
|
| 173 | 173 |
<httpComponentsVersion>4.5.3</httpComponentsVersion>
|
| 174 | 174 |
<geoToolsVersion>17.2</geoToolsVersion>
|
| 175 |
- <guavaVersion>23.1-jre</guavaVersion>
|
|
| 175 |
+ <guavaVersion>23.2-jre</guavaVersion>
|
|
| 176 | 176 |
|
| 177 | 177 |
<!-- license header configuration -->
|
| 178 | 178 |
<license.licenseName>gpl_v3</license.licenseName>
|
| ... | ... | @@ -205,7 +205,7 @@ |
| 205 | 205 |
<class-mapping.version>1.0.1</class-mapping.version>
|
| 206 | 206 |
<java-lang.version>1.0.3</java-lang.version>
|
| 207 | 207 |
|
| 208 |
- <javassist.version>3.22.0-CR2</javassist.version>
|
|
| 208 |
+ <javassist.version>3.22.0-GA</javassist.version>
|
|
| 209 | 209 |
</properties>
|
| 210 | 210 |
|
| 211 | 211 |
<dependencyManagement>
|
| ... | ... | @@ -274,7 +274,7 @@ |
| 274 | 274 |
<dependency>
|
| 275 | 275 |
<groupId>commons-io</groupId>
|
| 276 | 276 |
<artifactId>commons-io</artifactId>
|
| 277 |
- <version>2.5</version>
|
|
| 277 |
+ <version>2.6</version>
|
|
| 278 | 278 |
</dependency>
|
| 279 | 279 |
<!--We don't use it, but we want to use only one version-->
|
| 280 | 280 |
<dependency>
|
| ... | ... | @@ -314,7 +314,7 @@ |
| 314 | 314 |
<dependency>
|
| 315 | 315 |
<groupId>org.apache.httpcomponents</groupId>
|
| 316 | 316 |
<artifactId>httpcore</artifactId>
|
| 317 |
- <version>4.4.7</version>
|
|
| 317 |
+ <version>4.4.8</version>
|
|
| 318 | 318 |
</dependency>
|
| 319 | 319 |
|
| 320 | 320 |
<dependency>
|
| ... | ... | @@ -625,7 +625,7 @@ |
| 625 | 625 |
<dependency>
|
| 626 | 626 |
<groupId>net.bytebuddy</groupId>
|
| 627 | 627 |
<artifactId>byte-buddy</artifactId>
|
| 628 |
- <version>1.7.5</version>
|
|
| 628 |
+ <version>1.7.6</version>
|
|
| 629 | 629 |
</dependency>
|
| 630 | 630 |
|
| 631 | 631 |
<dependency>
|
| 1 | 1 |
package fr.ird.observe.services.service.data.seine;
|
| 2 | 2 |
|
| 3 |
+/*-
|
|
| 4 |
+ * #%L
|
|
| 5 |
+ * ObServe :: Services API
|
|
| 6 |
+ * %%
|
|
| 7 |
+ * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io
|
|
| 8 |
+ * %%
|
|
| 9 |
+ * This program is free software: you can redistribute it and/or modify
|
|
| 10 |
+ * it under the terms of the GNU General Public License as
|
|
| 11 |
+ * published by the Free Software Foundation, either version 3 of the
|
|
| 12 |
+ * License, or (at your option) any later version.
|
|
| 13 |
+ *
|
|
| 14 |
+ * This program is distributed in the hope that it will be useful,
|
|
| 15 |
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
| 16 |
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
| 17 |
+ * GNU General Public License for more details.
|
|
| 18 |
+ *
|
|
| 19 |
+ * You should have received a copy of the GNU General Public
|
|
| 20 |
+ * License along with this program. If not, see
|
|
| 21 |
+ * <http://www.gnu.org/licenses/gpl-3.0.html>.
|
|
| 22 |
+ * #L%
|
|
| 23 |
+ */
|
|
| 24 |
+ |
|
| 3 | 25 |
import fr.ird.observe.dto.data.seine.TargetLengthDto;
|
| 4 | 26 |
import fr.ird.observe.dto.data.seine.TargetSampleDto;
|
| 5 | 27 |
import fr.ird.observe.dto.reference.ReferentialDtoReferenceSet;
|