Skip to content

Commit a218417

Browse files
landreevlandreev
authored
Merge pull request #10453 from IQSS/develop
Merge 6.2 into master
2 parents f5d1299 + dae327f commit a218417

File tree

379 files changed

+13603
-6266
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

379 files changed

+13603
-6266
lines changed

‎.env

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
APP_IMAGE=gdcc/dataverse:unstable
2-
POSTGRES_VERSION=13
2+
POSTGRES_VERSION=16
33
DATAVERSE_DB_USER=dataverse
44
SOLR_VERSION=9.3.0
5+
SKIP_DEPLOY=0

‎.github/workflows/maven_unit_test.yml

+2
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,15 @@ on:
44
push:
55
paths:
66
- "**.java"
7+
- "**.sql"
78
- "pom.xml"
89
- "modules/**/pom.xml"
910
- "!modules/container-base/**"
1011
- "!modules/dataverse-spi/**"
1112
pull_request:
1213
paths:
1314
- "**.java"
15+
- "**.sql"
1416
- "pom.xml"
1517
- "modules/**/pom.xml"
1618
- "!modules/container-base/**"

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -61,3 +61,4 @@ src/main/webapp/resources/images/dataverseproject.png.thumb140
6161

6262
# Docker development volumes
6363
/docker-dev-volumes
64+
/.vs

‎CONTRIBUTING.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,12 @@ If you are interested in working on the main Dataverse code, great! Before you s
5656

5757
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.
5858

59-
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).
59+
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).
6060

6161
Thanks for your contribution!
6262

6363
[dataverse-community Google Group]: https://groups.google.com/group/dataverse-community
6464
[Community Call]: https://dataverse.org/community-calls
6565
[dataverse-dev Google Group]: https://groups.google.com/group/dataverse-dev
6666
[community contributors]: https://docs.google.com/spreadsheets/d/1o9DD-MQ0WkrYaEFTD5rF_NtyL8aUISgURsAXSL7Budk/edit?usp=sharing
67-
[dev efforts]: https://github.com/orgs/IQSS/projects/2#column-5298405
67+
[dev efforts]: https://github.com/orgs/IQSS/projects/34/views/6

‎README.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Dataverse®
33

