diff --git a/.github/workflows/pull-request-approved.yml b/.github/workflows/pull-request-approved.yml
index a39ff01146..eb0e45fadc 100644
--- a/.github/workflows/pull-request-approved.yml
+++ b/.github/workflows/pull-request-approved.yml
@@ -24,7 +24,7 @@ jobs:
chmod +x ./.github/workflows/scripts/get-xetabase-branch.sh
echo "github.event.pull_request.base.ref: ${{ github.event.pull_request.base.ref }}"
echo "github.event.pull_request.head.ref: ${{ github.event.pull_request.head.ref }}"
- xetabase_branch=$(./.github/workflows/scripts/get-xetabase-branch.sh ${{ github.event.pull_request.head.ref }})
+ xetabase_branch=$(./.github/workflows/scripts/get-xetabase-branch.sh ${{ github.event.pull_request.base.ref }})
echo "__Xetabase ref:__ \"${xetabase_branch}\"" | tee -a ${GITHUB_STEP_SUMMARY}
echo "xetabase_branch=${xetabase_branch}" >> $GITHUB_OUTPUT
env:
diff --git a/.github/workflows/scripts/get-xetabase-branch.sh b/.github/workflows/scripts/get-xetabase-branch.sh
index a1eb7e529c..90ab2c7574 100644
--- a/.github/workflows/scripts/get-xetabase-branch.sh
+++ b/.github/workflows/scripts/get-xetabase-branch.sh
@@ -19,11 +19,11 @@ get_xetabase_branch() {
return 0
fi
- # Check if the branch name starts with "release-" and follows the patterns "release-a.b.x" or "release-a.b.c.x"
- if [[ "$input_branch" =~ ^release-([0-9]+)\.([0-9]+)\.x$ ]] || [[ "$input_branch" =~ ^release-([0-9]+)\.([0-9]+)\.([0-9]+)\.x$ ]]; then
+ # Check if the branch name starts with "release-" and follows the patterns "release-a.x.x" or "release-a.b.x"
+ if [[ "$input_branch" =~ ^release-([0-9]+)\.x\.x$ ]] || [[ "$input_branch" =~ ^release-([0-9]+)\.([0-9]+)\.x$ ]]; then
# Extract the MAJOR part of the branch name
MAJOR=${BASH_REMATCH[1]}
- # Calculate the XETABASE_MAJOR by subtracting 3 from MAJOR
+ # Calculate the XETABASE_MAJOR by subtracting 1 from MAJOR of opencga
XETABASE_MAJOR=$((MAJOR - 1))
# Check if the XETABASE_MAJOR is negative
if (( XETABASE_MAJOR < 0 )); then
diff --git a/opencga-analysis/pom.xml b/opencga-analysis/pom.xml
index 0660ed5c02..da11899598 100644
--- a/opencga-analysis/pom.xml
+++ b/opencga-analysis/pom.xml
@@ -22,7 +22,7 @@
org.opencb.opencga
opencga
- 3.2.2-SNAPSHOT
+ 3.3.0-SNAPSHOT
../pom.xml
diff --git a/opencga-app/pom.xml b/opencga-app/pom.xml
index b84866dec2..81cd804f3e 100644
--- a/opencga-app/pom.xml
+++ b/opencga-app/pom.xml
@@ -22,7 +22,7 @@
org.opencb.opencga
opencga
- 3.2.2-SNAPSHOT
+ 3.3.0-SNAPSHOT
../pom.xml
diff --git a/opencga-catalog/pom.xml b/opencga-catalog/pom.xml
index fd3439b695..6b0951aa72 100644
--- a/opencga-catalog/pom.xml
+++ b/opencga-catalog/pom.xml
@@ -23,7 +23,7 @@
org.opencb.opencga
opencga
- 3.2.2-SNAPSHOT
+ 3.3.0-SNAPSHOT
../pom.xml
diff --git a/opencga-client/pom.xml b/opencga-client/pom.xml
index 263ca0aab2..e18ab8949a 100644
--- a/opencga-client/pom.xml
+++ b/opencga-client/pom.xml
@@ -22,7 +22,7 @@
org.opencb.opencga
opencga
- 3.2.2-SNAPSHOT
+ 3.3.0-SNAPSHOT
../pom.xml
diff --git a/opencga-clinical/pom.xml b/opencga-clinical/pom.xml
index 64ddb73f73..379849dd1a 100644
--- a/opencga-clinical/pom.xml
+++ b/opencga-clinical/pom.xml
@@ -5,7 +5,7 @@
org.opencb.opencga
opencga
- 3.2.2-SNAPSHOT
+ 3.3.0-SNAPSHOT
../pom.xml
4.0.0
diff --git a/opencga-core/pom.xml b/opencga-core/pom.xml
index 7e67b3bf64..741360749a 100644
--- a/opencga-core/pom.xml
+++ b/opencga-core/pom.xml
@@ -22,7 +22,7 @@
org.opencb.opencga
opencga
- 3.2.2-SNAPSHOT
+ 3.3.0-SNAPSHOT
../pom.xml
diff --git a/opencga-master/pom.xml b/opencga-master/pom.xml
index 711d461f9b..babb08f410 100644
--- a/opencga-master/pom.xml
+++ b/opencga-master/pom.xml
@@ -22,7 +22,7 @@
opencga
org.opencb.opencga
- 3.2.2-SNAPSHOT
+ 3.3.0-SNAPSHOT
../pom.xml
diff --git a/opencga-server/pom.xml b/opencga-server/pom.xml
index 9ccd85aef8..bdfa34a64b 100644
--- a/opencga-server/pom.xml
+++ b/opencga-server/pom.xml
@@ -22,7 +22,7 @@
org.opencb.opencga
opencga
- 3.2.2-SNAPSHOT
+ 3.3.0-SNAPSHOT
../pom.xml
diff --git a/opencga-storage/opencga-storage-app/pom.xml b/opencga-storage/opencga-storage-app/pom.xml
index 20f1f1a0fb..9c27d061df 100644
--- a/opencga-storage/opencga-storage-app/pom.xml
+++ b/opencga-storage/opencga-storage-app/pom.xml
@@ -22,7 +22,7 @@
org.opencb.opencga
opencga-storage
- 3.2.2-SNAPSHOT
+ 3.3.0-SNAPSHOT
../pom.xml
diff --git a/opencga-storage/opencga-storage-benchmark/pom.xml b/opencga-storage/opencga-storage-benchmark/pom.xml
index a069ebc96c..cd5cb2c088 100644
--- a/opencga-storage/opencga-storage-benchmark/pom.xml
+++ b/opencga-storage/opencga-storage-benchmark/pom.xml
@@ -22,7 +22,7 @@
opencga-storage
org.opencb.opencga
- 3.2.2-SNAPSHOT
+ 3.3.0-SNAPSHOT
../pom.xml
diff --git a/opencga-storage/opencga-storage-core/pom.xml b/opencga-storage/opencga-storage-core/pom.xml
index 3ef37d0def..80157147a9 100644
--- a/opencga-storage/opencga-storage-core/pom.xml
+++ b/opencga-storage/opencga-storage-core/pom.xml
@@ -22,7 +22,7 @@
org.opencb.opencga
opencga-storage
- 3.2.2-SNAPSHOT
+ 3.3.0-SNAPSHOT
../pom.xml
diff --git a/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-compat/opencga-storage-hadoop-compat-api/pom.xml b/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-compat/opencga-storage-hadoop-compat-api/pom.xml
index cbbf5918cd..53b33f3c76 100644
--- a/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-compat/opencga-storage-hadoop-compat-api/pom.xml
+++ b/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-compat/opencga-storage-hadoop-compat-api/pom.xml
@@ -22,7 +22,7 @@
org.opencb.opencga
opencga-storage-hadoop-compat
- 3.2.2-SNAPSHOT
+ 3.3.0-SNAPSHOT
../pom.xml
diff --git a/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-compat/opencga-storage-hadoop-compat-hbase2.0/pom.xml b/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-compat/opencga-storage-hadoop-compat-hbase2.0/pom.xml
index fd5b14d8ed..4e02eee65a 100644
--- a/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-compat/opencga-storage-hadoop-compat-hbase2.0/pom.xml
+++ b/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-compat/opencga-storage-hadoop-compat-hbase2.0/pom.xml
@@ -22,7 +22,7 @@
org.opencb.opencga
opencga-storage-hadoop-compat
- 3.2.2-SNAPSHOT
+ 3.3.0-SNAPSHOT
../pom.xml
diff --git a/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-compat/opencga-storage-hadoop-compat-hbase2.2/pom.xml b/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-compat/opencga-storage-hadoop-compat-hbase2.2/pom.xml
index b3f07e1633..7cda3125ff 100644
--- a/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-compat/opencga-storage-hadoop-compat-hbase2.2/pom.xml
+++ b/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-compat/opencga-storage-hadoop-compat-hbase2.2/pom.xml
@@ -22,7 +22,7 @@
org.opencb.opencga
opencga-storage-hadoop-compat
- 3.2.2-SNAPSHOT
+ 3.3.0-SNAPSHOT
../pom.xml
diff --git a/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-compat/opencga-storage-hadoop-compat-hbase2.4/pom.xml b/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-compat/opencga-storage-hadoop-compat-hbase2.4/pom.xml
index 9342f98010..b81b3599ad 100644
--- a/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-compat/opencga-storage-hadoop-compat-hbase2.4/pom.xml
+++ b/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-compat/opencga-storage-hadoop-compat-hbase2.4/pom.xml
@@ -22,7 +22,7 @@
org.opencb.opencga
opencga-storage-hadoop-compat
- 3.2.2-SNAPSHOT
+ 3.3.0-SNAPSHOT
../pom.xml
diff --git a/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-compat/pom.xml b/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-compat/pom.xml
index e39ccb54cb..2f2b0d3215 100644
--- a/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-compat/pom.xml
+++ b/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-compat/pom.xml
@@ -23,7 +23,7 @@
org.opencb.opencga
opencga-storage-hadoop
- 3.2.2-SNAPSHOT
+ 3.3.0-SNAPSHOT
../pom.xml
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
index 1f4eaf4eb0..ddc5d8e979 100644
--- 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 @@
org.opencb.opencga
opencga-storage-hadoop
- 3.2.2-SNAPSHOT
+ 3.3.0-SNAPSHOT
../pom.xml
diff --git a/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-lib/opencga-storage-hadoop-lib-emr6.1/pom.xml b/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-lib/opencga-storage-hadoop-lib-emr6.1/pom.xml
index 3be574c25e..f1b656e0c2 100644
--- a/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-lib/opencga-storage-hadoop-lib-emr6.1/pom.xml
+++ b/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-lib/opencga-storage-hadoop-lib-emr6.1/pom.xml
@@ -7,7 +7,7 @@
org.opencb.opencga
opencga-storage-hadoop-lib
- 3.2.2-SNAPSHOT
+ 3.3.0-SNAPSHOT
../pom.xml
diff --git a/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-lib/opencga-storage-hadoop-lib-emr6.13/pom.xml b/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-lib/opencga-storage-hadoop-lib-emr6.13/pom.xml
index 71956a9a81..00c4dddb2f 100644
--- a/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-lib/opencga-storage-hadoop-lib-emr6.13/pom.xml
+++ b/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-lib/opencga-storage-hadoop-lib-emr6.13/pom.xml
@@ -7,7 +7,7 @@
org.opencb.opencga
opencga-storage-hadoop-lib
- 3.2.2-SNAPSHOT
+ 3.3.0-SNAPSHOT
../pom.xml
diff --git a/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-lib/opencga-storage-hadoop-lib-hdi5.1/pom.xml b/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-lib/opencga-storage-hadoop-lib-hdi5.1/pom.xml
index f896e5442b..9dfa1bb402 100644
--- a/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-lib/opencga-storage-hadoop-lib-hdi5.1/pom.xml
+++ b/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-lib/opencga-storage-hadoop-lib-hdi5.1/pom.xml
@@ -7,7 +7,7 @@
org.opencb.opencga
opencga-storage-hadoop-lib
- 3.2.2-SNAPSHOT
+ 3.3.0-SNAPSHOT
../pom.xml
diff --git a/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-lib/opencga-storage-hadoop-lib-hdp3.1/pom.xml b/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-lib/opencga-storage-hadoop-lib-hdp3.1/pom.xml
index f2089e1b58..d6c2eecf17 100644
--- a/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-lib/opencga-storage-hadoop-lib-hdp3.1/pom.xml
+++ b/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-lib/opencga-storage-hadoop-lib-hdp3.1/pom.xml
@@ -7,7 +7,7 @@
org.opencb.opencga
opencga-storage-hadoop-lib
- 3.2.2-SNAPSHOT
+ 3.3.0-SNAPSHOT
../pom.xml
diff --git a/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-lib/pom.xml b/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-lib/pom.xml
index 0b81ae0618..6462be6cfa 100644
--- a/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-lib/pom.xml
+++ b/opencga-storage/opencga-storage-hadoop/opencga-storage-hadoop-lib/pom.xml
@@ -23,7 +23,7 @@
org.opencb.opencga
opencga-storage-hadoop
- 3.2.2-SNAPSHOT
+ 3.3.0-SNAPSHOT
../pom.xml
diff --git a/opencga-storage/opencga-storage-hadoop/pom.xml b/opencga-storage/opencga-storage-hadoop/pom.xml
index 14c33d3e3d..7e2f40af77 100644
--- a/opencga-storage/opencga-storage-hadoop/pom.xml
+++ b/opencga-storage/opencga-storage-hadoop/pom.xml
@@ -23,7 +23,7 @@
org.opencb.opencga
opencga-storage
- 3.2.2-SNAPSHOT
+ 3.3.0-SNAPSHOT
../pom.xml
diff --git a/opencga-storage/opencga-storage-server/pom.xml b/opencga-storage/opencga-storage-server/pom.xml
index 524b5ae604..e4c020243b 100644
--- a/opencga-storage/opencga-storage-server/pom.xml
+++ b/opencga-storage/opencga-storage-server/pom.xml
@@ -22,7 +22,7 @@
org.opencb.opencga
opencga-storage
- 3.2.2-SNAPSHOT
+ 3.3.0-SNAPSHOT
../pom.xml
diff --git a/opencga-storage/pom.xml b/opencga-storage/pom.xml
index a26e01a35c..2fdd79ef9f 100644
--- a/opencga-storage/pom.xml
+++ b/opencga-storage/pom.xml
@@ -22,7 +22,7 @@
org.opencb.opencga
opencga
- 3.2.2-SNAPSHOT
+ 3.3.0-SNAPSHOT
../pom.xml
diff --git a/opencga-test/pom.xml b/opencga-test/pom.xml
index 26f0cfc4ba..d2a279f522 100644
--- a/opencga-test/pom.xml
+++ b/opencga-test/pom.xml
@@ -24,7 +24,7 @@
org.opencb.opencga
opencga
- 3.2.2-SNAPSHOT
+ 3.3.0-SNAPSHOT
../pom.xml
diff --git a/pom.xml b/pom.xml
index 0e87776f18..e073746344 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
org.opencb.opencga
opencga
- 3.2.2-SNAPSHOT
+ 3.3.0-SNAPSHOT
pom
OpenCGA
@@ -43,12 +43,12 @@
- 3.2.2_dev
- 3.2.2_dev
- 6.2.2-SNAPSHOT
- 3.2.2-SNAPSHOT
- 5.2.2-SNAPSHOT
- 3.2.2-SNAPSHOT
+ 3.3.0_dev
+ 3.3.0_dev
+ 6.3.0-SNAPSHOT
+ 3.3.0-SNAPSHOT
+ 5.3.0-SNAPSHOT
+ 3.3.0-SNAPSHOT
0.2.0