uncch-rdmc · srmanda-cs · Jul 14, 2026 · Mar 24, 2026 · Mar 24, 2026 · Mar 24, 2026
@@ -53,16 +53,16 @@ services:
         -Ddataverse.files.localstack1.download-redirect=true
         -Ddataverse.files.localstack1.access-key=default
         -Ddataverse.files.localstack1.secret-key=default
-        -Ddataverse.files.minio1.type=s3
-        -Ddataverse.files.minio1.label=MinIO
-        -Ddataverse.files.minio1.custom-endpoint-url=http://minio:9000
-        -Ddataverse.files.minio1.custom-endpoint-region=us-east-1
-        -Ddataverse.files.minio1.bucket-name=mybucket
-        -Ddataverse.files.minio1.path-style-access=true
-        -Ddataverse.files.minio1.upload-redirect=false
-        -Ddataverse.files.minio1.download-redirect=false
-        -Ddataverse.files.minio1.access-key=4cc355_k3y
-        -Ddataverse.files.minio1.secret-key=s3cr3t_4cc355_k3y
+        -Ddataverse.files.localstack_noredirect.type=s3
+        -Ddataverse.files.localstack_noredirect.label=LocalStackNoRedirect
+        -Ddataverse.files.localstack_noredirect.custom-endpoint-url=http://localstack:4566
+        -Ddataverse.files.localstack_noredirect.custom-endpoint-region=us-east-2
+        -Ddataverse.files.localstack_noredirect.bucket-name=mybucket-noredirect
+        -Ddataverse.files.localstack_noredirect.path-style-access=true
+        -Ddataverse.files.localstack_noredirect.upload-redirect=false
+        -Ddataverse.files.localstack_noredirect.download-redirect=false
+        -Ddataverse.files.localstack_noredirect.access-key=default
+        -Ddataverse.files.localstack_noredirect.secret-key=default
         -Ddataverse.pid.providers=fake
         -Ddataverse.pid.default-provider=fake
         -Ddataverse.pid.fake.type=FAKE
@@ -260,23 +260,6 @@ services:
     tmpfs:
       - /localstack:mode=770,size=128M,uid=1000,gid=1000
 
-  dev_minio:
-    container_name: "dev_minio"
-    hostname: "minio"
-    image: minio/minio
-    restart: on-failure
-    ports:
-      - "9000:9000"
-      - "9001:9001"
-    networks:
-      - dataverse
-    volumes:
-      - ./docker-dev-volumes/minio_storage:/data
-    environment:
-      MINIO_ROOT_USER: 4cc355_k3y
-      MINIO_ROOT_PASSWORD: s3cr3t_4cc355_k3y
-    command: server /data
-
   previewers-provider:
     container_name: previewers-provider
     hostname: previewers-provider

diff --git a/conf/localstack/buckets.sh b/conf/localstack/buckets.sh
@@ -1,3 +1,4 @@
 #!/usr/bin/env bash
 # https://stackoverflow.com/questions/53619901/auto-create-s3-buckets-on-localstack
 awslocal s3 mb s3://mybucket
