Skip to content

Commit 877ccce

Browse files
committed
Merge remote-tracking branch 'IQSS/develop' into indexingperformance
2 parents 8c5806f + 2382496 commit 877ccce

File tree

4 files changed

+6
-4
lines changed

4 files changed

+6
-4
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
</build>
101101

102102
<properties>
103-
<keycloak.version>26.4.7</keycloak.version>
103+
<keycloak.version>26.5.0</keycloak.version>
104104
<java.version>17</java.version>
105105
<jakarta.persistence.version>3.2.0</jakarta.persistence.version>
106106
<mindrot.jbcrypt.version>0.4</mindrot.jbcrypt.version>
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
This release removes an undocumented restriction on the API calls to get, set, and delete archival status. They did not work on deaccessioned dataset versions and now do. (See https://guides.dataverse.org/en/latest/api/native-api.html#get-the-archival-status-of-a-dataset-by-version )

src/main/java/edu/harvard/iq/dataverse/api/Datasets.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5012,7 +5012,7 @@ public Response getDatasetVersionArchivalStatus(@Context ContainerRequestContext
50125012
}
50135013
DataverseRequest req = createDataverseRequest(au);
50145014
DatasetVersion dsv = getDatasetVersionOrDie(req, versionNumber, findDatasetOrDie(datasetId), uriInfo,
5015-
headers);
5015+
headers, true);
50165016

50175017
if (dsv.getArchivalCopyLocation() == null) {
50185018
return error(Status.NOT_FOUND, "This dataset version has not been archived");
@@ -5054,7 +5054,7 @@ public Response setDatasetVersionArchivalStatus(@Context ContainerRequestContext
50545054

50555055
DataverseRequest req = createDataverseRequest(au);
50565056
DatasetVersion dsv = getDatasetVersionOrDie(req, versionNumber, findDatasetOrDie(datasetId),
5057-
uriInfo, headers);
5057+
uriInfo, headers, true);
50585058

50595059
if (dsv == null) {
50605060
return error(Status.NOT_FOUND, "Dataset version not found");
@@ -5101,7 +5101,7 @@ public Response deleteDatasetVersionArchivalStatus(@Context ContainerRequestCont
51015101

51025102
DataverseRequest req = createDataverseRequest(au);
51035103
DatasetVersion dsv = getDatasetVersionOrDie(req, versionNumber, findDatasetOrDie(datasetId), uriInfo,
5104-
headers);
5104+
headers, true);
51055105
if (dsv == null) {
51065106
return error(Status.NOT_FOUND, "Dataset version not found");
51075107
}

src/main/java/propertyFiles/MimeTypeDetectionByFileExtension.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
7z=application/x-7z-compressed
22
ado=application/x-stata-ado
3+
css=text/css
34
dbf=application/dbf
45
dcm=application/dicom
56
docx=application/vnd.openxmlformats-officedocument.wordprocessingml.document

0 commit comments

Comments
 (0)