Skip to content

Commit

Permalink
Merge branch 'develop' into cookie-consent-example
Browse files Browse the repository at this point in the history
  • Loading branch information
beepsoft committed Nov 26, 2024
2 parents 6e7715a + f95c1a0 commit 44f22ee
Show file tree
Hide file tree
Showing 212 changed files with 5,743 additions and 2,478 deletions.
4 changes: 2 additions & 2 deletions .env
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
APP_IMAGE=gdcc/dataverse:unstable
POSTGRES_VERSION=16
POSTGRES_VERSION=17
DATAVERSE_DB_USER=dataverse
SOLR_VERSION=9.3.0
SKIP_DEPLOY=0
SKIP_DEPLOY=0
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

**Which issue(s) this PR closes**:

Closes #
- Closes #

**Special notes for your reviewer**:

Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/deploy_beta_testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: '17'
Expand All @@ -32,7 +32,7 @@ jobs:
run: echo "war_file=$(ls *.war | head -1)">> $GITHUB_ENV

- name: Upload war artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: built-app
path: ./target/${{ env.war_file }}
Expand All @@ -42,10 +42,10 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Download war artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: built-app
path: ./
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/guides_build_sphinx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: OdumInstitute/sphinx-action@master
- uses: uncch-rdmc/sphinx-action@master
with:
docs-folder: "doc/sphinx-guides/"
22 changes: 11 additions & 11 deletions .github/workflows/maven_unit_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ jobs:
steps:
# TODO: As part of #10618 change to setup-maven custom action
# Basic setup chores
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up JDK ${{ matrix.jdk }}
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: ${{ matrix.jdk }}
distribution: temurin
Expand All @@ -57,7 +57,7 @@ jobs:

# Upload the built war file. For download, it will be wrapped in a ZIP by GitHub.
# See also https://github.com/actions/upload-artifact#zipped-artifact-downloads
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: dataverse-java${{ matrix.jdk }}.war
path: target/dataverse*.war
Expand All @@ -67,7 +67,7 @@ jobs:
- run: |
tar -cvf java-builddir.tar target
tar -cvf java-m2-selection.tar ~/.m2/repository/io/gdcc/dataverse-*
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: java-artifacts
path: |
Expand Down Expand Up @@ -98,16 +98,16 @@ jobs:
steps:
# TODO: As part of #10618 change to setup-maven custom action
# Basic setup chores
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up JDK ${{ matrix.jdk }}
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: ${{ matrix.jdk }}
distribution: temurin
cache: maven

# Get the build output from the unit test job
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: java-artifacts
- run: |
Expand All @@ -119,7 +119,7 @@ jobs:

# Wrap up and send to coverage job
- run: tar -cvf java-reportdir.tar target/site
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: java-reportdir
path: java-reportdir.tar
Expand All @@ -132,15 +132,15 @@ jobs:
steps:
# TODO: As part of #10618 change to setup-maven custom action
# Basic setup chores
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
java-version: '17'
distribution: temurin
cache: maven

# Get the build output from the integration test job
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: java-reportdir
- run: tar -xvf java-reportdir.tar
Expand Down
1 change: 1 addition & 0 deletions conf/solr/schema.xml
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,7 @@
<field name="datasetValid" type="boolean" stored="true" indexed="true" multiValued="false"/>

<field name="license" type="string" stored="true" indexed="true" multiValued="false"/>
<field name="fileCount" type="plong" stored="true" indexed="true" multiValued="false"/>

<!--
METADATA SCHEMA FIELDS
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Custom questions in Guestbooks can now be more than 255 characters and the bug causing a silent failure when questions were longer than this limit has been fixed.
3 changes: 0 additions & 3 deletions doc/release-notes/10169-JSON-schema-validation.md

This file was deleted.

This file was deleted.

9 changes: 0 additions & 9 deletions doc/release-notes/10341-croissant.md

This file was deleted.

