Commit 73e51bc1 authored by PECQUOT's avatar PECQUOT
Browse files

Merge branch 'release/3.6.0' into develop

parents 55bdddfc d5b91f7c
......@@ -10,7 +10,7 @@
<groupId>fr.ifremer.reefdb</groupId>
<artifactId>reefdb</artifactId>
<version>3.6.1-SNAPSHOT</version>
<version>3.6.0</version>
<packaging>pom</packaging>
<name>Reef DB</name>
......
......@@ -4,7 +4,7 @@
<parent>
<groupId>fr.ifremer.reefdb</groupId>
<artifactId>reefdb</artifactId>
<version>3.6.1-SNAPSHOT</version>
<version>3.6.0</version>
</parent>
<artifactId>reefdb-core</artifactId>
......
......@@ -3,8 +3,6 @@ package fr.ifremer.reefdb.service.extraction;
/*-
* #%L
* Reef DB :: Core
$Id:$
$HeadURL:$
* %%
* Copyright (C) 2014 - 2019 Ifremer
* %%
......
......@@ -3,8 +3,6 @@ package fr.ifremer.reefdb.service.extraction;
/*-
* #%L
* Reef DB :: Core
$Id:$
$HeadURL:$
* %%
* Copyright (C) 2014 - 2019 Ifremer
* %%
......@@ -108,7 +106,7 @@ public class ExtractionPerformServiceImpl implements ExtractionPerformService {
if (LOG.isInfoEnabled()) {
LOG.info(String.format("Beginning a %s extraction (id=%s) with:", outputType, extraction.getId()));
LOG.info(String.format("\t date ranges: %s", ReefDbBeans.toString(getPeriodFilter(extraction).getElements())));
LOG.info(String.format("\tgéo grouping: %s", ReefDbBeans.getFilterElementsIds(extraction, ExtractionFilterValues.ORDER_ITEM_TYPE)));
LOG.info(String.format("\tgo grouping: %s", ReefDbBeans.getFilterElementsIds(extraction, ExtractionFilterValues.ORDER_ITEM_TYPE)));
LOG.info(String.format("\t programs: %s", ReefDbBeans.getFilterElementsIds(extraction, ExtractionFilterValues.PROGRAM)));
LOG.info(String.format("\t locations: %s", ReefDbBeans.getFilterElementsIds(extraction, ExtractionFilterValues.LOCATION)));
LOG.info(String.format("\t departments: %s", ReefDbBeans.getFilterElementsIds(extraction, ExtractionFilterValues.DEPARTMENT)));
......
......@@ -4,7 +4,7 @@
<parent>
<groupId>fr.ifremer.reefdb</groupId>
<artifactId>reefdb</artifactId>
<version>3.6.1-SNAPSHOT</version>
<version>3.6.0</version>
</parent>
<artifactId>reefdb-ui-swing</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