44
Dataverse is an [open source][] software platform for sharing, finding, citing, and preserving research data (developed by the [Dataverse team](https://dataverse.org/about) at the [Institute for Quantitative Social Science](https://iq.harvard.edu/) and the [Dataverse community][]).
55

6-
[dataverse.org][] is our home on the web and shows a map of Dataverse installations around the world, a list of [features][], [integrations][] that have been made possible through [REST APIs][], our development [roadmap][], and more.
6+
[dataverse.org][] is our home on the web and shows a map of Dataverse installations around the world, a list of [features][], [integrations][] that have been made possible through [REST APIs][], our [project board][], our development [roadmap][], and more.
77

88
We maintain a demo site at [demo.dataverse.org][] which you are welcome to use for testing and evaluating Dataverse.
99

@@ -29,6 +29,7 @@ Dataverse is a trademark of President and Fellows of Harvard College and is regi
2929
[Installation Guide]: https://guides.dataverse.org/en/latest/installation/index.html
3030
[latest release]: https://github.com/IQSS/dataverse/releases
3131
[features]: https://dataverse.org/software-features
32+
[project board]: https://github.com/orgs/IQSS/projects/34
3233
[roadmap]: https://www.iq.harvard.edu/roadmap-dataverse-project
3334
[integrations]: https://dataverse.org/integrations
3435
[REST APIs]: https://guides.dataverse.org/en/latest/api/index.html

‎conf/proxy/Caddyfile

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# This configuration is intended to be used with Caddy, a very small high perf proxy.
2+
# It will serve the application containers Payara Admin GUI via HTTP instead of HTTPS,
3+
# avoiding the trouble of self signed certificates for local development.
4+
5+
:4848 {
6+
reverse_proxy https://dataverse:4848 {
7+
transport http {
8+
tls_insecure_skip_verify
9+
}
10+
header_down Location "^https://" "http://"
11+
}
12+
}

‎conf/solr/9.3.0/schema.xml

+6-4
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,8 @@
229229

230230
<!-- incomplete datasets issue 8822 -->
231231
<field name="datasetValid" type="boolean" stored="true" indexed="true" multiValued="false"/>
232+
233+
<field name="license" type="string" stored="true" indexed="true" multiValued="false"/>
232234

233235
<!--
234236
METADATA SCHEMA FIELDS
@@ -327,7 +329,7 @@
327329
<field name="keywordVocabularyURI" type="text_en" multiValued="true" stored="true" indexed="true"/>
328330
<field name="kindOfData" type="text_en" multiValued="true" stored="true" indexed="true"/>
329331
<field name="language" type="text_en" multiValued="true" stored="true" indexed="true"/>
330-
<field name="northLongitude" type="text_en" multiValued="true" stored="true" indexed="true"/>
332+
<field name="northLatitude" type="text_en" multiValued="true" stored="true" indexed="true"/>
331333
<field name="notesText" type="text_en" multiValued="false" stored="true" indexed="true"/>
332334
<field name="originOfSources" type="text_en" multiValued="false" stored="true" indexed="true"/>
333335
<field name="otherDataAppraisal" type="text_en" multiValued="false" stored="true" indexed="true"/>
@@ -370,7 +372,7 @@
370372
<field name="software" type="text_en" multiValued="true" stored="true" indexed="true"/>
371373
<field name="softwareName" type="text_en" multiValued="true" stored="true" indexed="true"/>
372374
<field name="softwareVersion" type="text_en" multiValued="true" stored="true" indexed="true"/>
373-
<field name="southLongitude" type="text_en" multiValued="true" stored="true" indexed="true"/>
375+
<field name="southLatitude" type="text_en" multiValued="true" stored="true" indexed="true"/>
374376
<field name="state" type="text_en" multiValued="true" stored="true" indexed="true"/>
375377
<field name="studyAssayCellType" type="text_en" multiValued="true" stored="true" indexed="true"/>
376378
<field name="studyAssayMeasurementType" type="text_en" multiValued="true" stored="true" indexed="true"/>
@@ -566,7 +568,7 @@
566568
<copyField source="keywordVocabularyURI" dest="_text_" maxChars="3000"/>
567569
<copyField source="kindOfData" dest="_text_" maxChars="3000"/>
568570
<copyField source="language" dest="_text_" maxChars="3000"/>
569-
<copyField source="northLongitude" dest="_text_" maxChars="3000"/>
571+
<copyField source="northLatitude" dest="_text_" maxChars="3000"/>
570572
<copyField source="notesText" dest="_text_" maxChars="3000"/>
571573
<copyField source="originOfSources" dest="_text_" maxChars="3000"/>
572574
<copyField source="otherDataAppraisal" dest="_text_" maxChars="3000"/>
@@ -609,7 +611,7 @@
609611
<copyField source="software" dest="_text_" maxChars="3000"/>
610612
<copyField source="softwareName" dest="_text_" maxChars="3000"/>
611613
<copyField source="softwareVersion" dest="_text_" maxChars="3000"/>
612-
<copyField source="southLongitude" dest="_text_" maxChars="3000"/>
614+
<copyField source="southLatitude" dest="_text_" maxChars="3000"/>
613615
<copyField source="state" dest="_text_" maxChars="3000"/>
614616
<copyField source="studyAssayCellType" dest="_text_" maxChars="3000"/>
615617
<copyField source="studyAssayMeasurementType" dest="_text_" maxChars="3000"/>

‎doc/release-notes/6.1-release-notes.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ Upgrading requires a maintenance window and downtime. Please plan ahead, create
247247

248248
These instructions assume that you've already upgraded through all the 5.x releases and are now running Dataverse 6.0.
249249

250-
0\. These instructions assume that you are upgrading from 6.0. If you are running an earlier version, the only safe way to upgrade is to progress through the upgrades to all the releases in between before attempting the upgrade to 5.14.
250+
0\. These instructions assume that you are upgrading from 6.0. If you are running an earlier version, the only safe way to upgrade is to progress through the upgrades to all the releases in between before attempting the upgrade to 6.1.
251251

252252
If you are running Payara as a non-root user (and you should be!), **remember not to execute the commands below as root**. Use `sudo` to change to that user first. For example, `sudo -i -u dataverse` if `dataverse` is your dedicated application user.
253253

@@ -288,6 +288,7 @@ As noted above, deployment of the war file might take several minutes due a data
288288

289289
6a\. Update Citation Metadata Block (to make Alternative Title repeatable)
290290

291+
- `wget https://github.com/IQSS/dataverse/releases/download/v6.1/citation.tsv`
291292
- `curl http://localhost:8080/api/admin/datasetfield/load -H "Content-type: text/tab-separated-values" -X POST --upload-file scripts/api/data/metadatablocks/citation.tsv`
292293

293294
7\. Upate Solr schema.xml to allow multiple Alternative Titles to be used. See specific instructions below for those installations without custom metadata blocks (7a) and those with custom metadata blocks (7b).

0 commit comments

Comments
 (0)