Skip to content

Commit 50acabb

Browse files
authored
Merge branch 'develop' into IQSS/12020-Payara7_Java21_update
2 parents 9176f57 + 39fb5f6 commit 50acabb

37 files changed

Lines changed: 1647 additions & 73 deletions

.github/workflows/container_app_pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535

3636
# Note: Accessing, pushing tags etc. to GHCR will only succeed in upstream because secrets.
3737
- name: Login to Github Container Registry
38-
uses: docker/login-action@v3
38+
uses: docker/login-action@v4
3939
with:
4040
registry: ghcr.io
4141
username: ${{ secrets.GHCR_USERNAME }}

.github/workflows/container_app_push.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,13 +101,13 @@ jobs:
101101
# Depending on context, we push to different targets. Login accordingly.
102102
- if: github.event_name != 'pull_request'
103103
name: Log in to Docker Hub registry
104-
uses: docker/login-action@v3
104+
uses: docker/login-action@v4
105105
with:
106106
username: ${{ secrets.DOCKERHUB_USERNAME }}
107107
password: ${{ secrets.DOCKERHUB_TOKEN }}
108108
- if: ${{ github.event_name == 'pull_request' }}
109109
name: Login to Github Container Registry
110-
uses: docker/login-action@v3
110+
uses: docker/login-action@v4
111111
with:
112112
registry: ghcr.io
113113
username: ${{ secrets.GHCR_USERNAME }}

.github/workflows/container_base_push.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
# Note: Accessing, pushing tags etc. to DockerHub will only succeed in upstream and
4343
# on events in context of upstream because secrets. PRs run in context of forks by default!
4444
- name: Log in to the Container registry
45-
uses: docker/login-action@v3
45+
uses: docker/login-action@v4
4646
with:
4747
username: ${{ secrets.DOCKERHUB_USERNAME }}
4848
password: ${{ secrets.DOCKERHUB_TOKEN }}

