Merge branch 'release/2.0.2'

sumaris-net · Feb 24, 2023 · 55e3b4b · 55e3b4b
2 parents 367e5e5 + cdf5f10
commit 55e3b4b
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 10 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 
   <groupId>net.sumaris</groupId>
   <artifactId>sumaris-pod</artifactId>
-  <version>2.0.1</version>
+  <version>2.0.2</version>
   <packaging>pom</packaging>
   <name>SUMARiS</name>
   <description>SUMARiS :: Maven parent</description>

diff --git a/sumaris-core-shared/pom.xml b/sumaris-core-shared/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sumaris</groupId>
     <artifactId>sumaris-pod</artifactId>
-    <version>2.0.1</version>
+    <version>2.0.2</version>
   </parent>
 
   <artifactId>sumaris-core-shared</artifactId>

diff --git a/sumaris-core/pom.xml b/sumaris-core/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sumaris</groupId>
     <artifactId>sumaris-pod</artifactId>
-    <version>2.0.1</version>
+    <version>2.0.2</version>
   </parent>
 
   <artifactId>sumaris-core</artifactId>

diff --git a/sumaris-extraction/pom.xml b/sumaris-extraction/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>net.sumaris</groupId>
 		<artifactId>sumaris-pod</artifactId>
-		<version>2.0.1</version>
+		<version>2.0.2</version>
 	</parent>
 
 	<artifactId>sumaris-extraction</artifactId>

diff --git a/sumaris-extraction/src/main/resources/xmlQuery/pmfmTrip/v1_0/injectionSpeciesLengthTable.xml b/sumaris-extraction/src/main/resources/xmlQuery/pmfmTrip/v1_0/injectionSpeciesLengthTable.xml
@@ -27,7 +27,7 @@
 
   <!-- reinsert last RDB fields, but after SEX -->
   <select alias="LENGTH_CLASS" type="number">B.LENGTH_CLASS</select>
-  <select alias="NUMBER_AT_LENGTH" type="number">SUM(B.INDIVIDUAL_COUNT)</select>
+  <select alias="NUMBER_AT_LENGTH" type="number">SUM(B.INDIVIDUAL_COUNT) / COUNT(DISTINCT SM.ID)</select>
 
   <from join="true" group="pmfms">INNER JOIN SORTING_MEASUREMENT_B SM ON SM.BATCH_FK = B.ID</from>
   <from join="true" group="pmfms">LEFT OUTER JOIN QUALITATIVE_VALUE QV ON QV.ID = SM.QUALITATIVE_VALUE_FK</from>

diff --git a/sumaris-importation/pom.xml b/sumaris-importation/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>sumaris-pod</artifactId>
     <groupId>net.sumaris</groupId>
-    <version>2.0.1</version>
+    <version>2.0.2</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/sumaris-rdf/pom.xml b/sumaris-rdf/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>sumaris-pod</artifactId>
         <groupId>net.sumaris</groupId>
-        <version>2.0.1</version>
+        <version>2.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sumaris-server/pom.xml b/sumaris-server/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sumaris</groupId>
     <artifactId>sumaris-pod</artifactId>
-    <version>2.0.1</version>
+    <version>2.0.2</version>
   </parent>
 
   <artifactId>sumaris-server</artifactId>

diff --git a/sumaris-test-shared/pom.xml b/sumaris-test-shared/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sumaris</groupId>
     <artifactId>sumaris-pod</artifactId>
-    <version>2.0.1</version>
+    <version>2.0.2</version>
   </parent>
 
   <artifactId>sumaris-test-shared</artifactId>

diff --git a/sumaris-test-shared/src/main/resources/data-hsqldb-02-program-ACOST.xml b/sumaris-test-shared/src/main/resources/data-hsqldb-02-program-ACOST.xml
@@ -39,7 +39,7 @@
 
   <PROGRAM_PROPERTY ID="80" STATUS_FK="1" PROGRAM_FK="50" CREATION_DATE="2019-02-11"  LABEL="sumaris.trip.location.filter.searchText.minLength" NAME="2"/>
   <PROGRAM_PROPERTY ID="81" STATUS_FK="1" PROGRAM_FK="50" CREATION_DATE="2019-02-11"  LABEL="sumaris.trip.sale.enable" NAME="true"/>
-  <PROGRAM_PROPERTY ID="82" STATUS_FK="1" PROGRAM_FK="50" CREATION_DATE="2019-02-11"  LABEL="sumaris.trip.observers.enable" NAME="true"/>
+  <PROGRAM_PROPERTY ID="82" STATUS_FK="1" PROGRAM_FK="50" CREATION_DATE="2019-02-11"  LABEL="sumaris.trip.observers.enable" NAME="false"/>
   <PROGRAM_PROPERTY ID="83" STATUS_FK="1" PROGRAM_FK="50" CREATION_DATE="2019-02-11"  LABEL="sumaris.trip.metiers.enable" NAME="false"/>
   <PROGRAM_PROPERTY ID="84" STATUS_FK="1" PROGRAM_FK="50" CREATION_DATE="2019-02-11"  LABEL="sumaris.trip.gear.rankOrder.enable" NAME="true"/>
   <PROGRAM_PROPERTY ID="85" STATUS_FK="1" PROGRAM_FK="50" CREATION_DATE="2019-02-11"  LABEL="sumaris.trip.map.enable" NAME="true"/>