Merge branch 'develop' into TASK-7214

opencb · Feb 6, 2025 · 051ffb8 · 051ffb8
2 parents 58f7289 + a3359bc
commit 051ffb8
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 11 deletions.
diff --git a/.github/workflows/publish-test-report-workflow.yml b/.github/workflows/publish-test-report-workflow.yml
@@ -1,4 +1,4 @@
-name: Reusable workflow to push in DockerHub
+name: Publish test report workflow
 
 on:
   workflow_call:

diff --git a/.github/workflows/release-github-workflow.yml b/.github/workflows/release-github-workflow.yml
@@ -20,7 +20,7 @@ jobs:
         with:
           name: ${{ inputs.artifact }}
       - name: GitHub Release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         if: startsWith(github.ref, 'refs/tags/')
         with:
           name: ${{ github.ref_name }}

diff --git a/.github/workflows/test-xetabase-workflow.yml b/.github/workflows/test-xetabase-workflow.yml
@@ -51,13 +51,10 @@ jobs:
           path: opencga-enterprise
           fetch-depth: "10"
       - id: get_opencga_branch
-        name: Get OpenCGA branch from 'pom.xml' property
+        name: Get OpenCGA branch
         run: |
-          pwd
-          ls -lrtha
-          ls -lrtha ./opencga-enterprise
           chmod +x ./opencga-enterprise/.github/workflows/scripts/get-opencga-xetabase-branch.sh
-          opencga_branch=$(./opencga-enterprise/.github/workflows/scripts/get-opencga-xetabase-branch.sh)
+          opencga_branch=$(./opencga-enterprise/.github/workflows/scripts/get-opencga-xetabase-branch.sh "${{ inputs.task }}")
           echo "opencga_branch=${opencga_branch}"
           echo "opencga_branch=${opencga_branch}" >> $GITHUB_OUTPUT
       - name: Clone OpenCGA branch '${{ steps.get_opencga_branch.outputs.opencga_branch }}'

diff --git a/commons-datastore/commons-datastore-solr/pom.xml b/commons-datastore/commons-datastore-solr/pom.xml
@@ -34,7 +34,6 @@
             <groupId>org.opencb.commons</groupId>
             <artifactId>commons-datastore-core</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.apache.solr</groupId>
             <artifactId>solr-solrj</artifactId>
@@ -52,5 +51,4 @@
             <artifactId>slf4j-api</artifactId>
         </dependency>
     </dependencies>
-
 </project>
diff --git a/pom.xml b/pom.xml
@@ -23,15 +23,14 @@
         <apache.commons.lang3.version>3.14.0</apache.commons.lang3.version>
         <slf4j.version>1.7.36</slf4j.version>
         <avro.version>1.7.7</avro.version>
-        <mongodb.version>4.8.2</mongodb.version>
+        <mongodb.version>4.11.4</mongodb.version>
         <solr.version>8.8.2</solr.version>
         <jcommander.version>1.69</jcommander.version>
         <ant.version>1.10.12</ant.version>
         <jansi.version>2.4.0</jansi.version>
         <hamcrest.version>1.3</hamcrest.version>
         <junit.version>4.13.2</junit.version>
         <!-- Other properties -->
-
         <sonar.organization>opencb</sonar.organization>
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>
         <maven.compiler.source>1.8</maven.compiler.source>