pom: update dependencies

opencb · Mar 25, 2022 · 02531b4 · 02531b4
1 parent fdb1b82
commit 02531b4
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 22 deletions.
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
@@ -55,12 +55,12 @@
     </parent>
 
     <modules>
-        <module>opencga-storage-hadoop-deps-hdp2.6</module>
         <module>opencga-storage-hadoop-deps-hdp3.1</module>
+        <module>opencga-storage-hadoop-deps-emr6.1</module>
+<!--        <module>opencga-storage-hadoop-deps-hdp2.6</module>-->
 <!--        <module>opencga-storage-hadoop-deps-hdp2.5</module>-->
 <!--        <module>opencga-storage-hadoop-deps-emr5.8</module>-->
 <!--        <module>opencga-storage-hadoop-deps-emr5.31</module>-->
-        <module>opencga-storage-hadoop-deps-emr6.1</module>
 <!--        <module>opencga-storage-hadoop-deps-cdh5.13</module>-->
     </modules>
 

diff --git a/opencga-storage/opencga-storage-hadoop/pom.xml b/opencga-storage/opencga-storage-hadoop/pom.xml
@@ -52,23 +52,33 @@
         </profile>
 
         <profile>
-            <id>hdp2.6</id>
+            <id>hdp3.1</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
             <properties>
-                <opencga-storage-hadoop-deps.id>hdp2.6</opencga-storage-hadoop-deps.id>
+                <opencga-storage-hadoop-deps.id>hdp3.1</opencga-storage-hadoop-deps.id>
                 <opencga-storage-hadoop-deps.artifactId>opencga-storage-hadoop-deps-${opencga-storage-hadoop-deps.id}</opencga-storage-hadoop-deps.artifactId>
             </properties>
         </profile>
         <profile>
-            <id>hdp3.1</id>
+            <id>emr6.1</id>
             <properties>
-                <opencga-storage-hadoop-deps.id>hdp3.1</opencga-storage-hadoop-deps.id>
+                <opencga-storage-hadoop-deps.id>emr6.1</opencga-storage-hadoop-deps.id>
                 <opencga-storage-hadoop-deps.artifactId>opencga-storage-hadoop-deps-${opencga-storage-hadoop-deps.id}</opencga-storage-hadoop-deps.artifactId>
             </properties>
         </profile>
         <!--        <profile>-->
+        <!--            <id>hdp2.6</id>-->
+        <!--            <activation>-->
+        <!--                <activeByDefault>true</activeByDefault>-->
+        <!--            </activation>-->
+        <!--            <properties>-->
+        <!--                <opencga-storage-hadoop-deps.id>hdp2.6</opencga-storage-hadoop-deps.id>-->
+        <!--                <opencga-storage-hadoop-deps.artifactId>opencga-storage-hadoop-deps-${opencga-storage-hadoop-deps.id}</opencga-storage-hadoop-deps.artifactId>-->
+        <!--            </properties>-->
+        <!--        </profile>-->
+        <!--        <profile>-->
         <!--            <id>hdp2.5</id>-->
         <!--            <properties>-->
         <!--                <opencga-storage-hadoop-deps.id>hdp2.5</opencga-storage-hadoop-deps.id>-->
@@ -82,20 +92,13 @@
         <!--                <opencga-storage-hadoop-deps.artifactId>opencga-storage-hadoop-deps-${opencga-storage-hadoop-deps.id}</opencga-storage-hadoop-deps.artifactId>-->
         <!--            </properties>-->
         <!--        </profile>-->
-        <profile>
-            <id>emr5.31</id>
-            <properties>
-                <opencga-storage-hadoop-deps.id>emr5.31</opencga-storage-hadoop-deps.id>
-                <opencga-storage-hadoop-deps.artifactId>opencga-storage-hadoop-deps-${opencga-storage-hadoop-deps.id}</opencga-storage-hadoop-deps.artifactId>
-            </properties>
-        </profile>
-        <profile>
-            <id>emr6.1</id>
-            <properties>
-                <opencga-storage-hadoop-deps.id>emr6.1</opencga-storage-hadoop-deps.id>
-                <opencga-storage-hadoop-deps.artifactId>opencga-storage-hadoop-deps-${opencga-storage-hadoop-deps.id}</opencga-storage-hadoop-deps.artifactId>
-            </properties>
-        </profile>
+        <!--        <profile>-->
+        <!--            <id>emr5.31</id>-->
+        <!--            <properties>-->
+        <!--                <opencga-storage-hadoop-deps.id>emr5.31</opencga-storage-hadoop-deps.id>-->
+        <!--                <opencga-storage-hadoop-deps.artifactId>opencga-storage-hadoop-deps-${opencga-storage-hadoop-deps.id}</opencga-storage-hadoop-deps.artifactId>-->
+        <!--            </properties>-->
+        <!--        </profile>-->
         <!--        <profile>-->
         <!--            <id>cdh5.13</id>-->
         <!--            <properties>-->

diff --git a/pom.xml b/pom.xml
@@ -47,8 +47,8 @@
         <pyopencga.version>${opencga.version}</pyopencga.version>
         <iva.version>2.2.0-dev</iva.version>
         <cellbase.version>5.0.2</cellbase.version>
-        <biodata.version>2.2.1</biodata.version>
-        <java-common-libs.version>4.2.1-SNAPSHOT</java-common-libs.version>
+        <biodata.version>2.2.2</biodata.version>
+        <java-common-libs.version>4.2.1</java-common-libs.version>
         <iva.version>2.2.0-dev</iva.version>
         <oskar.version>0.2.0</oskar.version>