Merge branch 'release-2.0.0'

opencb · Jun 3, 2021 · 105b6d5 · 105b6d5
2 parents 0058497 + 700de1a
commit 105b6d5
Show file tree

Hide file tree

Showing 26 changed files with 32 additions and 32 deletions.
diff --git a/opencga-analysis/pom.xml b/opencga-analysis/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.opencb.opencga</groupId>
         <artifactId>opencga</artifactId>
-        <version>2.0.3</version>
+        <version>2.0.4</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/opencga-app/pom.xml b/opencga-app/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.opencb.opencga</groupId>
         <artifactId>opencga</artifactId>
-        <version>2.0.3</version>
+        <version>2.0.4</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/opencga-catalog/pom.xml b/opencga-catalog/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.opencb.opencga</groupId>
         <artifactId>opencga</artifactId>
-        <version>2.0.3</version>
+        <version>2.0.4</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/opencga-catalog/src/main/java/org/opencb/opencga/catalog/managers/FamilyManager.java b/opencga-catalog/src/main/java/org/opencb/opencga/catalog/managers/FamilyManager.java
@@ -931,7 +931,7 @@ private OpenCGAResult<Family> update(Study study, Family family, FamilyUpdatePar
 
             if (updateParams != null && ListUtils.isNotEmpty(updateParams.getPhenotypes())) {
                 tmpFamily.setPhenotypes(updateParams.getPhenotypes());
-            } else if (ListUtils.isNotEmpty(updateParams.getMembers())) {
+            } else if (updateParams != null && ListUtils.isNotEmpty(updateParams.getMembers())) {
                 // Recalculate phenotypes if list of members has changed
                 tmpFamily.setPhenotypes(Collections.emptyList());
                 parameters.put(FamilyDBAdaptor.QueryParams.PHENOTYPES.key(), tmpFamily.getPhenotypes());
@@ -940,7 +940,7 @@ private OpenCGAResult<Family> update(Study study, Family family, FamilyUpdatePar
             }
             if (updateParams != null && ListUtils.isNotEmpty(updateParams.getDisorders())) {
                 tmpFamily.setDisorders(updateParams.getDisorders());
-            } else if (ListUtils.isNotEmpty(updateParams.getMembers())) {
+            } else if (updateParams != null && ListUtils.isNotEmpty(updateParams.getMembers())) {
                 // Recalculate disorders if list of members has changed
                 tmpFamily.setDisorders(Collections.emptyList());
                 parameters.put(FamilyDBAdaptor.QueryParams.DISORDERS.key(), tmpFamily.getDisorders());

diff --git a/opencga-client/pom.xml b/opencga-client/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.opencb.opencga</groupId>
         <artifactId>opencga</artifactId>
-        <version>2.0.3</version>
+        <version>2.0.4</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/opencga-core/pom.xml b/opencga-core/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.opencb.opencga</groupId>
         <artifactId>opencga</artifactId>
-        <version>2.0.3</version>
+        <version>2.0.4</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/opencga-master/pom.xml b/opencga-master/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>opencga</artifactId>
         <groupId>org.opencb.opencga</groupId>
-        <version>2.0.3</version>
+        <version>2.0.4</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/opencga-server/pom.xml b/opencga-server/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.opencb.opencga</groupId>
         <artifactId>opencga</artifactId>
-        <version>2.0.3</version>
+        <version>2.0.4</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/opencga-storage/opencga-storage-app/pom.xml b/opencga-storage/opencga-storage-app/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.opencb.opencga</groupId>
         <artifactId>opencga-storage</artifactId>
-        <version>2.0.3</version>
+        <version>2.0.4</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/opencga-storage/opencga-storage-benchmark/pom.xml b/opencga-storage/opencga-storage-benchmark/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>opencga-storage</artifactId>
         <groupId>org.opencb.opencga</groupId>
-        <version>2.0.3</version>
+        <version>2.0.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/opencga-storage/opencga-storage-core/pom.xml b/opencga-storage/opencga-storage-core/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.opencb.opencga</groupId>
         <artifactId>opencga-storage</artifactId>
-        <version>2.0.3</version>
+        <version>2.0.4</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-core/pom.xml b/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-core/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.opencb.opencga</groupId>
         <artifactId>opencga-storage-hadoop</artifactId>
-        <version>2.0.3</version>
+        <version>2.0.4</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/...ga-storage-hadoop/opencga-storage-hadoop-deps/opencga-storage-hadoop-deps-cdh5.13/pom.xml b/...ga-storage-hadoop/opencga-storage-hadoop-deps/opencga-storage-hadoop-deps-cdh5.13/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.opencb.opencga</groupId>
         <artifactId>opencga-storage-hadoop-deps</artifactId>
-        <version>2.0.3</version>
+        <version>2.0.4</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/...ga-storage-hadoop/opencga-storage-hadoop-deps/opencga-storage-hadoop-deps-emr5.31/pom.xml b/...ga-storage-hadoop/opencga-storage-hadoop-deps/opencga-storage-hadoop-deps-emr5.31/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.opencb.opencga</groupId>
         <artifactId>opencga-storage-hadoop-deps</artifactId>
-        <version>2.0.3</version>
+        <version>2.0.4</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/...cga-storage-hadoop/opencga-storage-hadoop-deps/opencga-storage-hadoop-deps-emr5.8/pom.xml b/...cga-storage-hadoop/opencga-storage-hadoop-deps/opencga-storage-hadoop-deps-emr5.8/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.opencb.opencga</groupId>
         <artifactId>opencga-storage-hadoop-deps</artifactId>
-        <version>2.0.3</version>
+        <version>2.0.4</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/...cga-storage-hadoop/opencga-storage-hadoop-deps/opencga-storage-hadoop-deps-emr6.1/pom.xml b/...cga-storage-hadoop/opencga-storage-hadoop-deps/opencga-storage-hadoop-deps-emr6.1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.opencb.opencga</groupId>
         <artifactId>opencga-storage-hadoop-deps</artifactId>
-        <version>2.0.3</version>
+        <version>2.0.4</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/...cga-storage-hadoop/opencga-storage-hadoop-deps/opencga-storage-hadoop-deps-hdp2.5/pom.xml b/...cga-storage-hadoop/opencga-storage-hadoop-deps/opencga-storage-hadoop-deps-hdp2.5/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.opencb.opencga</groupId>
         <artifactId>opencga-storage-hadoop-deps</artifactId>
-        <version>2.0.3</version>
+        <version>2.0.4</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/...cga-storage-hadoop/opencga-storage-hadoop-deps/opencga-storage-hadoop-deps-hdp2.6/pom.xml b/...cga-storage-hadoop/opencga-storage-hadoop-deps/opencga-storage-hadoop-deps-hdp2.6/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.opencb.opencga</groupId>
         <artifactId>opencga-storage-hadoop-deps</artifactId>
-        <version>2.0.3</version>
+        <version>2.0.4</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/...cga-storage-hadoop/opencga-storage-hadoop-deps/opencga-storage-hadoop-deps-hdp3.1/pom.xml b/...cga-storage-hadoop/opencga-storage-hadoop-deps/opencga-storage-hadoop-deps-hdp3.1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.opencb.opencga</groupId>
         <artifactId>opencga-storage-hadoop-deps</artifactId>
-        <version>2.0.3</version>
+        <version>2.0.4</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-deps/pom.xml b/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-deps/pom.xml
@@ -50,7 +50,7 @@
     <parent>
         <groupId>org.opencb.opencga</groupId>
         <artifactId>opencga-storage-hadoop</artifactId>
-        <version>2.0.3</version>
+        <version>2.0.4</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -66,7 +66,7 @@
 
     <!--<groupId>org.opencb.opencga</groupId>-->
     <artifactId>opencga-storage-hadoop-deps</artifactId>
-    <version>2.0.3</version>
+    <version>2.0.4</version>
 
     <packaging>pom</packaging>
 

diff --git a/opencga-storage/opencga-storage-hadoop/pom.xml b/opencga-storage/opencga-storage-hadoop/pom.xml
@@ -30,12 +30,12 @@
     <parent>
         <groupId>org.opencb.opencga</groupId>
         <artifactId>opencga-storage</artifactId>
-        <version>2.0.3</version>
+        <version>2.0.4</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>opencga-storage-hadoop</artifactId>
-    <version>2.0.3</version>
+    <version>2.0.4</version>
     <packaging>pom</packaging>
 
     <modules>

diff --git a/opencga-storage/opencga-storage-mongodb/pom.xml b/opencga-storage/opencga-storage-mongodb/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.opencb.opencga</groupId>
         <artifactId>opencga-storage</artifactId>
-        <version>2.0.3</version>
+        <version>2.0.4</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/opencga-storage/opencga-storage-server/pom.xml b/opencga-storage/opencga-storage-server/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.opencb.opencga</groupId>
         <artifactId>opencga-storage</artifactId>
-        <version>2.0.3</version>
+        <version>2.0.4</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/opencga-storage/pom.xml b/opencga-storage/pom.xml
@@ -22,13 +22,13 @@
     <parent>
         <groupId>org.opencb.opencga</groupId>
         <artifactId>opencga</artifactId>
-        <version>2.0.3</version>
+        <version>2.0.4</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <!-- Version must be set to a literal, variables cannot be used in nested modules -->
     <artifactId>opencga-storage</artifactId>
-    <version>2.0.3</version>
+    <version>2.0.4</version>
     <packaging>pom</packaging>
 
     <properties>

diff --git a/opencga-test/pom.xml b/opencga-test/pom.xml
@@ -24,7 +24,7 @@
 
     <groupId>org.opencb.opencga</groupId>
     <artifactId>opencga-test</artifactId>
-    <version>2.0.3</version>
+    <version>2.0.4</version>
     <packaging>pom</packaging>
 
     <dependencies>

diff --git a/pom.xml b/pom.xml
@@ -22,7 +22,7 @@
 
     <groupId>org.opencb.opencga</groupId>
     <artifactId>opencga</artifactId>
-    <version>2.0.3</version>
+    <version>2.0.4</version>
     <packaging>pom</packaging>
 
     <name>OpenCGA</name>
@@ -41,8 +41,8 @@
     </modules>
 
     <properties>
-        <opencga.version>2.0.3</opencga.version>
-        <pyopencga.version>2.0.3</pyopencga.version>
+        <opencga.version>2.0.4</opencga.version>
+        <pyopencga.version>2.0.4</pyopencga.version>
         <iva.version>2.1.0-beta</iva.version>
         <cellbase.version>4.8.0</cellbase.version>
         <biodata.version>2.0.5</biodata.version>