Skip to content

Commit

Permalink
Merge branch 'develop' into 9590-faster-redeploy #9590
Browse files Browse the repository at this point in the history
sphinx-tabs upgraded to be compatible with v7.

DATAVERSE_JSF_REFRESH_PERIOD restored (not sure why it
was removed).

Conflicts:
doc/sphinx-guides/requirements.txt
doc/sphinx-guides/source/conf.py
docker-compose-dev.yml
  • Loading branch information
pdurbin committed Feb 13, 2024
2 parents b7e079c + 193cd4a commit 2a11bf7
Show file tree
Hide file tree
Showing 274 changed files with 11,559 additions and 4,743 deletions.
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,12 @@ If you are interested in working on the main Dataverse code, great! Before you s

Please read http://guides.dataverse.org/en/latest/developers/version-control.html to understand how we use the "git flow" model of development and how we will encourage you to create a GitHub issue (if it doesn't exist already) to associate with your pull request. That page also includes tips on making a pull request.

After making your pull request, your goal should be to help it advance through our kanban board at https://github.com/orgs/IQSS/projects/2 . If no one has moved your pull request to the code review column in a timely manner, please reach out. Note that once a pull request is created for an issue, we'll remove the issue from the board so that we only track one card (the pull request).
After making your pull request, your goal should be to help it advance through our kanban board at https://github.com/orgs/IQSS/projects/34 . If no one has moved your pull request to the code review column in a timely manner, please reach out. Note that once a pull request is created for an issue, we'll remove the issue from the board so that we only track one card (the pull request).

Thanks for your contribution!

[dataverse-community Google Group]: https://groups.google.com/group/dataverse-community
[Community Call]: https://dataverse.org/community-calls
[dataverse-dev Google Group]: https://groups.google.com/group/dataverse-dev
[community contributors]: https://docs.google.com/spreadsheets/d/1o9DD-MQ0WkrYaEFTD5rF_NtyL8aUISgURsAXSL7Budk/edit?usp=sharing
[dev efforts]: https://github.com/orgs/IQSS/projects/2#column-5298405
[dev efforts]: https://github.com/orgs/IQSS/projects/34/views/6
3 changes: 3 additions & 0 deletions conf/localstack/buckets.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/usr/bin/env bash
# https://stackoverflow.com/questions/53619901/auto-create-s3-buckets-on-localstack
awslocal s3 mb s3://mybucket
3 changes: 3 additions & 0 deletions conf/solr/9.3.0/solrconfig.xml
Original file line number Diff line number Diff line change
Expand Up @@ -588,6 +588,7 @@
check for "Circuit Breakers tripped" in logs and the corresponding error message should tell
you what transpired (if the failure was caused by tripped circuit breakers).
-->

<!--
<str name="memEnabled">true</str>
<str name="memThreshold">75</str>
Expand All @@ -599,10 +600,12 @@
whether the circuit breaker is enabled and the average load over the last minute at which the
circuit breaker should start rejecting queries.
-->

<!--
<str name="cpuEnabled">true</str>
<str name="cpuThreshold">75</str>
-->

</circuitBreaker>

<!-- Request Dispatcher
Expand Down
13 changes: 0 additions & 13 deletions doc/release-notes/10001-datasets-files-api-user-permissions.md

This file was deleted.

1 change: 1 addition & 0 deletions doc/release-notes/10101-qa-guide.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
A new QA Guide is intended mostly for the core development team but may be of interest to contributors.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
The getCanDownloadAtLeastOneFile (/api/datasets/{id}/versions/{versionId}/canDownloadAtLeastOneFile) endpoint has been created.

This API endpoint indicates if the calling user can download at least one file from a dataset version. Note that Shibboleth group permissions are not considered.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
The response for getVersionFiles (/api/datasets/{id}/versions/{versionId}/files) endpoint has been modified to include a total count of records available (totalCount:x).
This will aid in pagination by allowing the caller to know how many pages can be iterated through. The existing API (getVersionFileCounts) to return the count will still be available.
5 changes: 5 additions & 0 deletions doc/release-notes/10216-metadatablocks.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
The API endpoint `/api/metadatablocks/{block_id}` has been extended to include the following fields:

- `isRequired`: Whether or not this field is required
- `displayOrder`: The display order of the field in create/edit forms
- `typeClass`: The type class of this field ("controlledVocabulary", "compound", or "primitive")
1 change: 1 addition & 0 deletions doc/release-notes/10238-container-demo.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
The Container Guide now containers a tutorial for running Dataverse in containers for demo or evaluation purposes: https://guides.dataverse.org/en/6.2/container
1 change: 1 addition & 0 deletions doc/release-notes/10297-metadata-api-fix.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
The API endpoint `api/datasets/{id}/metadata` has been changed to default to the latest version of the dataset that the user has access.
16 changes: 16 additions & 0 deletions doc/release-notes/6.0-release-notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,22 @@ If you are running Payara as a non-root user (and you should be!), **remember no

Your `:MDCLogPath` database setting might be pointing to a Payara 5 directory such as `/usr/local/payara5/glassfish/domains/domain1/logs`. If so, edit this to be Payara 6. You'll probably want to copy your logs over as well.

1. If you've enabled access logging or any other site-specific configuration, be sure to preserve them. For instance, the default domain.xml includes

```
<http-service>
<access-log></access-log>
```

but you may wish to include

```
<http-service access-logging-enabled="true">
<access-log format="%client.name% %datetime% %request% %status% %response.length% %header.user-agent% %header.referer% %cookie.JSESSIONID% %header.x-forwarded-for%"></access-log>
```

Be sure to keep a previous copy of your domain.xml for reference.

1. Update systemd unit file (or other init system) from `/usr/local/payara5` to `/usr/local/payara6`, if applicable.

1. Start Payara.
Expand Down
Loading

0 comments on commit 2a11bf7

Please sign in to comment.