Merge remote-tracking branch 'IQSS/develop' into DANS-performance

Author: qqmyers

.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: ./

.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

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

doc/release-notes/10117-guestbook-question-size-limit-raised.md

@@ -0,0 +1 @@
+Custom questions in Guestbooks can now be more than 255 characters and the bug causing a silent failure when questions were longer than this limit has been fixed.

doc/release-notes/10661-guestbook-email-bug-fix.md

@@ -0,0 +1,4 @@
+
+### Guestbook Email Validation Bug fix
+
+Guestbook UI Form: Email address is now checked for valid email format

doc/release-notes/10708 - MDC Citation and DOI parsing improvements.md

@@ -1,3 +1,3 @@
 MDC Citation retrieval with the PID settings has been fixed.
-DOI parsing in Dataverse is case insensitive, improving interaction with services that may change the case.
+PID parsing in Dataverse is now case insensitive, improving interaction with services that may change the case of PIDs.
 Warnings related to managed/excluded PID lists for PID providers have been reduced

doc/release-notes/10793-optimisticlockexception handling.md

@@ -0,0 +1,2 @@
+Improvements have been made in handling the errors when a dataset has been edited in one window and an attempt is made to
+edit/publish it in another. 

doc/release-notes/10837-exclude-others-ns-harvesting-oai-dc.md

@@ -0,0 +1,3 @@
+Some repository extend the "oai_dc" metadata prefix with specific namespaces. In this case, harvesting of these datasets is not possible, as an XML parsing error is raised.
+
+The PR [#10837](https://github.com/IQSS/dataverse/pull/10837) allows the harvesting of these datasets by excluding tags with namespaces that are not "dc:", and harvest only metadata with the "dc" namespace.

doc/release-notes/10888-add-api-for-comparing-dataset-versions.md

@@ -0,0 +1,21 @@
+The following API have been added:
+
+/api/datasets/{persistentId}/versions/{versionId0}/compare/{versionId1}
+
+This API lists the changes between 2 dataset versions. The Json response shows the changes per field within the Metadata block and the Terms Of Access. Also listed are the files that have been added or removed. Files that have been modified will also display the new file data plus the fields that have been modified.
+When compare includes an unpublished/draft version the api token must be associated with a user having view unpublished privileges
+An error will be returned if VERSION0 was not created before VERSION1
+
+Example of Metadata Block field change:
+```json
+{
+  "blockName": "Life Sciences Metadata",
+  "changed": [
+    {
+      "fieldName": "Design Type",
+      "oldValue": "",
+      "newValue": "Parallel Group Design; Nested Case Control Design"
+    }
+  ]
+}
+```

doc/release-notes/11012-get-dataverse-api-ext.md

@@ -0,0 +1 @@
+The JSON payload of the getDataverse endpoint has been extended to include properties isMetadataBlockRoot and isFacetRoot.