Merge pull request #11093 from IQSS/develop

merge the “develop” branch into the “master”
IQSS · Dec 12, 2024 · d9cc5eb · d9cc5eb
2 parents 906f874 + a4d0127
commit d9cc5eb
Show file tree

Hide file tree

Showing 171 changed files with 7,785 additions and 3,206 deletions.
diff --git a/.env b/.env
@@ -1,5 +1,5 @@
 APP_IMAGE=gdcc/dataverse:unstable
-POSTGRES_VERSION=16
+POSTGRES_VERSION=17
 DATAVERSE_DB_USER=dataverse
 SOLR_VERSION=9.3.0
-SKIP_DEPLOY=0
+SKIP_DEPLOY=0
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -2,7 +2,7 @@
 
 **Which issue(s) this PR closes**:
 
-Closes #
+- Closes #
 
 **Special notes for your reviewer**:
 

diff --git a/.github/workflows/deploy_beta_testing.yml b/.github/workflows/deploy_beta_testing.yml
@@ -5,14 +5,18 @@ on:
     branches:
       - develop
 
+concurrency:
+  group: deploy-beta-testing
+  cancel-in-progress: false
+
 jobs:
   build:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - uses: actions/setup-java@v3
+      - uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: '17'
@@ -32,7 +36,7 @@ jobs:
         run: echo "war_file=$(ls *.war | head -1)">> $GITHUB_ENV
 
       - name: Upload war artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: built-app
           path: ./target/${{ env.war_file }}
@@ -42,10 +46,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Download war artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: built-app
           path: ./

diff --git a/.github/workflows/guides_build_sphinx.yml b/.github/workflows/guides_build_sphinx.yml
@@ -11,6 +11,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - uses: OdumInstitute/sphinx-action@master
+    - uses: uncch-rdmc/sphinx-action@master
       with:
         docs-folder: "doc/sphinx-guides/"
diff --git a/.github/workflows/maven_unit_test.yml b/.github/workflows/maven_unit_test.yml
@@ -32,9 +32,9 @@ jobs:
         steps:
           # TODO: As part of #10618 change to setup-maven custom action
           # Basic setup chores
-          - uses: actions/checkout@v3
+          - uses: actions/checkout@v4
           - name: Set up JDK ${{ matrix.jdk }}
-            uses: actions/setup-java@v3
+            uses: actions/setup-java@v4
             with:
                 java-version: ${{ matrix.jdk }}
                 distribution: temurin
@@ -57,7 +57,7 @@ jobs:
 
           # Upload the built war file. For download, it will be wrapped in a ZIP by GitHub.
           # See also https://github.com/actions/upload-artifact#zipped-artifact-downloads
-          - uses: actions/upload-artifact@v3
+          - uses: actions/upload-artifact@v4
             with:
                 name: dataverse-java${{ matrix.jdk }}.war
                 path: target/dataverse*.war
@@ -67,7 +67,7 @@ jobs:
           - run: |
                 tar -cvf java-builddir.tar target
                 tar -cvf java-m2-selection.tar ~/.m2/repository/io/gdcc/dataverse-*
-          - uses: actions/upload-artifact@v3
+          - uses: actions/upload-artifact@v4
             with:
                 name: java-artifacts
                 path: |
@@ -98,16 +98,16 @@ jobs:
         steps:
             # TODO: As part of #10618 change to setup-maven custom action
             # Basic setup chores
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
             - name: Set up JDK ${{ matrix.jdk }}
-              uses: actions/setup-java@v3
+              uses: actions/setup-java@v4
               with:
                   java-version: ${{ matrix.jdk }}
                   distribution: temurin
                   cache: maven
 
             # Get the build output from the unit test job
-            - uses: actions/download-artifact@v3
+            - uses: actions/download-artifact@v4
               with:
                   name: java-artifacts
             - run: |
@@ -119,7 +119,7 @@ jobs:
 
             # Wrap up and send to coverage job
             - run: tar -cvf java-reportdir.tar target/site
-            - uses: actions/upload-artifact@v3
+            - uses: actions/upload-artifact@v4
               with:
                   name: java-reportdir
                   path: java-reportdir.tar
@@ -132,15 +132,15 @@ jobs:
         steps:
             # TODO: As part of #10618 change to setup-maven custom action
             # Basic setup chores
-          - uses: actions/checkout@v3
-          - uses: actions/setup-java@v3
+          - uses: actions/checkout@v4
+          - uses: actions/setup-java@v4
             with:
                 java-version: '17'
                 distribution: temurin
                 cache: maven
 
           # Get the build output from the integration test job
-          - uses: actions/download-artifact@v3
+          - uses: actions/download-artifact@v4
             with:
                 name: java-reportdir
           - run: tar -xvf java-reportdir.tar

diff --git a/conf/solr/schema.xml b/conf/solr/schema.xml
@@ -234,6 +234,7 @@
     <field name="datasetValid" type="boolean" stored="true" indexed="true" multiValued="false"/>
 
     <field name="license" type="string" stored="true" indexed="true" multiValued="false"/>
+    <field name="fileCount" type="plong" stored="true" indexed="true" multiValued="false"/>
 
     <!--
         METADATA SCHEMA FIELDS