diff --git a/.github/workflows/container_base_push.yml b/.github/workflows/container_base_push.yml
new file mode 100644
index 00000000000..8f440151d0c
--- /dev/null
+++ b/.github/workflows/container_base_push.yml
@@ -0,0 +1,85 @@
+---
+name: Container Base Module
+
+on:
+ push:
+ branches:
+ - 'develop'
+ - 'master'
+ paths:
+ - 'modules/container-base/**'
+ - 'modules/dataverse-parent/pom.xml'
+ - '.github/workflows/container_base_push.yml'
+ pull_request:
+ branches:
+ - 'develop'
+ - 'master'
+ paths:
+ - 'modules/container-base/**'
+ - 'modules/dataverse-parent/pom.xml'
+ - '.github/workflows/container_base_push.yml'
+
+env:
+ IMAGE_TAG: unstable
+
+jobs:
+ build:
+ name: Build image
+ runs-on: ubuntu-latest
+ permissions:
+ contents: read
+ packages: read
+ strategy:
+ matrix:
+ jdk: [ '11' ]
+ # Only run in upstream repo - avoid unnecessary runs in forks
+ if: ${{ github.repository_owner == 'IQSS' }}
+
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@v3
+
+ - name: Set up JDK ${{ matrix.jdk }}
+ uses: actions/setup-java@v3
+ with:
+ java-version: ${{ matrix.jdk }}
+ distribution: 'adopt'
+ - name: Cache Maven packages
+ uses: actions/cache@v3
+ with:
+ path: ~/.m2
+ key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+ restore-keys: ${{ runner.os }}-m2
+
+ - name: Build base container image with local architecture
+ run: mvn -f modules/container-base -Pct package
+
+ # Run anything below only if this is not a pull request.
+ # Accessing, pushing tags etc. to DockerHub will only succeed in upstream because secrets.
+
+ - if: ${{ github.event_name == 'push' && github.ref_name == 'develop' }}
+ name: Push description to DockerHub
+ uses: peter-evans/dockerhub-description@v3
+ with:
+ username: ${{ secrets.DOCKERHUB_USERNAME }}
+ password: ${{ secrets.DOCKERHUB_TOKEN }}
+ repository: gdcc/base
+ short-description: "Dataverse Base Container image providing Payara application server and optimized configuration"
+ readme-filepath: ./modules/container-base/README.md
+
+ - if: ${{ github.event_name != 'pull_request' }}
+ name: Log in to the Container registry
+ uses: docker/login-action@v2
+ with:
+ registry: ${{ env.REGISTRY }}
+ username: ${{ secrets.DOCKERHUB_USERNAME }}
+ password: ${{ secrets.DOCKERHUB_TOKEN }}
+ - if: ${{ github.event_name != 'pull_request' }}
+ name: Set up QEMU for multi-arch builds
+ uses: docker/setup-qemu-action@v2
+ - name: Re-set image tag based on branch
+ if: ${{ github.ref_name == 'master' }}
+ run: echo "IMAGE_TAG=stable"
+ - if: ${{ github.event_name != 'pull_request' }}
+ name: Deploy multi-arch base container image to Docker Hub
+ run: mvn -f modules/container-base -Pct deploy -Dbase.image.tag=${{ env.IMAGE_TAG }}
diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/shellcheck.yml
new file mode 100644
index 00000000000..2d910f54127
--- /dev/null
+++ b/.github/workflows/shellcheck.yml
@@ -0,0 +1,24 @@
+name: "Shellcheck"
+on:
+ push:
+ paths:
+ - conf/solr/**
+ - modules/container-base/**
+ pull_request:
+ paths:
+ - conf/solr/**
+ - modules/container-base/**
+jobs:
+ shellcheck:
+ name: Shellcheck
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
+ - name: shellcheck
+ uses: reviewdog/action-shellcheck@v1
+ with:
+ github_token: ${{ secrets.github_token }}
+ reporter: github-pr-review # Change reporter.
+ fail_on_error: true
+ # Container base image uses dumb-init shebang, so nail to using bash
+ shellcheck_flags: "--shell=bash --external-sources"
\ No newline at end of file
diff --git a/.github/workflows/shellspec.yml b/.github/workflows/shellspec.yml
index 7a56b8c2f7d..5c251cfc897 100644
--- a/.github/workflows/shellspec.yml
+++ b/.github/workflows/shellspec.yml
@@ -13,18 +13,6 @@ on:
env:
SHELLSPEC_VERSION: 0.28.1
jobs:
- shellcheck:
- name: Shellcheck
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@v2
- - name: shellcheck
- uses: reviewdog/action-shellcheck@v1
- with:
- github_token: ${{ secrets.github_token }}
- reporter: github-pr-review # Change reporter.
- fail_on_error: true
- exclude: "./tests/shell/*"
shellspec-ubuntu:
name: "Ubuntu"
runs-on: ubuntu-latest
diff --git a/conf/docker-aio/0prep_deps.sh b/conf/docker-aio/0prep_deps.sh
index d7b875f4b78..13a91705303 100755
--- a/conf/docker-aio/0prep_deps.sh
+++ b/conf/docker-aio/0prep_deps.sh
@@ -4,9 +4,9 @@ if [ ! -d dv/deps ]; then
fi
wdir=`pwd`
-if [ ! -e dv/deps/payara-5.2021.6.zip ]; then
+if [ ! -e dv/deps/payara-5.2022.3.zip ]; then
echo "payara dependency prep"
- wget https://s3-eu-west-1.amazonaws.com/payara.fish/Payara+Downloads/5.2021.6/payara-5.2021.6.zip -O dv/deps/payara-5.2021.6.zip
+ wget https://s3-eu-west-1.amazonaws.com/payara.fish/Payara+Downloads/5.2022.3/payara-5.2022.3.zip -O dv/deps/payara-5.2022.3.zip
fi
if [ ! -e dv/deps/solr-8.11.1dv.tgz ]; then
diff --git a/conf/docker-aio/c8.dockerfile b/conf/docker-aio/c8.dockerfile
index dab6d814ece..0002464cbf2 100644
--- a/conf/docker-aio/c8.dockerfile
+++ b/conf/docker-aio/c8.dockerfile
@@ -24,7 +24,7 @@ COPY disableipv6.conf /etc/sysctl.d/
RUN rm /etc/httpd/conf/*
COPY httpd.conf /etc/httpd/conf
RUN cd /opt ; tar zxf /tmp/dv/deps/solr-8.11.1dv.tgz
-RUN cd /opt ; unzip /tmp/dv/deps/payara-5.2021.6.zip ; ln -s /opt/payara5 /opt/glassfish4
+RUN cd /opt ; unzip /tmp/dv/deps/payara-5.2022.3.zip ; ln -s /opt/payara5 /opt/glassfish4
# this copy of domain.xml is the result of running `asadmin set server.monitoring-service.module-monitoring-levels.jvm=LOW` on a default glassfish installation (aka - enable the glassfish REST monitir endpoint for the jvm`
# this dies under Java 11, do we keep it?
diff --git a/conf/solr/8.11.1/schema.xml b/conf/solr/8.11.1/schema.xml
index ead6e882d49..655cf1bc3cc 100644
--- a/conf/solr/8.11.1/schema.xml
+++ b/conf/solr/8.11.1/schema.xml
@@ -228,6 +228,11 @@
+
+
+
+
+
+
+
diff --git a/doc/JAVADOC_GUIDE.md b/doc/JAVADOC_GUIDE.md
index 8001abda248..997c40e1624 100644
--- a/doc/JAVADOC_GUIDE.md
+++ b/doc/JAVADOC_GUIDE.md
@@ -88,7 +88,7 @@ Here's a better approach:
/** The dataverse we move the dataset from */
private Dataverse sourceDataverse;
- /** The dataverse we movet the dataset to */
+ /** The dataverse we move the dataset to */
private Dataverse destinationDataverse;
diff --git a/doc/mergeParty/readme.md b/doc/mergeParty/readme.md
index 061673fffa0..6f3af8511dc 100644
--- a/doc/mergeParty/readme.md
+++ b/doc/mergeParty/readme.md
@@ -73,10 +73,10 @@ Note that before we were asking `isGuest` and now we ask `isAuthenticated`, so t
## Other Added Things
### Settings bean
-Settings (in `edu.harvard.iq.dataverse.settings`) are where the application stores its more complex, admin-editable configuration. Technically, its a persistent `Map`, that can be accessed via API (`edu.harvard.iq.dataverse.api.Admin`, on path `{server}/api/s/settings`). Currenly used for the signup mechanism.
+Settings (in `edu.harvard.iq.dataverse.settings`) are where the application stores its more complex, admin-editable configuration. Technically, its a persistent `Map`, that can be accessed via API (`edu.harvard.iq.dataverse.api.Admin`, on path `{server}/api/s/settings`). Currently used for the signup mechanism.
### Admin API
-Accessible under url `{server}/api/s/`, API calls to this bean should be editing confugurations, allowing full indexing and more. The idea behing putting all of them under the `/s/` path is that we can later block these calls using a filter. This way, we could, say, allow access from localhost only. Or, we could block this completely based on some environemnt variable.
+Accessible under url `{server}/api/s/`, API calls to this bean should be editing configurations, allowing full indexing and more. The idea behind putting all of them under the `/s/` path is that we can later block these calls using a filter. This way, we could, say, allow access from localhost only. Or, we could block this completely based on some environment variable.
### `setup-all.sh` script
A new script that sets up the users and the dataverses, sets the system up for built-in signup, and then indexes the dataverses using solr. Requires the [jq utility](http://stedolan.github.io/jq/). On Macs with [homebrew](http://brew.sh) installed, getting this utility is a `brew install jq` command away.
diff --git a/doc/release-notes/5.10-release-notes.md b/doc/release-notes/5.10-release-notes.md
index 0da42a7b527..c13ae8a6b78 100644
--- a/doc/release-notes/5.10-release-notes.md
+++ b/doc/release-notes/5.10-release-notes.md
@@ -140,7 +140,7 @@ or
To find datasets with a without a CC0 license and with empty terms:
```
-select CONCAT('doi:', dvo.authority, '/', dvo.identifier), v.alias as dataverse_alias, case when versionstate='RELEASED' then concat(dv.versionnumber, '.', dv.minorversionnumber) else versionstate END as version, dv.id as datasetversion_id, t.id as termsofuseandaccess_id, t.termsofuse, t.confidentialitydeclaration, t.specialpermissions, t.restrictions, t.citationrequirements, t.depositorrequirements, t.conditions, t.disclaimer from dvobject dvo, termsofuseandaccess t, datasetversion dv, dataverse v where dv.dataset_id=dvo.id and dv.termsofuseandaccess_id=t.id and dvo.owner_id=v.id and t.license='NONE' and t.termsofuse is null;
+select CONCAT('doi:', dvo.authority, '/', dvo.identifier), v.alias as dataverse_alias, case when versionstate='RELEASED' then concat(dv.versionnumber, '.', dv.minorversionnumber) else versionstate END as version, dv.id as datasetversion_id, t.id as termsofuseandaccess_id, t.termsofuse, t.confidentialitydeclaration, t.specialpermissions, t.restrictions, t.citationrequirements, t.depositorrequirements, t.conditions, t.disclaimer from dvobject dvo, termsofuseandaccess t, datasetversion dv, dataverse v where dv.dataset_id=dvo.id and dv.termsofuseandaccess_id=t.id and dvo.owner_id=v.id and (t.license='NONE' or t.license is null) and t.termsofuse is null;
```
As before, there are a couple options.
diff --git a/doc/release-notes/5.11-release-notes.md b/doc/release-notes/5.11-release-notes.md
new file mode 100644
index 00000000000..a51bcec2dac
--- /dev/null
+++ b/doc/release-notes/5.11-release-notes.md
@@ -0,0 +1,208 @@
+# Dataverse Software 5.11
+
+This release brings new features, enhancements, and bug fixes to the Dataverse Software. Thank you to all of the community members who contributed code, suggestions, bug reports, and other assistance across the project.
+
+## Release Highlights
+
+### Terms of Access or Request Access Required for Restricted Files
+
+Beginning in this release, datasets with restricted files must have either Terms of Access or Request Access enabled. This change is to ensure that for each file in a Dataverse installation there is a clear path to get to the data, either through requesting access to the data or to provide context about why requesting access is not enabled.
+
+Published datasets are not affected by this change. Datasets that are in draft and that have neither Terms of Access nor Request Access enabled must be updated to select one or the other (or both). Otherwise, datasets cannot be futher edited or published. Dataset authors will be able to tell if their dataset is affected by the presence of the following message at the top of their dataset (when they are logged in):
+
+"Datasets with restricted files are required to have Request Access enabled or Terms of Access to help people access the data. Please edit the dataset to confirm Request Access or provide Terms of Access to be in compliance with the policy."
+
+At this point, authors should click "Edit Dataset" then "Terms" and then check the box for "Request Access" or fill in "Terms of Access for Restricted Files" (or both). Afterwards, authors will be able to further edit metadata and publish.
+
+In the "Notes for Dataverse Installation Administrators" section, we have provided a query to help proactively identify datasets that need to be updated.
+
+See also Issue #8191 and PR #8308.
+
+### Muting Notifications
+
+Users can control which notifications they receive if the system is [configured to allow this](https://guides.dataverse.org/en/5.11/admin/user-administration.html#letting-users-manage-receiving-notifications). See also Issue #7492 and PR #8530.
+
+## Major Use Cases and Infrastructure Enhancements
+
+Changes and fixes in this release include:
+
+- Terms of Access or Request Access required for restricted files. (Issue #8191, PR #8308)
+- Users can control which notifications they receive if the system is [configured to allow this](https://guides.dataverse.org/en/5.11/admin/user-administration.html#letting-users-manage-receiving-notifications). (Issue #7492, PR #8530)
+- A 500 error was occuring when creating a dataset if a template did not have an associated "termsofuseandaccess". See "Legacy Templates Issue" below for details. (Issue #8599, PR #8789)
+- Tabular ingest can be skipped via API. (Issue #8525, PR #8532)
+- The "Verify Email" button has been changed to "Send Verification Email" and rather than sometimes showing a popup now always sends a fresh verification email (and invalidates previous verification emails). (Issue #8227, PR #8579)
+- For Shibboleth users, the `emailconfirmed` timestamp is now set on login and the UI should show "Verified". (Issue #5663, PR #8579)
+- Information about the license selection (or custom terms) is now available in the confirmation popup when contributors click "Submit for Review". Previously, this was only available in the confirmation popup for the "Publish" button, which contributors do not see. (Issue #8561, PR #8691)
+- For installations configured to support multiple languages, controlled vocabulary fields that do not allow multiple entries (e.g. journalArticleType) are now indexed properly. (Issue #8595, PR #8601, PR #8624)
+- Two-letter ISO-639-1 codes for languages are now supported, in metadata imports and harvesting. (Issue #8139, PR #8689)
+- The API endpoint for listing notifications has been enhanced to show the subject, text, and timestamp of notifications. (Issue #8487, PR #8530)
+- The API Guide has been updated to explain that the `Content-type` header is now (as of Dataverse 5.6) necessary to create datasets via native API. (Issue #8663, PR #8676)
+- Admin API endpoints have been added to find and delete dataset templates. (Issue 8600, PR #8706)
+- The BagIt file handler detects and transforms zip files with a BagIt package format into Dataverse data files, validating checksums along the way. See the [BagIt File Handler](https://guides.dataverse.org/en/5.11/installation//config.html#bagit-file-handler) section of the Installation Guide for details. (Issue #8608, PR #8677)
+- For BagIt Export, the number of threads used when zipping data files into an archival bag is now configurable using the `:BagGeneratorThreads` database setting. (Issue #8602, PR #8606)
+- PostgreSQL 14 can now be used (though we've tested mostly with 13). PostgreSQL 10+ is required. (Issue #8295, PR #8296)
+- As always, widgets can be embedded in the `