Merge branch 'develop' into 8372-gdcc-xoai-library

IQSS · Oct 12, 2022 · a428b40 · a428b40
2 parents e448b68 + b20a20f
commit a428b40
Show file tree

Hide file tree

Showing 22 changed files with 322 additions and 265 deletions.
diff --git a/doc/release-notes/5.12-release-notes.md b/doc/release-notes/5.12-release-notes.md
diff --git a/doc/release-notes/7000-mpconfig-support.md b/doc/release-notes/7000-mpconfig-support.md
diff --git a/doc/release-notes/8127-citation-field-improvements.md b/doc/release-notes/8127-citation-field-improvements.md
diff --git a/doc/release-notes/8535-metadata-types-static-facet.md b/doc/release-notes/8535-metadata-types-static-facet.md
diff --git a/doc/release-notes/8611-DataCommons-related-notes.md b/doc/release-notes/8611-DataCommons-related-notes.md
diff --git a/doc/release-notes/8639-computational-workflow.md b/doc/release-notes/8639-computational-workflow.md
diff --git a/doc/release-notes/8715-importddi-termofuse.md b/doc/release-notes/8715-importddi-termofuse.md
diff --git a/doc/release-notes/8722-custom-script.md b/doc/release-notes/8722-custom-script.md
diff --git a/doc/release-notes/8727-better-http-range-request-support.md b/doc/release-notes/8727-better-http-range-request-support.md
diff --git a/doc/release-notes/8732-date-in-citation-harvested-datasets.md b/doc/release-notes/8732-date-in-citation-harvested-datasets.md
@@ -0,0 +1,7 @@
+Fix the year displayed in citation for harvested dataset, specialy for oai_dc format.
+
+For normal datasets, the date used is the "citation date" which is by default the publication date (the first release date) (https://guides.dataverse.org/en/latest/api/native-api.html?highlight=citationdate#set-citation-date-field-type-for-a-dataset).
+
+But for a harvested dataset, the distribution date is used instead and this date is not always present in the harvested metadata. With oai_dc format the date tag if used as production date.
+
+Now, the production date is used for harvested dataset in addition to distribution date.
diff --git a/doc/release-notes/8740-file-recognition-based-on-filename.md b/doc/release-notes/8740-file-recognition-based-on-filename.md
diff --git a/doc/release-notes/8759-add-computational-worflow-file-types.md b/doc/release-notes/8759-add-computational-worflow-file-types.md
diff --git a/doc/release-notes/8868-fix-json-import.md b/doc/release-notes/8868-fix-json-import.md
diff --git a/doc/release-notes/8882-shib-affiliation.md b/doc/release-notes/8882-shib-affiliation.md
diff --git a/doc/release-notes/8947-payara-update.md b/doc/release-notes/8947-payara-update.md
diff --git a/doc/sphinx-guides/source/_static/util/clear_timer.sh b/doc/sphinx-guides/source/_static/util/clear_timer.sh
@@ -17,7 +17,7 @@ DV_DIR=${PAYARA_DIR}/glassfish/domains/domain1
 ${PAYARA_DIR}/bin/asadmin stop-domain
 
 rm -rf ${PAYARA_DIR}/${DV_DIR}/generated/
-rm -rf ${PAYARA_DIR}/${DV_DIR}/osgi-cache/felix
+rm -rf ${PAYARA_DIR}/${DV_DIR}/osgi-cache/
 
 # restart the domain (also generates a warning if app server is stopped)
 ${PAYARA_DIR}/bin/asadmin start-domain
diff --git a/doc/sphinx-guides/source/admin/troubleshooting.rst b/doc/sphinx-guides/source/admin/troubleshooting.rst
@@ -57,7 +57,7 @@ Ingest is both CPU- and memory-intensive, and depending on your system resources
 
 ``/usr/local/payara5/mq/bin/imqcmd -u admin purge dst -t q -n DataverseIngest`` will purge the DataverseIngest queue, and prompt for your confirmation.
 
-Finally, list destinations to verify that the purge was successful::
+Finally, list destinations to verify that the purge was successful:
 
 ``/usr/local/payara5/mq/bin/imqcmd -u admin list dst``
 

diff --git a/doc/sphinx-guides/source/conf.py b/doc/sphinx-guides/source/conf.py
@@ -66,9 +66,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '5.11.1'
+version = '5.12'
 # The full version, including alpha/beta/rc tags.
-release = '5.11.1'
+release = '5.12'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/doc/sphinx-guides/source/versions.rst b/doc/sphinx-guides/source/versions.rst
@@ -6,7 +6,8 @@ Dataverse Software Documentation Versions
 
 This list provides a way to refer to the documentation for previous versions of the Dataverse Software. In order to learn more about the updates delivered from one version to another, visit the `Releases <https://github.com/IQSS/dataverse/releases>`__ page in our GitHub repo.
 
-- 5.11.1
+- 5.12
+- `5.11.1 </en/5.11.1/>`__
 - `5.11 </en/5.11/>`__
 - `5.10.1 </en/5.10.1/>`__
 - `5.10 </en/5.10/>`__

diff --git a/modules/dataverse-parent/pom.xml b/modules/dataverse-parent/pom.xml
@@ -129,7 +129,7 @@
 
     <properties>
         <!-- This is a special Maven property name, do not change! -->
-        <revision>5.11.1</revision>
+        <revision>5.12</revision>
 
         <target.java.version>11</target.java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>