.github/workflows/container_maintenance.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979
# Note: Accessing, pushing tags etc. to DockerHub will only succeed in upstream and
8080
# on events in context of upstream because secrets. PRs run in context of forks by default!
8181
- name: Log in to the Container registry
82-
uses: docker/login-action@v3
82+
uses: docker/login-action@v4
8383
with:
8484
username: ${{ secrets.DOCKERHUB_USERNAME }}
8585
password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -122,7 +122,7 @@ jobs:
122122
# Note: Accessing, pushing tags etc. to DockerHub will only succeed in upstream and
123123
# on events in context of upstream because secrets. PRs run in context of forks by default!
124124
- name: Log in to the Container registry
125-
uses: docker/login-action@v3
125+
uses: docker/login-action@v4
126126
with:
127127
username: ${{ secrets.DOCKERHUB_USERNAME }}
128128
password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -164,7 +164,7 @@ jobs:
164164
# Note: Accessing, pushing tags etc. to DockerHub will only succeed in upstream and
165165
# on events in context of upstream because secrets. PRs run in context of forks by default!
166166
- name: Log in to the Container registry
167-
uses: docker/login-action@v3
167+
uses: docker/login-action@v4
168168
with:
169169
username: ${{ secrets.DOCKERHUB_USERNAME }}
170170
password: ${{ secrets.DOCKERHUB_TOKEN }}

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.5.3</keycloak.version>
103+
<keycloak.version>26.5.5</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: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
## Highlights
2+
3+
### Review Datasets
4+
5+
Dataverse now supports review datasets, a type of dataset that can be used to review resources such as other datasets in the Dataverse installation itself or various resources in external data repositories. APIs and a new "review" metadata block (with an "Item Reviewed" field) are in place but the UI for this feature will only available in a future version of the new React-based [Dataverse Frontend](https://github.com/IQSS/dataverse-frontend). See also the [guides](https://dataverse-guide--11753.org.readthedocs.build/en/11753/api/native-api.html#add-dataset-type), #11747, #12015, #11887, #12115, and #11753.
6+
7+
## Other Features Added
8+
9+
- Citation Style Language (CSL) output now includes "type:software" or "type:review" when those dataset types are used. See the [guides](https://dataverse-guide--11753.org.readthedocs.build/en/11753/api/native-api.html#get-citation-in-other-formats) and #11753.
10+
11+
## Updated APIs
12+
13+
- The Change Collection Attributes API now supports `allowedDatasetTypes`. See the [guides](https://dataverse-guide--11753.org.readthedocs.build/en/11753/api/native-api.html#change-collection-attributes), #12115, and #11753.
14+
15+
## Bugs Fixed
16+
17+
- 500 error when deleting dataset type by name. See #11833 and #11753.
18+
- Dataset Type facet works in JSF but not the SPA. See #11758 and #11753.
19+
20+
## Backward Incompatible Changes
21+
22+
### Dataset Types Must Be Allowed, Per-Collection, Before Use
23+
24+
In previous releases of Dataverse, as soon as additional dataset types were added (such as "software", "workflow", etc.), they could be used by all users when creating datasets (via API only). As of this release, on a per-collection basis, superusers must allow these dataset types to be used. See #12115 and #11753.
Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
{
2+
"datasetType": "review",
3+
"datasetVersion": {
4+
"license": {
5+
"name": "CC0 1.0",
6+
"uri": "http://creativecommons.org/publicdomain/zero/1.0"
7+
},
8+
"metadataBlocks": {
9+
"citation": {
10+
"fields": [
11+
{
12+
"typeName": "title",
13+
"value": "Review of Percent of Children That Have Asthma",
14+
"typeClass": "primitive",
15+
"multiple": false
16+
},
17+
{
18+
"value": [
19+
{
20+
"authorName": {
21+
"value": "Wazowski, Mike",
22+
"typeClass": "primitive",
23+
"multiple": false,
24+
"typeName": "authorName"
25+
}
26+
}
27+
],
28+
"typeClass": "compound",
29+
"multiple": true,
30+
"typeName": "author"
31+
},
32+
{
33+
"value": [
34+
{
35+
"datasetContactEmail": {
36+
"value": "mwazowski@mailinator.com",
37+
"typeClass": "primitive",
38+
"multiple": false,
39+
"typeName": "datasetContactEmail"
40+
}
41+
}
42+
],
43+
"typeClass": "compound",
44+
"multiple": true,
45+
"typeName": "datasetContact"
46+
},
47+
{
48+
"value": [
49+
{
50+
"dsDescriptionValue": {
51+
"value": "This is a review of a dataset.",
52+
"typeClass": "primitive",
53+
"multiple": false,
54+
"typeName": "dsDescriptionValue"
55+
}
56+
}
57+
],
58+
"typeClass": "compound",
59+
"multiple": true,
60+
"typeName": "dsDescription"
61+
},
62+
{
63+
"value": [
64+
"Medicine, Health and Life Sciences"
65+
],
66+
"typeClass": "controlledVocabulary",
67+
"multiple": true,
68+
"typeName": "subject"
69+
},
70+
{
71+
"value": {
72+
"itemReviewedUrl": {
73+
"value": "https://datacommons.org/tools/statvar#sv=Percent_Person_Children_WithAsthma",
74+
"typeClass": "primitive",
75+
"multiple": false,
76+
"typeName": "itemReviewedUrl"
77+
},
78+
"itemReviewedType": {
79+
"value": "Dataset",
80+
"typeClass": "controlledVocabulary",
81+
"multiple": false,
82+
"typeName": "itemReviewedType"
83+
},
84+
"itemReviewedCitation": {
85+
"value": "\"Statistical Variable Explorer - Data Commons.\" Datacommons.org, 2026, datacommons.org/tools/statvar#sv=Percent_Person_Children_WithAsthma. Accessed 9 Mar. 2026.",
86+
"typeClass": "primitive",
87+
"multiple": false,
88+
"typeName": "itemReviewedCitation"
89+
}
90+
},
91+
"typeClass": "compound",
92+
"multiple": false,
93+
"typeName": "itemReviewed"
94+
}
95+
]
96+
}
97+
}
98+
}
99+
}

doc/sphinx-guides/source/admin/dataverses-datasets.rst

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,64 @@ If the :AllowedCurationLabels setting has a value, one of the available choices
109109

110110
Individual datasets can be configured to use specific curationLabelSets as well. See the "Datasets" section below.
111111

112+
.. _review-datasets-setup:
113+
114+
Configure a Collection for Review Datasets
115+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
116+
117+
:ref:`review-datasets-user` are a specialized type of dataset that can be used to review resources (such as datasets) in the Dataverse installation itself or resources in external data repositories.
118+
119+
Review datasets require some setup, as described below.
120+
121+
Load the Review Metadata Block
122+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
123+
124+
First, download the Review metadata block tsv file from :ref:`experimental-metadata`.
125+
126+
Then, load the block and update Solr. See the following sections of :doc:`metadatacustomization` for details:
127+
128+
- :ref:`load-tsv`
129+
- :ref:`update-solr-schema`
130+
131+
Create and Enable Custom "Rubric" Metadata Blocks
132+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
133+
134+
The Review metadata block gives you a few basic fields common to all reviews such as the URL of the item being reviewed.
135+
136+
You probably will want to create your own metadata blocks specific to the resources you are reviewing, your own "rubric". See :doc:`metadatacustomization` for details on creating and enabling custom metadata blocks.
137+
138+
Instead of creating a new custom metadata block from scratch (if you simply want to evaluate the feature, for example), you can use the metadata blocks at https://github.com/IQSS/dataverse.harvard.edu
139+
140+
After loading the block, don't forget to update the Solr schema!
141+
142+
Create a Review Dataset Type
143+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
144+
145+
Review datasets are built on the :ref:`dataset-types` feature. Dataset types can only be created via API so follow the steps under :ref:`api-add-dataset-type`. Copy and paste from below or download :download:`review.json <../../../../scripts/api/data/datasetTypes/review.json>` and pass it to the API.
146+
147+
.. literalinclude:: ../../../../scripts/api/data/datasetTypes/review.json
148+
:language: json
149+
150+
Create a Collection for Reviews and Configure Permissions
151+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
152+
153+
Follow the normal steps:
154+
155+
- :ref:`create-dataverse`.
156+
- :ref:`dataverse-permissions`.
157+
158+
Allow the Review Dataset Type for the Collection
159+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
160+
161+
Non-dataset types, such as the "review" type, are only available when a collection admin has enabled them, via API.
162+
163+
Using the API :ref:`collection-attributes-api`, change the ``allowedDatasetTypes`` attribute so that it includes "review". If you only want to allow reviews, you can pass just ``review``. If you want to allow multiple dataset types, you can pass a comma-separated list, such as ``review,dataset``.
164+
165+
Invite Users to Create Review Datasets
166+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
167+
168+
At this point, users should be able to create review datasets via API, if you gave them permission on the collection. You can point them to :ref:`creating-a-review-dataset` for details.
169+
112170
Datasets
113171
--------
114172

doc/sphinx-guides/source/admin/metadatacustomization.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -444,6 +444,8 @@ Please note that metadata fields share a common namespace so they must be unique
444444

445445
We'll use this command again below to update the Solr schema to accomodate metadata fields we've added.
446446

447+
.. _load-tsv:
448+
447449
Loading TSV files into a Dataverse Installation
448450
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
449451

doc/sphinx-guides/source/api/changelog.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ This API changelog is experimental and we would love feedback on its usefulness.
1010
v6.9
1111
----
1212

13+
- When creating datasets that contain a datasetType, that datasetType must be allowed at the collection level. This can be accomplished by passing ``allowedDatasetTypes`` to the :ref:`collection-attributes-api` API.
1314
- The POST /api/admin/makeDataCount/{id}/updateCitationsForDataset processing is now asynchronous and the response no longer includes the number of citations. The response can be OK if the request is queued or 503 if the queue is full (default queue size is 1000).
1415
- The way to set per-format size limits for tabular ingest has changed. JSON input is now used. See :ref:`:TabularIngestSizeLimit`.
1516
- In the past, the settings API would accept any key and value. This is no longer the case because validation has been added. See :ref:`settings_put_single`, for example.

0 commit comments

Comments
 (0)