From 864b1d4719306310e99b9a6e35d2dd3961e53c60 Mon Sep 17 00:00:00 2001 From: JuanfeSanahuja Date: Fri, 13 Sep 2024 11:50:30 +0200 Subject: [PATCH 01/21] Prepare next release 5.2.2-SNAPSHOT --- commons-datastore/commons-datastore-core/pom.xml | 2 +- commons-datastore/commons-datastore-mongodb/pom.xml | 2 +- commons-datastore/commons-datastore-solr/pom.xml | 2 +- commons-datastore/pom.xml | 2 +- commons-lib/pom.xml | 2 +- pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/commons-datastore/commons-datastore-core/pom.xml b/commons-datastore/commons-datastore-core/pom.xml index b07eb280..fb5aa9c4 100644 --- a/commons-datastore/commons-datastore-core/pom.xml +++ b/commons-datastore/commons-datastore-core/pom.xml @@ -6,7 +6,7 @@ org.opencb.commons commons-datastore - 5.2.1 + 5.2.2-SNAPSHOT ../pom.xml diff --git a/commons-datastore/commons-datastore-mongodb/pom.xml b/commons-datastore/commons-datastore-mongodb/pom.xml index b668b844..ea27c46b 100644 --- a/commons-datastore/commons-datastore-mongodb/pom.xml +++ b/commons-datastore/commons-datastore-mongodb/pom.xml @@ -6,7 +6,7 @@ org.opencb.commons commons-datastore - 5.2.1 + 5.2.2-SNAPSHOT ../pom.xml diff --git a/commons-datastore/commons-datastore-solr/pom.xml b/commons-datastore/commons-datastore-solr/pom.xml index 3f519840..8ac28bb8 100644 --- a/commons-datastore/commons-datastore-solr/pom.xml +++ b/commons-datastore/commons-datastore-solr/pom.xml @@ -22,7 +22,7 @@ org.opencb.commons commons-datastore - 5.2.1 + 5.2.2-SNAPSHOT ../pom.xml diff --git a/commons-datastore/pom.xml b/commons-datastore/pom.xml index 7e1766ef..ce2e7cdc 100644 --- a/commons-datastore/pom.xml +++ b/commons-datastore/pom.xml @@ -6,7 +6,7 @@ org.opencb.commons commons - 5.2.1 + 5.2.2-SNAPSHOT ../pom.xml diff --git a/commons-lib/pom.xml b/commons-lib/pom.xml index f6845f0f..c9549985 100644 --- a/commons-lib/pom.xml +++ b/commons-lib/pom.xml @@ -6,7 +6,7 @@ org.opencb.commons commons - 5.2.1 + 5.2.2-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index 16820bf8..2ca4a9f5 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.opencb.commons commons - 5.2.1 + 5.2.2-SNAPSHOT pom OpenCB commons project From afde81c48bc868be22fe7b84f1bcf1e1ecf162bd Mon Sep 17 00:00:00 2001 From: JuanfeSanahuja Date: Mon, 16 Sep 2024 12:52:16 +0200 Subject: [PATCH 02/21] Clean ls in test-xetabase workflow #TASK-6879 --- .github/workflows/test-xetabase-workflow.yml | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/.github/workflows/test-xetabase-workflow.yml b/.github/workflows/test-xetabase-workflow.yml index 1dfcdc78..3341554d 100644 --- a/.github/workflows/test-xetabase-workflow.yml +++ b/.github/workflows/test-xetabase-workflow.yml @@ -104,18 +104,9 @@ jobs: password: ${{ env.DOCKER_HUB_PASSWORD }} - name: Run all OpenCB Junit tests, ie. java-common-libs, biodata, cellbase, opencga and opencga-enterprise run: | - pwd - ls -lrtha - echo "------------------------------------" cd opencga-enterprise - pwd - ls -lrtha - echo "------------------------------------" ln -s ../opencga opencga-home - echo "------------------------------------" - ls -lrtha - #./build.sh -t -l runShortTests,runMediumTests,runLongTests -b -s -f -T ${{ inputs.task }} -c localhost:27018 -H hdp3.1 - ./build.sh -t -l runShortTests -b -s -f -T ${{ inputs.task }} -c localhost:27018 -H hdp3.1 + ./build.sh -t -l runShortTests -b -s -T ${{ inputs.task }} -c localhost:27018 -H hdp3.1 - name: Upload reports results to Github uses: actions/upload-artifact@v4 with: From c62cd6055a435194634ddccb1971668b11966234 Mon Sep 17 00:00:00 2001 From: JuanfeSanahuja Date: Mon, 16 Sep 2024 13:09:17 +0200 Subject: [PATCH 03/21] Delete test pll request approve cicd #TASK-6879 --- .../workflows/test-pull-request-approved.yml | 48 ------------------- 1 file changed, 48 deletions(-) delete mode 100644 .github/workflows/test-pull-request-approved.yml diff --git a/.github/workflows/test-pull-request-approved.yml b/.github/workflows/test-pull-request-approved.yml deleted file mode 100644 index 41f878cf..00000000 --- a/.github/workflows/test-pull-request-approved.yml +++ /dev/null @@ -1,48 +0,0 @@ -name: Pull request approve workflow -run-name: 'Pull request approve workflow ${{ github.event.pull_request.head.ref }} -> ${{ github.event.pull_request.base.ref }} by @${{ github.actor }}' - -on: - push: - branches: - - TASK-* - - -jobs: - calculate-xetabase-branch: - name: Calculate Xetabase branch - runs-on: ubuntu-22.04 - outputs: - xetabase_branch: ${{ steps.get_xetabase_branch.outputs.xetabase_branch }} - steps: - - name: Clone java-common-libs - uses: actions/checkout@v4 - with: - fetch-depth: '10' - ## This is important to avoid the error in the next step: "fatal: repository 'https://github.com/zetta-genomics/opencga-enterprise.git/' not found" - persist-credentials: false - - id: get_xetabase_branch - name: "Get current branch for Xetabase from target branch" - run: | - if [ "$( git ls-remote https://$ZETTA_REPO_ACCESS_TOKEN@github.com/opencb/opencga.git "TASK-6807" )" ] ; then - echo "OPENCGA TASK-6807 branch"; - fi - - if [ "$( git ls-remote https://$ZETTA_REPO_ACCESS_TOKEN@github.com/zetta-genomics/opencga-enterprise.git "$input_branch" )" ] ; then - echo "Here it is TASK-6807 branch"; - fi - chmod +x ./.github/workflows/scripts/get-xetabase-branch.sh - echo "secrets.ZETTA_REPO_ACCESS_TOKEN: ${{ secrets.ZETTA_REPO_ACCESS_TOKEN }}" | tee -a ${GITHUB_STEP_SUMMARY} - xetabase_branch=$(./.github/workflows/scripts/get-xetabase-branch.sh "TASK-6807" ) - echo "__Xetabase ref:__ \"${xetabase_branch}\"" | tee -a ${GITHUB_STEP_SUMMARY} - echo "xetabase_branch=${xetabase_branch}" >> $GITHUB_OUTPUT - env: - ZETTA_REPO_ACCESS_TOKEN: ${{ secrets.ZETTA_REPO_ACCESS_TOKEN }} - - test: - name: "Run all tests before merging" - needs: calculate-xetabase-branch - uses: opencb/java-common-libs/.github/workflows/test-xetabase-workflow.yml@develop - with: - branch: ${{ needs.calculate-xetabase-branch.outputs.xetabase_branch }} - task: TASK-6807 - secrets: inherit \ No newline at end of file From 8cafa9f983028692d28589ba8163d4ef39c26bfb Mon Sep 17 00:00:00 2001 From: JuanfeSanahuja Date: Mon, 16 Sep 2024 15:00:08 +0200 Subject: [PATCH 04/21] SDLC: Prepare release 2.3.0 de Xetabase #TASK-6879 --- commons-datastore/commons-datastore-core/pom.xml | 2 +- commons-datastore/commons-datastore-mongodb/pom.xml | 2 +- commons-datastore/commons-datastore-solr/pom.xml | 2 +- commons-datastore/pom.xml | 2 +- commons-lib/pom.xml | 2 +- pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/commons-datastore/commons-datastore-core/pom.xml b/commons-datastore/commons-datastore-core/pom.xml index fb5aa9c4..73214d6e 100644 --- a/commons-datastore/commons-datastore-core/pom.xml +++ b/commons-datastore/commons-datastore-core/pom.xml @@ -6,7 +6,7 @@ org.opencb.commons commons-datastore - 5.2.2-SNAPSHOT + 3.3.0-SNAPSHOT ../pom.xml diff --git a/commons-datastore/commons-datastore-mongodb/pom.xml b/commons-datastore/commons-datastore-mongodb/pom.xml index ea27c46b..0ffa5c61 100644 --- a/commons-datastore/commons-datastore-mongodb/pom.xml +++ b/commons-datastore/commons-datastore-mongodb/pom.xml @@ -6,7 +6,7 @@ org.opencb.commons commons-datastore - 5.2.2-SNAPSHOT + 3.3.0-SNAPSHOT ../pom.xml diff --git a/commons-datastore/commons-datastore-solr/pom.xml b/commons-datastore/commons-datastore-solr/pom.xml index 8ac28bb8..69ad2cb8 100644 --- a/commons-datastore/commons-datastore-solr/pom.xml +++ b/commons-datastore/commons-datastore-solr/pom.xml @@ -22,7 +22,7 @@ org.opencb.commons commons-datastore - 5.2.2-SNAPSHOT + 3.3.0-SNAPSHOT ../pom.xml diff --git a/commons-datastore/pom.xml b/commons-datastore/pom.xml index ce2e7cdc..464343a2 100644 --- a/commons-datastore/pom.xml +++ b/commons-datastore/pom.xml @@ -6,7 +6,7 @@ org.opencb.commons commons - 5.2.2-SNAPSHOT + 3.3.0-SNAPSHOT ../pom.xml diff --git a/commons-lib/pom.xml b/commons-lib/pom.xml index c9549985..1e5bb366 100644 --- a/commons-lib/pom.xml +++ b/commons-lib/pom.xml @@ -6,7 +6,7 @@ org.opencb.commons commons - 5.2.2-SNAPSHOT + 3.3.0-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index 2ca4a9f5..c853b234 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.opencb.commons commons - 5.2.2-SNAPSHOT + 3.3.0-SNAPSHOT pom OpenCB commons project From 18819ff743b31f74e1a8a4e6aad86e410b472326 Mon Sep 17 00:00:00 2001 From: JuanfeSanahuja Date: Mon, 16 Sep 2024 15:01:28 +0200 Subject: [PATCH 05/21] SDLC: Prepare release 2.3.0 de Xetabase #TASK-6879 --- commons-datastore/commons-datastore-core/pom.xml | 2 +- commons-datastore/commons-datastore-mongodb/pom.xml | 2 +- commons-datastore/commons-datastore-solr/pom.xml | 2 +- commons-datastore/pom.xml | 2 +- commons-lib/pom.xml | 2 +- pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/commons-datastore/commons-datastore-core/pom.xml b/commons-datastore/commons-datastore-core/pom.xml index 73214d6e..ed5c139e 100644 --- a/commons-datastore/commons-datastore-core/pom.xml +++ b/commons-datastore/commons-datastore-core/pom.xml @@ -6,7 +6,7 @@ org.opencb.commons commons-datastore - 3.3.0-SNAPSHOT + 5.3.0-SNAPSHOT ../pom.xml diff --git a/commons-datastore/commons-datastore-mongodb/pom.xml b/commons-datastore/commons-datastore-mongodb/pom.xml index 0ffa5c61..294dd6ec 100644 --- a/commons-datastore/commons-datastore-mongodb/pom.xml +++ b/commons-datastore/commons-datastore-mongodb/pom.xml @@ -6,7 +6,7 @@ org.opencb.commons commons-datastore - 3.3.0-SNAPSHOT + 5.3.0-SNAPSHOT ../pom.xml diff --git a/commons-datastore/commons-datastore-solr/pom.xml b/commons-datastore/commons-datastore-solr/pom.xml index 69ad2cb8..a6d4bc14 100644 --- a/commons-datastore/commons-datastore-solr/pom.xml +++ b/commons-datastore/commons-datastore-solr/pom.xml @@ -22,7 +22,7 @@ org.opencb.commons commons-datastore - 3.3.0-SNAPSHOT + 5.3.0-SNAPSHOT ../pom.xml diff --git a/commons-datastore/pom.xml b/commons-datastore/pom.xml index 464343a2..db85378f 100644 --- a/commons-datastore/pom.xml +++ b/commons-datastore/pom.xml @@ -6,7 +6,7 @@ org.opencb.commons commons - 3.3.0-SNAPSHOT + 5.3.0-SNAPSHOT ../pom.xml diff --git a/commons-lib/pom.xml b/commons-lib/pom.xml index 1e5bb366..d2077fc7 100644 --- a/commons-lib/pom.xml +++ b/commons-lib/pom.xml @@ -6,7 +6,7 @@ org.opencb.commons commons - 3.3.0-SNAPSHOT + 5.3.0-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index c853b234..8a184d38 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.opencb.commons commons - 3.3.0-SNAPSHOT + 5.3.0-SNAPSHOT pom OpenCB commons project From aa8dc1269b95e94b51a94c3f5ec355423474ee70 Mon Sep 17 00:00:00 2001 From: JuanfeSanahuja Date: Mon, 16 Sep 2024 15:01:28 +0200 Subject: [PATCH 06/21] SDLC: Prepare release 2.3.0 of Xetabase #TASK-6879 --- commons-datastore/commons-datastore-core/pom.xml | 2 +- commons-datastore/commons-datastore-mongodb/pom.xml | 2 +- commons-datastore/commons-datastore-solr/pom.xml | 2 +- commons-datastore/pom.xml | 2 +- commons-lib/pom.xml | 2 +- pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/commons-datastore/commons-datastore-core/pom.xml b/commons-datastore/commons-datastore-core/pom.xml index 73214d6e..ed5c139e 100644 --- a/commons-datastore/commons-datastore-core/pom.xml +++ b/commons-datastore/commons-datastore-core/pom.xml @@ -6,7 +6,7 @@ org.opencb.commons commons-datastore - 3.3.0-SNAPSHOT + 5.3.0-SNAPSHOT ../pom.xml diff --git a/commons-datastore/commons-datastore-mongodb/pom.xml b/commons-datastore/commons-datastore-mongodb/pom.xml index 0ffa5c61..294dd6ec 100644 --- a/commons-datastore/commons-datastore-mongodb/pom.xml +++ b/commons-datastore/commons-datastore-mongodb/pom.xml @@ -6,7 +6,7 @@ org.opencb.commons commons-datastore - 3.3.0-SNAPSHOT + 5.3.0-SNAPSHOT ../pom.xml diff --git a/commons-datastore/commons-datastore-solr/pom.xml b/commons-datastore/commons-datastore-solr/pom.xml index 69ad2cb8..a6d4bc14 100644 --- a/commons-datastore/commons-datastore-solr/pom.xml +++ b/commons-datastore/commons-datastore-solr/pom.xml @@ -22,7 +22,7 @@ org.opencb.commons commons-datastore - 3.3.0-SNAPSHOT + 5.3.0-SNAPSHOT ../pom.xml diff --git a/commons-datastore/pom.xml b/commons-datastore/pom.xml index 464343a2..db85378f 100644 --- a/commons-datastore/pom.xml +++ b/commons-datastore/pom.xml @@ -6,7 +6,7 @@ org.opencb.commons commons - 3.3.0-SNAPSHOT + 5.3.0-SNAPSHOT ../pom.xml diff --git a/commons-lib/pom.xml b/commons-lib/pom.xml index 1e5bb366..d2077fc7 100644 --- a/commons-lib/pom.xml +++ b/commons-lib/pom.xml @@ -6,7 +6,7 @@ org.opencb.commons commons - 3.3.0-SNAPSHOT + 5.3.0-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index c853b234..8a184d38 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.opencb.commons commons - 3.3.0-SNAPSHOT + 5.3.0-SNAPSHOT pom OpenCB commons project From bdc9fa4e7fde04ead51e8637233c8b7884b6be3c Mon Sep 17 00:00:00 2001 From: JuanfeSanahuja Date: Tue, 17 Sep 2024 11:06:32 +0200 Subject: [PATCH 07/21] cicd: Review cicd after brnch renames #TASK-6879 --- .../workflows/scripts/get-xetabase-branch.sh | 4 +- .github/workflows/test-xetabase-branch.yml | 48 +++++++++++++++++++ 2 files changed, 50 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/test-xetabase-branch.yml diff --git a/.github/workflows/scripts/get-xetabase-branch.sh b/.github/workflows/scripts/get-xetabase-branch.sh index 139e6a0a..be89ffbf 100644 --- a/.github/workflows/scripts/get-xetabase-branch.sh +++ b/.github/workflows/scripts/get-xetabase-branch.sh @@ -20,8 +20,8 @@ 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 diff --git a/.github/workflows/test-xetabase-branch.yml b/.github/workflows/test-xetabase-branch.yml new file mode 100644 index 00000000..e90aeebd --- /dev/null +++ b/.github/workflows/test-xetabase-branch.yml @@ -0,0 +1,48 @@ +name: TMP test-xetabase-branch +run-name: 'Pull request approve workflow ${{ github.event.pull_request.head.ref }} -> ${{ github.event.pull_request.base.ref }} by @${{ github.actor }}' + +on: + push: + branches: + - TASK-* + + +jobs: + calculate-xetabase-branch: + name: Calculate Xetabase branch + runs-on: ubuntu-22.04 + outputs: + xetabase_branch: ${{ steps.get_xetabase_branch.outputs.xetabase_branch }} + steps: + - name: Clone java-common-libs + uses: actions/checkout@v4 + with: + fetch-depth: '10' + ## This is important to avoid the error in the next step: "fatal: repository 'https://github.com/zetta-genomics/opencga-enterprise.git/' not found" + persist-credentials: false + - id: get_xetabase_branch + name: "Get current branch for Xetabase from target branch" + run: | + if [ "$( git ls-remote https://$ZETTA_REPO_ACCESS_TOKEN@github.com/opencb/opencga.git "TASK-6807" )" ] ; then + echo "OPENCGA TASK-6807 branch"; + fi + + if [ "$( git ls-remote https://$ZETTA_REPO_ACCESS_TOKEN@github.com/zetta-genomics/opencga-enterprise.git "$input_branch" )" ] ; then + echo "Here it is TASK-6807 branch"; + fi + chmod +x ./.github/workflows/scripts/get-xetabase-branch.sh + echo "secrets.ZETTA_REPO_ACCESS_TOKEN: ${{ secrets.ZETTA_REPO_ACCESS_TOKEN }}" | tee -a ${GITHUB_STEP_SUMMARY} + xetabase_branch=$(./.github/workflows/scripts/get-xetabase-branch.sh "TASK-6807" ) + echo "__Xetabase ref:__ \"${xetabase_branch}\"" | tee -a ${GITHUB_STEP_SUMMARY} + echo "xetabase_branch=${xetabase_branch}" >> $GITHUB_OUTPUT + env: + ZETTA_REPO_ACCESS_TOKEN: ${{ secrets.ZETTA_REPO_ACCESS_TOKEN }} + + test: + name: "Run all tests before merging" + needs: calculate-xetabase-branch + uses: opencb/java-common-libs/.github/workflows/test-xetabase-workflow.yml@develop + with: + branch: ${{ needs.calculate-xetabase-branch.outputs.xetabase_branch }} + task: TASK-6807 + secrets: inherit \ No newline at end of file From c9a79d9e1e5a46c771b84366ec310a3505fff94c Mon Sep 17 00:00:00 2001 From: JuanfeSanahuja Date: Tue, 17 Sep 2024 11:12:52 +0200 Subject: [PATCH 08/21] cicd: Review cicd after brnch renames #TASK-6879 --- .github/workflows/pull-request-approved.yml | 2 +- .github/workflows/test-xetabase-branch.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pull-request-approved.yml b/.github/workflows/pull-request-approved.yml index de0bbc57..c68cc16b 100644 --- a/.github/workflows/pull-request-approved.yml +++ b/.github/workflows/pull-request-approved.yml @@ -25,7 +25,7 @@ jobs: 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 }}" echo "secrets.ZETTA_REPO_ACCESS_TOKEN: ${{ secrets.ZETTA_REPO_ACCESS_TOKEN }}" - 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/test-xetabase-branch.yml b/.github/workflows/test-xetabase-branch.yml index e90aeebd..e10a41c9 100644 --- a/.github/workflows/test-xetabase-branch.yml +++ b/.github/workflows/test-xetabase-branch.yml @@ -32,7 +32,7 @@ jobs: fi chmod +x ./.github/workflows/scripts/get-xetabase-branch.sh echo "secrets.ZETTA_REPO_ACCESS_TOKEN: ${{ secrets.ZETTA_REPO_ACCESS_TOKEN }}" | tee -a ${GITHUB_STEP_SUMMARY} - xetabase_branch=$(./.github/workflows/scripts/get-xetabase-branch.sh "TASK-6807" ) + xetabase_branch=$(./.github/workflows/scripts/get-xetabase-branch.sh "release-5.x.x" ) echo "__Xetabase ref:__ \"${xetabase_branch}\"" | tee -a ${GITHUB_STEP_SUMMARY} echo "xetabase_branch=${xetabase_branch}" >> $GITHUB_OUTPUT env: @@ -44,5 +44,5 @@ jobs: uses: opencb/java-common-libs/.github/workflows/test-xetabase-workflow.yml@develop with: branch: ${{ needs.calculate-xetabase-branch.outputs.xetabase_branch }} - task: TASK-6807 + task: TASK-6879 secrets: inherit \ No newline at end of file From a6a843441c8fabf875f07c90ff269c09575e9d4e Mon Sep 17 00:00:00 2001 From: JuanfeSanahuja Date: Tue, 17 Sep 2024 13:26:43 +0200 Subject: [PATCH 09/21] cicd: Refactor tmp test to cicd after brnch renames #TASK-6879 --- .../{test-xetabase-branch.yml => tmp-test-xetabase-branch.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{test-xetabase-branch.yml => tmp-test-xetabase-branch.yml} (100%) diff --git a/.github/workflows/test-xetabase-branch.yml b/.github/workflows/tmp-test-xetabase-branch.yml similarity index 100% rename from .github/workflows/test-xetabase-branch.yml rename to .github/workflows/tmp-test-xetabase-branch.yml From a1efd8f8ebec16ae4bce77972293efd331af0714 Mon Sep 17 00:00:00 2001 From: JuanfeSanahuja Date: Tue, 17 Sep 2024 13:30:20 +0200 Subject: [PATCH 10/21] cicd: Refactor tmp test to cicd after brnch renames #TASK-6879 --- .github/workflows/tmp-test-xetabase-branch.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tmp-test-xetabase-branch.yml b/.github/workflows/tmp-test-xetabase-branch.yml index e10a41c9..c10d99ec 100644 --- a/.github/workflows/tmp-test-xetabase-branch.yml +++ b/.github/workflows/tmp-test-xetabase-branch.yml @@ -23,8 +23,8 @@ jobs: - id: get_xetabase_branch name: "Get current branch for Xetabase from target branch" run: | - if [ "$( git ls-remote https://$ZETTA_REPO_ACCESS_TOKEN@github.com/opencb/opencga.git "TASK-6807" )" ] ; then - echo "OPENCGA TASK-6807 branch"; + if [ "$( git ls-remote https://$ZETTA_REPO_ACCESS_TOKEN@github.com/opencb/opencga.git "TASK-6879" )" ] ; then + echo "OPENCGA TASK-6879 branch"; fi if [ "$( git ls-remote https://$ZETTA_REPO_ACCESS_TOKEN@github.com/zetta-genomics/opencga-enterprise.git "$input_branch" )" ] ; then @@ -32,7 +32,7 @@ jobs: fi chmod +x ./.github/workflows/scripts/get-xetabase-branch.sh echo "secrets.ZETTA_REPO_ACCESS_TOKEN: ${{ secrets.ZETTA_REPO_ACCESS_TOKEN }}" | tee -a ${GITHUB_STEP_SUMMARY} - xetabase_branch=$(./.github/workflows/scripts/get-xetabase-branch.sh "release-5.x.x" ) + xetabase_branch=$(./.github/workflows/scripts/get-xetabase-branch.sh "TASK-6879" ) echo "__Xetabase ref:__ \"${xetabase_branch}\"" | tee -a ${GITHUB_STEP_SUMMARY} echo "xetabase_branch=${xetabase_branch}" >> $GITHUB_OUTPUT env: From 38d096734705298760fa48ea7a5afb1abe32a0e9 Mon Sep 17 00:00:00 2001 From: JuanfeSanahuja Date: Thu, 26 Sep 2024 21:20:45 +0200 Subject: [PATCH 11/21] Prepare release in hotfix branch release-5.2.x --- commons-datastore/commons-datastore-core/pom.xml | 2 +- commons-datastore/commons-datastore-mongodb/pom.xml | 2 +- commons-datastore/commons-datastore-solr/pom.xml | 2 +- commons-datastore/pom.xml | 2 +- commons-lib/pom.xml | 2 +- pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/commons-datastore/commons-datastore-core/pom.xml b/commons-datastore/commons-datastore-core/pom.xml index b07eb280..fb5aa9c4 100644 --- a/commons-datastore/commons-datastore-core/pom.xml +++ b/commons-datastore/commons-datastore-core/pom.xml @@ -6,7 +6,7 @@ org.opencb.commons commons-datastore - 5.2.1 + 5.2.2-SNAPSHOT ../pom.xml diff --git a/commons-datastore/commons-datastore-mongodb/pom.xml b/commons-datastore/commons-datastore-mongodb/pom.xml index e22c8381..fd2645a4 100644 --- a/commons-datastore/commons-datastore-mongodb/pom.xml +++ b/commons-datastore/commons-datastore-mongodb/pom.xml @@ -6,7 +6,7 @@ org.opencb.commons commons-datastore - 5.2.1 + 5.2.2-SNAPSHOT ../pom.xml diff --git a/commons-datastore/commons-datastore-solr/pom.xml b/commons-datastore/commons-datastore-solr/pom.xml index 3485cfd5..13da9261 100644 --- a/commons-datastore/commons-datastore-solr/pom.xml +++ b/commons-datastore/commons-datastore-solr/pom.xml @@ -22,7 +22,7 @@ org.opencb.commons commons-datastore - 5.2.1 + 5.2.2-SNAPSHOT ../pom.xml diff --git a/commons-datastore/pom.xml b/commons-datastore/pom.xml index 7e1766ef..ce2e7cdc 100644 --- a/commons-datastore/pom.xml +++ b/commons-datastore/pom.xml @@ -6,7 +6,7 @@ org.opencb.commons commons - 5.2.1 + 5.2.2-SNAPSHOT ../pom.xml diff --git a/commons-lib/pom.xml b/commons-lib/pom.xml index b4a7323c..02b040c3 100644 --- a/commons-lib/pom.xml +++ b/commons-lib/pom.xml @@ -6,7 +6,7 @@ org.opencb.commons commons - 5.2.1 + 5.2.2-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index 1cd2bb2b..6ca622fd 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.opencb.commons commons - 5.2.1 + 5.2.2-SNAPSHOT pom OpenCB commons project From 2332d0026f222518035aa0912f814059af8a5a9e Mon Sep 17 00:00:00 2001 From: JuanfeSanahuja Date: Mon, 7 Oct 2024 18:10:53 +0200 Subject: [PATCH 12/21] Prepare release 5.2.2 --- commons-datastore/commons-datastore-core/pom.xml | 2 +- commons-datastore/commons-datastore-mongodb/pom.xml | 2 +- commons-datastore/commons-datastore-solr/pom.xml | 2 +- commons-datastore/pom.xml | 2 +- commons-lib/pom.xml | 2 +- pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/commons-datastore/commons-datastore-core/pom.xml b/commons-datastore/commons-datastore-core/pom.xml index fb5aa9c4..b5ceadb1 100644 --- a/commons-datastore/commons-datastore-core/pom.xml +++ b/commons-datastore/commons-datastore-core/pom.xml @@ -6,7 +6,7 @@ org.opencb.commons commons-datastore - 5.2.2-SNAPSHOT + 5.2.2 ../pom.xml diff --git a/commons-datastore/commons-datastore-mongodb/pom.xml b/commons-datastore/commons-datastore-mongodb/pom.xml index fd2645a4..4932a89b 100644 --- a/commons-datastore/commons-datastore-mongodb/pom.xml +++ b/commons-datastore/commons-datastore-mongodb/pom.xml @@ -6,7 +6,7 @@ org.opencb.commons commons-datastore - 5.2.2-SNAPSHOT + 5.2.2 ../pom.xml diff --git a/commons-datastore/commons-datastore-solr/pom.xml b/commons-datastore/commons-datastore-solr/pom.xml index 13da9261..059a125d 100644 --- a/commons-datastore/commons-datastore-solr/pom.xml +++ b/commons-datastore/commons-datastore-solr/pom.xml @@ -22,7 +22,7 @@ org.opencb.commons commons-datastore - 5.2.2-SNAPSHOT + 5.2.2 ../pom.xml diff --git a/commons-datastore/pom.xml b/commons-datastore/pom.xml index ce2e7cdc..a3bc8380 100644 --- a/commons-datastore/pom.xml +++ b/commons-datastore/pom.xml @@ -6,7 +6,7 @@ org.opencb.commons commons - 5.2.2-SNAPSHOT + 5.2.2 ../pom.xml diff --git a/commons-lib/pom.xml b/commons-lib/pom.xml index 02b040c3..7e22936d 100644 --- a/commons-lib/pom.xml +++ b/commons-lib/pom.xml @@ -6,7 +6,7 @@ org.opencb.commons commons - 5.2.2-SNAPSHOT + 5.2.2 ../pom.xml diff --git a/pom.xml b/pom.xml index 6ca622fd..03036e9d 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.opencb.commons commons - 5.2.2-SNAPSHOT + 5.2.2 pom OpenCB commons project From f55f1531137f69702c90c6d8eab97121b381abc1 Mon Sep 17 00:00:00 2001 From: JuanfeSanahuja Date: Tue, 8 Oct 2024 16:33:23 +0200 Subject: [PATCH 13/21] Prepare Port Patch 2.2.2 -> 2.3.0 #TASK-7038 --- commons-datastore/commons-datastore-core/pom.xml | 2 +- commons-datastore/commons-datastore-mongodb/pom.xml | 2 +- commons-datastore/commons-datastore-solr/pom.xml | 2 +- commons-datastore/pom.xml | 2 +- commons-lib/pom.xml | 2 +- pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/commons-datastore/commons-datastore-core/pom.xml b/commons-datastore/commons-datastore-core/pom.xml index b5ceadb1..ed5c139e 100644 --- a/commons-datastore/commons-datastore-core/pom.xml +++ b/commons-datastore/commons-datastore-core/pom.xml @@ -6,7 +6,7 @@ org.opencb.commons commons-datastore - 5.2.2 + 5.3.0-SNAPSHOT ../pom.xml diff --git a/commons-datastore/commons-datastore-mongodb/pom.xml b/commons-datastore/commons-datastore-mongodb/pom.xml index 4932a89b..af0f669b 100644 --- a/commons-datastore/commons-datastore-mongodb/pom.xml +++ b/commons-datastore/commons-datastore-mongodb/pom.xml @@ -6,7 +6,7 @@ org.opencb.commons commons-datastore - 5.2.2 + 5.3.0-SNAPSHOT ../pom.xml diff --git a/commons-datastore/commons-datastore-solr/pom.xml b/commons-datastore/commons-datastore-solr/pom.xml index 059a125d..698f327e 100644 --- a/commons-datastore/commons-datastore-solr/pom.xml +++ b/commons-datastore/commons-datastore-solr/pom.xml @@ -22,7 +22,7 @@ org.opencb.commons commons-datastore - 5.2.2 + 5.3.0-SNAPSHOT ../pom.xml diff --git a/commons-datastore/pom.xml b/commons-datastore/pom.xml index a3bc8380..db85378f 100644 --- a/commons-datastore/pom.xml +++ b/commons-datastore/pom.xml @@ -6,7 +6,7 @@ org.opencb.commons commons - 5.2.2 + 5.3.0-SNAPSHOT ../pom.xml diff --git a/commons-lib/pom.xml b/commons-lib/pom.xml index 7e22936d..7c6e2bd5 100644 --- a/commons-lib/pom.xml +++ b/commons-lib/pom.xml @@ -6,7 +6,7 @@ org.opencb.commons commons - 5.2.2 + 5.3.0-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index 03036e9d..dca9d5d9 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.opencb.commons commons - 5.2.2 + 5.3.0-SNAPSHOT pom OpenCB commons project From 92a5865c7b263ca82716b3a6981c4df9d56cf852 Mon Sep 17 00:00:00 2001 From: JuanfeSanahuja Date: Tue, 8 Oct 2024 18:01:57 +0200 Subject: [PATCH 14/21] CICD: deleted tmp yml file #TASK-6780 --- .../workflows/tmp-test-xetabase-branch.yml | 48 ------------------- 1 file changed, 48 deletions(-) delete mode 100644 .github/workflows/tmp-test-xetabase-branch.yml diff --git a/.github/workflows/tmp-test-xetabase-branch.yml b/.github/workflows/tmp-test-xetabase-branch.yml deleted file mode 100644 index c10d99ec..00000000 --- a/.github/workflows/tmp-test-xetabase-branch.yml +++ /dev/null @@ -1,48 +0,0 @@ -name: TMP test-xetabase-branch -run-name: 'Pull request approve workflow ${{ github.event.pull_request.head.ref }} -> ${{ github.event.pull_request.base.ref }} by @${{ github.actor }}' - -on: - push: - branches: - - TASK-* - - -jobs: - calculate-xetabase-branch: - name: Calculate Xetabase branch - runs-on: ubuntu-22.04 - outputs: - xetabase_branch: ${{ steps.get_xetabase_branch.outputs.xetabase_branch }} - steps: - - name: Clone java-common-libs - uses: actions/checkout@v4 - with: - fetch-depth: '10' - ## This is important to avoid the error in the next step: "fatal: repository 'https://github.com/zetta-genomics/opencga-enterprise.git/' not found" - persist-credentials: false - - id: get_xetabase_branch - name: "Get current branch for Xetabase from target branch" - run: | - if [ "$( git ls-remote https://$ZETTA_REPO_ACCESS_TOKEN@github.com/opencb/opencga.git "TASK-6879" )" ] ; then - echo "OPENCGA TASK-6879 branch"; - fi - - if [ "$( git ls-remote https://$ZETTA_REPO_ACCESS_TOKEN@github.com/zetta-genomics/opencga-enterprise.git "$input_branch" )" ] ; then - echo "Here it is TASK-6807 branch"; - fi - chmod +x ./.github/workflows/scripts/get-xetabase-branch.sh - echo "secrets.ZETTA_REPO_ACCESS_TOKEN: ${{ secrets.ZETTA_REPO_ACCESS_TOKEN }}" | tee -a ${GITHUB_STEP_SUMMARY} - xetabase_branch=$(./.github/workflows/scripts/get-xetabase-branch.sh "TASK-6879" ) - echo "__Xetabase ref:__ \"${xetabase_branch}\"" | tee -a ${GITHUB_STEP_SUMMARY} - echo "xetabase_branch=${xetabase_branch}" >> $GITHUB_OUTPUT - env: - ZETTA_REPO_ACCESS_TOKEN: ${{ secrets.ZETTA_REPO_ACCESS_TOKEN }} - - test: - name: "Run all tests before merging" - needs: calculate-xetabase-branch - uses: opencb/java-common-libs/.github/workflows/test-xetabase-workflow.yml@develop - with: - branch: ${{ needs.calculate-xetabase-branch.outputs.xetabase_branch }} - task: TASK-6879 - secrets: inherit \ No newline at end of file From d0f8720328da4e076d324de467c7f88a69c7d73e Mon Sep 17 00:00:00 2001 From: JuanfeSanahuja Date: Thu, 10 Oct 2024 09:21:28 +0200 Subject: [PATCH 15/21] pom update versions to fix unmerged changes --- commons-datastore/commons-datastore-mongodb/pom.xml | 1 - commons-lib/pom.xml | 1 - pom.xml | 9 ++++++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/commons-datastore/commons-datastore-mongodb/pom.xml b/commons-datastore/commons-datastore-mongodb/pom.xml index af0f669b..294dd6ec 100644 --- a/commons-datastore/commons-datastore-mongodb/pom.xml +++ b/commons-datastore/commons-datastore-mongodb/pom.xml @@ -50,7 +50,6 @@ org.hamcrest hamcrest-core - test junit diff --git a/commons-lib/pom.xml b/commons-lib/pom.xml index 7c6e2bd5..e614697c 100644 --- a/commons-lib/pom.xml +++ b/commons-lib/pom.xml @@ -31,7 +31,6 @@ com.fasterxml.jackson.core jackson-databind - test org.apache.commons diff --git a/pom.xml b/pom.xml index dca9d5d9..0105ec92 100644 --- a/pom.xml +++ b/pom.xml @@ -19,9 +19,9 @@ - 2.11.4 - 3.12.0 - 1.7.32 + 2.14.3 + 3.14.0 + 1.7.36 1.7.7 4.8.2 8.8.2 @@ -296,6 +296,9 @@ * + + * + From da136960a06cc28804f3adee41c39e515cf1ec5a Mon Sep 17 00:00:00 2001 From: JuanfeSanahuja Date: Thu, 10 Oct 2024 09:22:46 +0200 Subject: [PATCH 16/21] pom update versions to fix unmerged changes --- commons-lib/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/commons-lib/pom.xml b/commons-lib/pom.xml index e614697c..e3871111 100644 --- a/commons-lib/pom.xml +++ b/commons-lib/pom.xml @@ -66,7 +66,6 @@ com.fasterxml.jackson.core jackson-databind - test commons-io From 32b5f40a14346efa15eb907125d3dacb1d99ff6d Mon Sep 17 00:00:00 2001 From: JuanfeSanahuja Date: Thu, 10 Oct 2024 09:23:33 +0200 Subject: [PATCH 17/21] pom update versions to fix unmerged changes --- commons-lib/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/commons-lib/pom.xml b/commons-lib/pom.xml index e3871111..e614697c 100644 --- a/commons-lib/pom.xml +++ b/commons-lib/pom.xml @@ -66,6 +66,7 @@ com.fasterxml.jackson.core jackson-databind + test commons-io From 923964e8eace7d9c256a7a1056398abbd1f5dd0f Mon Sep 17 00:00:00 2001 From: JuanfeSanahuja Date: Thu, 10 Oct 2024 09:25:39 +0200 Subject: [PATCH 18/21] Delete duplicated jackson-databind library --- commons-lib/pom.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/commons-lib/pom.xml b/commons-lib/pom.xml index e614697c..cf0e9bd5 100644 --- a/commons-lib/pom.xml +++ b/commons-lib/pom.xml @@ -63,11 +63,6 @@ slf4j-simple test - - com.fasterxml.jackson.core - jackson-databind - test - commons-io commons-io From 55ac86e2a1dfce71807c260c507794148cb8a3db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joaqu=C3=ADn=20T=C3=A1rraga=20Gim=C3=A9nez?= Date: Thu, 10 Oct 2024 11:41:16 +0200 Subject: [PATCH 19/21] test: fix JUnit test, #TASK-4974 --- .../datastore/mongodb/MongoDBCollectionTest.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/commons-datastore/commons-datastore-mongodb/src/test/java/org/opencb/commons/datastore/mongodb/MongoDBCollectionTest.java b/commons-datastore/commons-datastore-mongodb/src/test/java/org/opencb/commons/datastore/mongodb/MongoDBCollectionTest.java index f33b7033..377d610c 100644 --- a/commons-datastore/commons-datastore-mongodb/src/test/java/org/opencb/commons/datastore/mongodb/MongoDBCollectionTest.java +++ b/commons-datastore/commons-datastore-mongodb/src/test/java/org/opencb/commons/datastore/mongodb/MongoDBCollectionTest.java @@ -441,15 +441,13 @@ public void testAggregate() { queryResult = mongoDBCollection.aggregate(dbObjectList, new QueryOptions(QueryOptions.LIMIT, 1).append(QueryOptions.SKIP, 0)); assertEquals("There must be 1 results", 1, queryResult.getResults().size()); - assertTrue(queryResult.getResults().contains(result.get(0))); + // As the order of result list change between executions, we must ensure the assertTrue doesn't depend on the order + assertTrue(result.contains(queryResult.getResults().get(0))); queryResult = mongoDBCollection.aggregate(dbObjectList, new QueryOptions(QueryOptions.LIMIT, 1).append(QueryOptions.SKIP, 1)); assertEquals("There must be 1 results", 1, queryResult.getResults().size()); - - System.out.println("result = " + result); - System.out.println("queryResult.getResults() = " + queryResult.getResults()); - - assertTrue(queryResult.getResults().contains(result.get(1))); + // As the order of result list change between executions, we must ensure the assertTrue doesn't depend on the order + assertTrue(result.contains(queryResult.getResults().get(0))); } @Test From 507c5dce8f82201cb3339545ac98fdbf64681ee7 Mon Sep 17 00:00:00 2001 From: JuanfeSanahuja Date: Tue, 15 Oct 2024 15:19:23 +0200 Subject: [PATCH 20/21] Prepare release 5.3.0 --- commons-datastore/commons-datastore-core/pom.xml | 2 +- commons-datastore/commons-datastore-mongodb/pom.xml | 2 +- commons-datastore/commons-datastore-solr/pom.xml | 2 +- commons-datastore/pom.xml | 2 +- commons-lib/pom.xml | 2 +- pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/commons-datastore/commons-datastore-core/pom.xml b/commons-datastore/commons-datastore-core/pom.xml index ed5c139e..dfa4bf70 100644 --- a/commons-datastore/commons-datastore-core/pom.xml +++ b/commons-datastore/commons-datastore-core/pom.xml @@ -6,7 +6,7 @@ org.opencb.commons commons-datastore - 5.3.0-SNAPSHOT + 5.3.0 ../pom.xml diff --git a/commons-datastore/commons-datastore-mongodb/pom.xml b/commons-datastore/commons-datastore-mongodb/pom.xml index 294dd6ec..c44b9cc0 100644 --- a/commons-datastore/commons-datastore-mongodb/pom.xml +++ b/commons-datastore/commons-datastore-mongodb/pom.xml @@ -6,7 +6,7 @@ org.opencb.commons commons-datastore - 5.3.0-SNAPSHOT + 5.3.0 ../pom.xml diff --git a/commons-datastore/commons-datastore-solr/pom.xml b/commons-datastore/commons-datastore-solr/pom.xml index 698f327e..45eb7f44 100644 --- a/commons-datastore/commons-datastore-solr/pom.xml +++ b/commons-datastore/commons-datastore-solr/pom.xml @@ -22,7 +22,7 @@ org.opencb.commons commons-datastore - 5.3.0-SNAPSHOT + 5.3.0 ../pom.xml diff --git a/commons-datastore/pom.xml b/commons-datastore/pom.xml index db85378f..ee91c649 100644 --- a/commons-datastore/pom.xml +++ b/commons-datastore/pom.xml @@ -6,7 +6,7 @@ org.opencb.commons commons - 5.3.0-SNAPSHOT + 5.3.0 ../pom.xml diff --git a/commons-lib/pom.xml b/commons-lib/pom.xml index cf0e9bd5..1d463eca 100644 --- a/commons-lib/pom.xml +++ b/commons-lib/pom.xml @@ -6,7 +6,7 @@ org.opencb.commons commons - 5.3.0-SNAPSHOT + 5.3.0 ../pom.xml diff --git a/pom.xml b/pom.xml index 0105ec92..eee09ada 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.opencb.commons commons - 5.3.0-SNAPSHOT + 5.3.0 pom OpenCB commons project From 3acfb33e1f3d36958ebad9a852de1d8de8382013 Mon Sep 17 00:00:00 2001 From: JuanfeSanahuja Date: Thu, 17 Oct 2024 10:17:30 +0200 Subject: [PATCH 21/21] Prepare Port Patch 5.3.0 -> 6.0.0 Xetabase 2.3.0 -> 3.0.0 #TASK-7097 --- commons-datastore/commons-datastore-core/pom.xml | 2 +- commons-datastore/commons-datastore-mongodb/pom.xml | 2 +- commons-datastore/commons-datastore-solr/pom.xml | 2 +- commons-datastore/pom.xml | 2 +- commons-lib/pom.xml | 2 +- pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/commons-datastore/commons-datastore-core/pom.xml b/commons-datastore/commons-datastore-core/pom.xml index dfa4bf70..f75e11a9 100644 --- a/commons-datastore/commons-datastore-core/pom.xml +++ b/commons-datastore/commons-datastore-core/pom.xml @@ -6,7 +6,7 @@ org.opencb.commons commons-datastore - 5.3.0 + 6.0.0-SNAPSHOT ../pom.xml diff --git a/commons-datastore/commons-datastore-mongodb/pom.xml b/commons-datastore/commons-datastore-mongodb/pom.xml index c44b9cc0..842daef6 100644 --- a/commons-datastore/commons-datastore-mongodb/pom.xml +++ b/commons-datastore/commons-datastore-mongodb/pom.xml @@ -6,7 +6,7 @@ org.opencb.commons commons-datastore - 5.3.0 + 6.0.0-SNAPSHOT ../pom.xml diff --git a/commons-datastore/commons-datastore-solr/pom.xml b/commons-datastore/commons-datastore-solr/pom.xml index 45eb7f44..789a9a91 100644 --- a/commons-datastore/commons-datastore-solr/pom.xml +++ b/commons-datastore/commons-datastore-solr/pom.xml @@ -22,7 +22,7 @@ org.opencb.commons commons-datastore - 5.3.0 + 6.0.0-SNAPSHOT ../pom.xml diff --git a/commons-datastore/pom.xml b/commons-datastore/pom.xml index ee91c649..1e503e66 100644 --- a/commons-datastore/pom.xml +++ b/commons-datastore/pom.xml @@ -6,7 +6,7 @@ org.opencb.commons commons - 5.3.0 + 6.0.0-SNAPSHOT ../pom.xml diff --git a/commons-lib/pom.xml b/commons-lib/pom.xml index 1d463eca..a660edcf 100644 --- a/commons-lib/pom.xml +++ b/commons-lib/pom.xml @@ -6,7 +6,7 @@ org.opencb.commons commons - 5.3.0 + 6.0.0-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index eee09ada..ec022c4f 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.opencb.commons commons - 5.3.0 + 6.0.0-SNAPSHOT pom OpenCB commons project