+awslocal s3 mb s3://mybucket-noredirect
diff --git a/doc/release-notes/11397-support-html-in-file-level-description.md b/doc/release-notes/11397-support-html-in-file-level-description.md
@@ -0,0 +1,2 @@
+## Feature Request
+File metadata description will now support html in JSF UI. Is already supported in SPA.
diff --git a/doc/release-notes/12076-non-superuser-dataverse-linking.md b/doc/release-notes/12076-non-superuser-dataverse-linking.md
@@ -0,0 +1 @@
+Dataverse collection linking and unlinking no longer requires superuser status. Users with the "Link Dataverse" permission on a collection can now perform these actions through the UI and API.
diff --git a/doc/release-notes/12200-async-reindexing-permissions.md b/doc/release-notes/12200-async-reindexing-permissions.md
@@ -0,0 +1,9 @@
+# Asynchronous Permissions Reindexing
+
+The previously undocumented Solr permissions reindexing API endpoints have been improved.
+
+- The endpoints are `/api/admin/index/perms` (asynchronous, all objects) and `/api/admin/index/perms/{id}` (synchronous, single object) now use POST instead of GET
+- Both endpoints require superuser access.
+- For the asynchronous reindex all endpoint, if an indexing process is already in progress, the API will return a 409 Conflict status.
+- The asynchronous reindex all endpoint no longer runs as a single transaction. This avoids potential timeouts in larger installations.
+- These endpoints are now documented in the Solr Search Index section of the Admin Guide.
diff --git a/doc/release-notes/12412-fixed-license-acceptance-popup-for-archival-format.md b/doc/release-notes/12412-fixed-license-acceptance-popup-for-archival-format.md
@@ -0,0 +1 @@
+Fixed an issue where, in some cases, the license acceptance pop-up for the archival format option did not display correctly when downloading a complete dataset.
diff --git a/doc/release-notes/12439-openapi.md b/doc/release-notes/12439-openapi.md
@@ -0,0 +1,7 @@
+## Updates for API Users
+
+- The quality of the OpenAPI document has been greatly improved, increasing from 10/100 to 98/100 according [vacuum](https://quobix.com/vacuum/). See [the guides](https://dataverse-guide--12439.org.readthedocs.build/en/12439/api/getting-started.html#getting-the-openapi-document) and #12439.
+
+## Updates for Developers
+
+- If you are adding or updating Dataverse APIs you are now required to add OpenAPI annotations. See [the guides](https://dataverse-guide--12439.org.readthedocs.build/en/12439/developers/api-design.html#openapi) and #12439.
diff --git a/doc/sphinx-guides/source/admin/dataverses-datasets.rst b/doc/sphinx-guides/source/admin/dataverses-datasets.rst
@@ -22,14 +22,14 @@ Moves a Dataverse collection whose id is passed to an existing Dataverse collect
 Link a Dataverse Collection
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Creates a link between a Dataverse collection and another Dataverse collection (see the :ref:`dataverse-linking` section of the User Guide for more information). Only accessible to superusers. ::
+Creates a link between a Dataverse collection and another Dataverse collection (see the :ref:`dataverse-linking` section of the User Guide for more information). ::
 
     curl -H "X-Dataverse-key: $API_TOKEN" -X PUT http://$SERVER/api/dataverses/$linked-dataverse-alias/link/$linking-dataverse-alias
 
 Unlink a Dataverse Collection
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Removes a link between a Dataverse collection and another Dataverse collection. Only accessible to superusers. ::
+Removes a link between a Dataverse collection and another Dataverse collection. Accessible to users with Link Dataverse permission on the linking Dataverse collection.  ::
 
     curl -H "X-Dataverse-key: $API_TOKEN" -X DELETE http://$SERVER/api/dataverses/$linked-dataverse-alias/deleteLink/$linking-dataverse-alias
 

diff --git a/doc/sphinx-guides/source/admin/solr-search-index.rst b/doc/sphinx-guides/source/admin/solr-search-index.rst
@@ -96,6 +96,37 @@ This API will clear the Solr entry for the dataset specified. It can be useful i
 This can be reversed of course by re-indexing the dataset with the API above. 
 
 
+Reindexing Permissions
+----------------------
+
+It is possible to just re-index the permissions on Solr entries without re-indexing the content.
+
+Reindexing Permissions for All Objects
+++++++++++++++++++++++++++++++++++++++
+
+Re-index permissions for all Dataverse collections, datasets, and files. This is an asynchronous operation that may take a long time to complete on large installations. This endpoint requires the API token of a superuser.
+
+.. code-block:: bash
+
+  export SERVER_URL=https://demo.dataverse.org
+  curl -X POST -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/admin/index/perms"
+
+If indexing is already in progress, the API will return a 409 ("CONFLICT") response. Otherwise, it will return a 200 ("OK") response and the indexing process will start in the background. Check the server logs for progress.
+
+Reindexing Permissions for a Single Object
+++++++++++++++++++++++++++++++++++++++++++
+
+It is also possible to re-index permissions for a single object by database ID:
+
+.. code-block:: bash
+
+  export SERVER_URL=https://demo.dataverse.org
+  export ID=42
+  curl -X POST -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/admin/index/perms/$ID"
+
+This operation is performed synchronously.
+
+
 Manually Querying Solr
 ----------------------
 

diff --git a/doc/sphinx-guides/source/api/changelog.rst b/doc/sphinx-guides/source/api/changelog.rst
@@ -7,9 +7,16 @@ This API changelog is experimental and we would love feedback on its usefulness.
     :local:
     :depth: 1
 
-v6.11
+v6.12
 -----
+- The permission reindexing endpoints have been updated to use ``POST`` and require superuser access. They are now documented in the :doc:`/admin/solr-search-index` guide.
+
+  - **/api/admin/index/perms**
+
+  - **/api/admin/index/perms/{id}**
 
+v6.11
+-----
 - The GET /api/mydata/retrieve, if the search returns no data, now includes the "data" block with 0 results. The message that was returned in "error_message" will be returned in "message" and the "success" will be `true`. All other errors will continue to reply with "success":false and the error message in "error_message".
 - The endpoints GET, PUT AND DELETE for `/api/admin/dataverse/{alias}/storageDriver` have been moved to `/api/dataverses/{alias}/storageDriver`.
 - The endpoint `/api/admin/dataverse/storageDrivers` has been moved and renamed to `/api/dataverses/{alias}/allowedStorageDrivers`. Regarding the change of the name, this endpoint will in the future only display the storageDrivers that are allowed on the specified collection, as of now, it will display the entire list of available Drivers on the installation.

diff --git a/doc/sphinx-guides/source/api/getting-started.rst b/doc/sphinx-guides/source/api/getting-started.rst
@@ -178,7 +178,9 @@ The fully expanded example above (without environment variables) looks like this
 
   curl "https://demo.dataverse.org/openapi?format=json"
 
-We are aware that our OpenAPI document is not perfect. You can find more information about validating the document under :ref:`openapi-dev` in the Developer Guide.
+If you have feedback about the our OpenAPI document, please contact us through the usual channels under :ref:`getting-help-with-apis`.
+
+You can find more information about validating the document under :ref:`openapi-dev` in the Developer Guide.
 
 Beyond "Getting Started" Tasks
 ------------------------------

diff --git a/doc/sphinx-guides/source/api/native-api.rst b/doc/sphinx-guides/source/api/native-api.rst
@@ -3746,6 +3746,66 @@ The fully expanded example above (without environment variables) looks like this
 
   curl -H "X-Dataverse-key: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X PUT "https://demo.dataverse.org/api/datasets/24/link/test"
 
+Unlink a Dataset
+~~~~~~~~~~~~~~~~
+
+Removes a link between a dataset and a Dataverse collection (see :ref:`dataset-linking` section of Dataverse Collection Management in the User Guide for more information):
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export DATASET_ID=24
+  export DATAVERSE_ID=test
+
+  curl -H "X-Dataverse-key: $API_TOKEN" -X DELETE "$SERVER_URL/api/datasets/$DATASET_ID/deleteLink/$DATAVERSE_ID"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X DELETE "https://demo.dataverse.org/api/datasets/24/deleteLink/test"
+
+Link a Dataverse collection
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Creates a link between one Dataverse collection and another Dataverse collection (see :ref:`dataverse-linking` section of Dataverse Collection Management in the User Guide for more information):
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export LINKED_DATAVERSE_ID=linked-collection
+  export LINKING_DATAVERSE_ID=linking-collection
+
+  curl -H "X-Dataverse-key: $API_TOKEN" -X PUT "$SERVER_URL/api/dataverses/$LINKED_DATAVERSE_ID/link/$LINKING_DATAVERSE_ID"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X PUT "https://demo.dataverse.org/api/dataverses/linked-collection/link/linking-collection"
+
+Unlink a Dataverse collection
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Removes a link between one Dataverse collection and another Dataverse collection (see :ref:`dataverse-linking` section of Dataverse Collection Management in the User Guide for more information):
+
+.. code-block:: bash
+
+  export API_TOKEN=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+  export SERVER_URL=https://demo.dataverse.org
+  export LINKED_DATAVERSE_ID=linked-collection
+  export LINKING_DATAVERSE_ID=linking-collection
+
+  curl -H "X-Dataverse-key: $API_TOKEN" -X DELETE "$SERVER_URL/api/dataverses/$LINKED_DATAVERSE_ID/deleteLink/$LINKING_DATAVERSE_ID"
+
+The fully expanded example above (without environment variables) looks like this:
+
+.. code-block:: bash
+
+  curl -H "X-Dataverse-key: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" -X DELETE "https://demo.dataverse.org/api/dataverses/linked-collection/deleteLink/linking-collection"
+
 Dataset Locks
 ~~~~~~~~~~~~~
 

diff --git a/doc/sphinx-guides/source/developers/api-design.rst b/doc/sphinx-guides/source/developers/api-design.rst
@@ -14,13 +14,39 @@ OpenAPI
 
 As you add API endpoints, please be conscious that we are exposing these endpoints as an OpenAPI document at ``/openapi`` (e.g. http://localhost:8080/openapi ). See :ref:`openapi` in the API Guide for the user-facing documentation.
 
-We've played around with validation tools such as https://quobix.com/vacuum/ and https://pb33f.io/doctor/ only to discover that our OpenAPI output is less than ideal, generating various warnings and errors.
+OpenAPI Annotations
+~~~~~~~~~~~~~~~~~~~
+
+To keep our OpenAPI document at a reasonable quality, you must add annotations to API endpoints you are adding and editing. Here's an example:
+
+.. code-block:: java
+
+    @POST
+    @AuthRequired
+    @Path("/")
+    @Operation(summary = "Creates a license", description = "Creates a license when the authenticated user is a superuser and returns the created license location.")
+    @APIResponse(responseCode = "201", description = "License created with a Location header pointing to the new license.")
+    public Response addLicense(@Context ContainerRequestContext crc,
+            @RequestBody(description = "License definition to persist, including name, URI, active state, and sort order.",
+                    content = @Content(mediaType = "application/json",
+                            schema = @Schema(type = SchemaType.OBJECT,
+                                    description = "License definition accepted by the license administration API.")))
+            License license) {
+    ...
+    }
+
+If you are looking for a reference about the annotations used to generate the OpenAPI document, you can find it in the `MicroProfile OpenAPI Specification <https://download.eclipse.org/microprofile/microprofile-open-api-3.1/microprofile-openapi-spec-3.1.html#_detailed_usage_of_key_annotations>`_.
+
+OpenAPI Quality
+~~~~~~~~~~~~~~~
+
+To use `vacuum <https://quobix.com/vacuum/>`_ with our recommended settings to check the quality of our OpenAPI document, see the :download:`README.md <../../../../scripts/openapi/README.md>` under ``scripts/openapi``.
 
 You can prevent additional problems in our OpenAPI document by observing the following practices:
 
 - When creating a method name within an API class, make it unique.
-
-If you are looking for a reference about the annotations used to generate the OpenAPI document, you can find it in the `MicroProfile OpenAPI Specification <https://download.eclipse.org/microprofile/microprofile-open-api-3.1/microprofile-openapi-spec-3.1.html#_detailed_usage_of_key_annotations>`_.
+- Check that HTTP GET and DELETE operations do not accept request bodies.
+- Various notes under :download:`vacuum-recommended.yaml <../../../../scripts/openapi/vacuum-recommended.yaml>`.
 
 Paths
 -----
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		## Feature Request
		File metadata description will now support html in JSF UI. Is already supported in SPA.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Dataverse collection linking and unlinking no longer requires superuser status. Users with the "Link Dataverse" permission on a collection can now perform these actions through the UI and API.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fixed an issue where, in some cases, the license acceptance pop-up for the archival format option did not display correctly when downloading a complete dataset.