Merge branch 'release-3.x.x'

opencb · Jan 27, 2025 · 0e23c6a · 0e23c6a
2 parents b230cb1 + 7d3f136
commit 0e23c6a
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 6 deletions.
diff --git a/.github/workflows/pull-request-approved.yml b/.github/workflows/pull-request-approved.yml
@@ -7,6 +7,7 @@ on:
 
 jobs:
   calculate-xetabase-branch:
+    if: github.event.review.state == 'approved'
     name: Calculate Xetabase branch
     runs-on: ubuntu-22.04
     outputs:
@@ -31,6 +32,7 @@ jobs:
           ZETTA_REPO_ACCESS_TOKEN: ${{ secrets.ZETTA_REPO_ACCESS_TOKEN }}
 
   test:
+    if: github.event.review.state == 'approved'
     name: "Run all tests before merging"
     needs: calculate-xetabase-branch
     uses: opencb/java-common-libs/.github/workflows/test-xetabase-workflow.yml@develop

diff --git a/biodata-external/pom.xml b/biodata-external/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>biodata</artifactId>
         <groupId>org.opencb.biodata</groupId>
-        <version>3.3.0</version>
+        <version>3.4.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/biodata-formats/pom.xml b/biodata-formats/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.opencb.biodata</groupId>
         <artifactId>biodata</artifactId>
-        <version>3.3.0</version>
+        <version>3.4.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/biodata-models/pom.xml b/biodata-models/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.opencb.biodata</groupId>
         <artifactId>biodata</artifactId>
-        <version>3.3.0</version>
+        <version>3.4.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/biodata-tools/pom.xml b/biodata-tools/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.opencb.biodata</groupId>
         <artifactId>biodata</artifactId>
-        <version>3.3.0</version>
+        <version>3.4.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/pom.xml b/pom.xml
@@ -22,7 +22,7 @@
 
     <groupId>org.opencb.biodata</groupId>
     <artifactId>biodata</artifactId>
-    <version>3.3.0</version>
+    <version>3.4.0</version>
     <packaging>pom</packaging>
 
     <name>Biodata</name>
@@ -38,7 +38,7 @@
 
     <properties>
         <!-- All dependency versions must be defined here -->
-        <java-common-libs.version>5.3.0</java-common-libs.version>
+        <java-common-libs.version>5.4.0</java-common-libs.version>
 
         <jackson.version>2.14.3</jackson.version>
         <collections.version>4.4</collections.version>