Merge branch 'develop' into 11824-long-metadata-values-break-the-table-layout

Author: stevenferey

.github/actions/setup-maven/action.yml

@@ -23,7 +23,7 @@ runs:
         echo "JAVA_VERSION=$(grep '<target.java.version>' ${GITHUB_WORKSPACE}/modules/dataverse-parent/pom.xml | cut -f2 -d'>' | cut -f1 -d'<')" | tee -a ${GITHUB_ENV}
     - name: Set up JDK ${{ env.JAVA_VERSION }}
       id: setup-java
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v5
       with:
         java-version: ${{ env.JAVA_VERSION }}
         distribution: 'temurin'

.github/workflows/container_app_pr.yml

@@ -23,7 +23,7 @@ jobs:
             - uses: actions/checkout@v5
               with:
                   ref: 'refs/pull/${{ github.event.client_payload.pull_request.number }}/merge'
-            - uses: actions/setup-java@v4
+            - uses: actions/setup-java@v5
               with:
                   java-version: "17"
                   distribution: 'adopt'

.github/workflows/deploy_beta_testing.yml

@@ -16,7 +16,7 @@ jobs:
     steps:
       - uses: actions/checkout@v5
 
-      - uses: actions/setup-java@v4
+      - uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
           java-version: '17'

.github/workflows/maven_cache_management.yml

@@ -36,7 +36,7 @@ jobs:
             - name: Determine Java version from Parent POM
               run: echo "JAVA_VERSION=$(grep '<target.java.version>' modules/dataverse-parent/pom.xml | cut -f2 -d'>' | cut -f1 -d'<')" >> ${GITHUB_ENV}
             - name: Set up JDK ${{ env.JAVA_VERSION }}
-              uses: actions/setup-java@v4
+              uses: actions/setup-java@v5
               with:
                   java-version: ${{ env.JAVA_VERSION }}
                   distribution: temurin

.github/workflows/maven_unit_test.yml

@@ -39,7 +39,7 @@ jobs:
           # Basic setup chores
           - uses: actions/checkout@v5
           - name: Set up JDK ${{ matrix.jdk }}
-            uses: actions/setup-java@v4
+            uses: actions/setup-java@v5
             with:
                 java-version: ${{ matrix.jdk }}
                 distribution: temurin
@@ -105,7 +105,7 @@ jobs:
             # Basic setup chores
             - uses: actions/checkout@v5
             - name: Set up JDK ${{ matrix.jdk }}
-              uses: actions/setup-java@v4
+              uses: actions/setup-java@v5
               with:
                   java-version: ${{ matrix.jdk }}
                   distribution: temurin
@@ -138,7 +138,7 @@ jobs:
             # TODO: As part of #10618 change to setup-maven custom action
             # Basic setup chores
           - uses: actions/checkout@v5
-          - uses: actions/setup-java@v4
+          - uses: actions/setup-java@v5
             with:
                 java-version: '17'
                 distribution: temurin

.github/workflows/spi_release.yml

@@ -38,7 +38,7 @@ jobs:
         if: github.event_name == 'pull_request' && needs.check-secrets.outputs.available == 'true'
         steps:
             - uses: actions/checkout@v5
-            - uses: actions/setup-java@v4
+            - uses: actions/setup-java@v5
               with:
                   java-version: '17'
                   distribution: 'adopt'
@@ -64,7 +64,7 @@ jobs:
         if: github.event_name == 'push' && needs.check-secrets.outputs.available == 'true'
         steps:
             -   uses: actions/checkout@v5
-            -   uses: actions/setup-java@v4
+            -   uses: actions/setup-java@v5
                 with:
                     java-version: '17'
                     distribution: 'adopt'
@@ -76,7 +76,7 @@ jobs:
 
             # Running setup-java again overwrites the settings.xml - IT'S MANDATORY TO DO THIS SECOND SETUP!!!
             -   name: Set up Maven Central Repository
-                uses: actions/setup-java@v4
+                uses: actions/setup-java@v5
                 with:
                     java-version: '17'
                     distribution: 'adopt'

conf/keycloak/builtin-users-spi/pom.xml

@@ -100,7 +100,7 @@
     </build>
 
     <properties>
-        <keycloak.version>26.3.2</keycloak.version>
+        <keycloak.version>26.3.4</keycloak.version>
         <java.version>17</java.version>
         <jakarta.persistence.version>3.2.0</jakarta.persistence.version>
         <mindrot.jbcrypt.version>0.4</mindrot.jbcrypt.version>

doc/release-notes/11387-modify-input-level-api.md

@@ -0,0 +1,3 @@
+### Update Collection Input Level API Changed
+
+- This endpoint will no longer delete the custom input levels previously modified for the given collection. In order to update a previously modified custom input level, it must be included in the JSON provided to the api.

doc/release-notes/11695-change-api-get-storage-driver.md

@@ -0,0 +1,12 @@
+## Get Dataset/Dataverse Storage Driver API
+
+### Changed Json response - breaking change!
+
+The API for getting the Storage Driver info has been changed/extended.
+/api/datasets/{identifier}/storageDriver
+/api/admin/dataverse/{dataverse-alias}/storageDriver
+changed "message" to "name" and added "type" and "label"
+
+Also added query param for /api/admin/dataverse/{dataverse-alias}/storageDriver?getEffective=true to recurse the chain of parents to find the effective storageDriver
+
+See also [the guides](https://dataverse-guide--11664.org.readthedocs.build/en/11664/api/native-api.html#configure-a-dataset-to-store-all-new-files-in-a-specific-file-store), #11695, and #11664.

doc/release-notes/11783-Curation-Status-fixes.md

@@ -0,0 +1 @@
+In prior versions of Dataverse, publishing a dataset via the superuser only update-current-version option would not set the current curation status (if enabled/used) to none/empty and, in v6.7, would not maintain the curation status history. These issues are now resolved and the update current version option works the same as normal publication of a new version w.r.t. curation status.