10 changes: 10 additions & 0 deletions doc/release-notes/10379-MetricsBugsFixes.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@

### Metrics API Bug fixes

Two bugs in the Metrics API have been fixed:

- The /datasets and /datasets/byMonth endpoints could report incorrect values if/when they have been called using the dataLocation parameter (which allows getting metrics for local, remote (harvested), or all datasets) as the metrics cache was not storing different values for these cases.

- Metrics endpoints who's calculation relied on finding the latest published datasetversion were incorrect if/when the minor version number was > 9.

When deploying the new release, the [/api/admin/clearMetricsCache](https://guides.dataverse.org/en/latest/api/native-api.html#metrics) API should be called to remove old cached values that may be incorrect.

This file was deleted.

7 changes: 0 additions & 7 deletions doc/release-notes/10478-version-base-image.md

This file was deleted.

12 changes: 0 additions & 12 deletions doc/release-notes/10508-base-image-fixes.md

This file was deleted.

10 changes: 0 additions & 10 deletions doc/release-notes/10517-datasetType.md

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion doc/release-notes/10606-dataverse-in-windows-wsl.md

This file was deleted.

1 change: 0 additions & 1 deletion doc/release-notes/10623-globus-improvements.md

This file was deleted.

41 changes: 0 additions & 41 deletions doc/release-notes/10632-DataCiteXMLandRelationType.md

This file was deleted.

1 change: 0 additions & 1 deletion doc/release-notes/10633-add-dataverse-api-extension.md

This file was deleted.

4 changes: 4 additions & 0 deletions doc/release-notes/10661-guestbook-email-bug-fix.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@

### Guestbook Email Validation Bug fix

Guestbook UI Form: Email address is now checked for valid email format
7 changes: 7 additions & 0 deletions doc/release-notes/10697-improve-permission-indexing.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
### Reindexing after a role assignment is less memory intensive

Adding/removing a user from a role on a collection, particularly the root collection, could lead to a significant increase in memory use resulting in Dataverse itself failing with an out-of-memory condition. Such changes now consume much less memory.

If you have experienced out-of-memory failures in Dataverse in the past that could have been caused by this problem, you may wish to run a [reindex in place](https://guides.dataverse.org/en/latest/admin/solr-search-index.html#reindex-in-place) to update any out-of-date information.

For more information, see #10697 and #10698.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
MDC Citation retrieval with the PID settings has been fixed.
PID parsing in Dataverse is now case insensitive, improving interaction with services that may change the case of PIDs.
Warnings related to managed/excluded PID lists for PID providers have been reduced
1 change: 0 additions & 1 deletion doc/release-notes/10711-CVoc Updates.md

This file was deleted.

3 changes: 0 additions & 3 deletions doc/release-notes/10726-dataverse-facets-api-extension.md

This file was deleted.

This file was deleted.

This file was deleted.

3 changes: 3 additions & 0 deletions doc/release-notes/10742-newest-oldest-sort-order-backwards.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
## Minor bug fix to UI to fix the order of the files on the Dataset Files page when ordering by Date

A fix was made to the ui to fix the ordering 'Newest' and 'Oldest' which were reversed
3 changes: 0 additions & 3 deletions doc/release-notes/10744-ro-crate-docs.md

This file was deleted.

This file was deleted.

3 changes: 0 additions & 3 deletions doc/release-notes/10758-rust-client.md

This file was deleted.

2 changes: 2 additions & 0 deletions doc/release-notes/10772-fix-importDDI-otherId.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Bug Fix :
This PR fixes the `edu.harvard.iq.dataverse.util.json.JsonParseException: incorrect multiple for field otherId` error when DDI harvested data contains multiple ortherId.
2 changes: 2 additions & 0 deletions doc/release-notes/10793-optimisticlockexception handling.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Improvements have been made in handling the errors when a dataset has been edited in one window and an attempt is made to
edit/publish it in another.
Loading

0 comments on commit 44f22ee

Please sign in to comment.