Merge branch 'release/3.9.7' into develop

99874fce · PECQUOT · 1ab2ade2 · f12d7bf4 · 99874fce · 99874fce
Commit 99874fce authored Mar 23, 2020 by PECQUOT
9 changed files
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
+## Sprint 89 - v3.9.7
+
+- Pas de mise à jour de modèle
+
+
 ## Sprint 88 - v3.9.5 & v3.9.6

 - Pas de mise à jour de modèle

--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@

  <groupId>fr.ifremer.reefdb</groupId>
  <artifactId>reefdb</artifactId>
-  <version>3.9.7-SNAPSHOT</version>
+  <version>3.9.7</version>
  <packaging>pom</packaging>
  <name>Reef DB</name>


--- a/reefdb-core/pom.xml
+++ b/reefdb-core/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>fr.ifremer.reefdb</groupId>
    <artifactId>reefdb</artifactId>
-    <version>3.9.7-SNAPSHOT</version>
+    <version>3.9.7</version>
  </parent>

  <artifactId>reefdb-core</artifactId>

--- a/reefdb-core/src/license/THIRD-PARTY.properties
+++ b/reefdb-core/src/license/THIRD-PARTY.properties
@@ -35,7 +35,7 @@
 # Please fill the missing licenses for dependencies :
 #
 #
-#Fri Mar 06 16:15:32 CET 2020
+#Mon Mar 23 12:33:10 CET 2020
 com.oracle--ojdbc7--12.1.0.2.0=OTN license
 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0
 dom4j--dom4j--1.6.1=BSD License

--- a/reefdb-ui-swing/pom.xml
+++ b/reefdb-ui-swing/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>fr.ifremer.reefdb</groupId>
    <artifactId>reefdb</artifactId>
-    <version>3.9.7-SNAPSHOT</version>
+    <version>3.9.7</version>
  </parent>

  <artifactId>reefdb-ui-swing</artifactId>

--- a/reefdb-ui-swing/src/main/java/fr/ifremer/reefdb/ui/swing/content/observation/operation/measurement/grouped/OperationMeasurementsGroupedTableUIHandler.java
+++ b/reefdb-ui-swing/src/main/java/fr/ifremer/reefdb/ui/swing/content/observation/operation/measurement/grouped/OperationMeasurementsGroupedTableUIHandler.java
@@ -226,7 +226,6 @@ public class OperationMeasurementsGroupedTableUIHandler
            // remove measurement from old sampling
            if (oldValue != null) {
                SamplingOperationDTO oldSamplingOperation = (SamplingOperationDTO) oldValue;
-                // fixme: il rest edes mesures dans le operation !!!!!!!!!!!!!!
                oldSamplingOperation.removeAllIndividualMeasurements(row.getIndividualMeasurements());
                oldSamplingOperation.setDirty(true);


--- a/reefdb-ui-swing/src/main/java/fr/ifremer/reefdb/ui/swing/util/OneShotListener.java
+++ b/reefdb-ui-swing/src/main/java/fr/ifremer/reefdb/ui/swing/util/OneShotListener.java
 package fr.ifremer.reefdb.ui.swing.util;

+/*-
+ * #%L
+ * Reef DB :: UI
+ * $Id:$
+ * $HeadURL:$
+ * %%
+ * Copyright (C) 2014 - 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.
+ * 
+ * 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/>.
+ * #L%
+ */
+
 import javax.annotation.Nonnull;
 import java.awt.Component;
 import java.beans.PropertyChangeEvent;

--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -31,7 +31,7 @@
  </properties>
  <body>

-    <release version="3.9.7" date="2020-03-19" description="Stable release">
+    <release version="3.9.7" date="2020-03-23" description="Stable release">
      <action dev="ludovic.pecquot@e-is.pro" type="fix" issue="51520">
        Rework the calculation of individual ids on grouped measurements, now use table sorting if possible
      </action>

--- a/src/site/fr/markdown/server.md
+++ b/src/site/fr/markdown/server.md
@@ -108,26 +108,26 @@ Un déploiement sans modification des scripts de Tomcat est possible :

 - Décommenté les parties XML suivantes, et renseigner les attributs XML : ``url``, ``username``, ``password``, ``value`` (``/path/to/config/file``) : 

->   <Resource 
->      name="quadrige3-ds"
->      auth="Container" 
->      type="javax.sql.DataSource" 
->      driverClassName="oracle.jdbc.driver.OracleDriver"
->      url="jdbc:oracle:thin:@HOST:1521:INSTANCE"
->      username="USER" 
->      password="PWD" 
->      maxActive="20" 
->      maxIdle="2" 
->      maxWait="-1" 
->    />
->    
->   <!-- Use to set the configuration file path (default path is: <WAR>/WEB-INF/classes/synchro-server.config) -->
->   <Environment
->    name="synchro-server.config"
->    type="java.lang.String"
->    value="/path/to/config/file"
->    override="false"
->   />
+        <Resource 
+          name="quadrige3-ds"
+          auth="Container" 
+          type="javax.sql.DataSource" 
+          driverClassName="oracle.jdbc.driver.OracleDriver"
+          url="jdbc:oracle:thin:@HOST:1521:INSTANCE"
+          username="USER" 
+          password="PWD" 
+          maxActive="20" 
+          maxIdle="2" 
+          maxWait="-1" 
+        />
+        
+        <!-- Use to set the configuration file path (default path is: <WAR>/WEB-INF/classes/synchro-server.config) -->
+        <Environment
+        name="synchro-server.config"
+        type="java.lang.String"
+        value="/path/to/config/file"
+        override="false"
+        />
  
 - Reconstruire le fichier ``.war``, puis dployer sous Tomcat comme précédemment (sans modifier les scripts de lancement).