Skip to content

Commit f07ad4c

Browse files
committed
Merge branch 'develop' into 10554-avoid-solr-join-guest
2 parents ae6cf4e + e6b5856 commit f07ad4c

32 files changed

+526
-343
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Dataverse will use the Dataset thumbnail, if one is defined, rather than the generic Dataverse logo in the Open Graph metadata header. This means the image will be seen when, for example, the dataset is referenced in Facebook.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
The Controlled Vocabuary Values list for the metadata field Language in the Citation block has been improved, with some missing two- and three-letter ISO 639 codes added, as well as more alternative names for some of the languages, making all these extra language identifiers importable.
2+
3+
To be added to the 6.3 release instructions:
4+
5+
Update the Citation block, to incorporate the improved controlled vocabulary for language [plus whatever other improvements may be made to the block in other PRs]:
6+
7+
```
8+
wget https://raw.githubusercontent.com/IQSS/dataverse/v6.3/scripts/api/data/metadatablocks/citation.tsv
9+
curl http://localhost:8080/api/admin/datasetfield/load -H "Content-type: text/tab-separated-values" -X POST --upload-file citation.tsv
10+
```
11+
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
## Release Highlights
2+
3+
### Updates on Support for External Vocabulary Services
4+
5+
#### HTTP Headers
6+
7+
You are now able to add HTTP request headers required by the service you are implementing (#10331)
8+
9+
#### Flexible params in retrievalUri
10+
11+
You can now use `managed-fields` field names as well as the `term-uri-field` field name as parameters in the `retrieval-uri` when configuring an external vocabulary service. `{0}` as an alternative to using the `term-uri-field` name is still supported for backward compatibility.
12+
Also you can specify if the value must be url encoded with `encodeUrl:`. (#10404)
13+
14+
For example : `"retrieval-uri": "https://data.agroportal.lirmm.fr/ontologies/{keywordVocabulary}/classes/{encodeUrl:keywordTermURL}"`
+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
## Release Highlights
2+
3+
### URL validation is more permissive
4+
5+
Url validation now allows two slashes in the path component of the URL. (#9750)
6+
Among other things, this allows metadata fields of `url` type to be filled with more complex url such as https://archive.softwareheritage.org/browse/directory/561bfe6698ca9e58b552b4eb4e56132cac41c6f9/?origin_url=https://github.com/gem-pasteur/macsyfinder&revision=868637fce184865d8e0436338af66a2648e8f6e1&snapshot=1bde3cb370766b10132c4e004c7cb377979928d1
7+

doc/sphinx-guides/source/container/running/production.rst

+26-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,32 @@ Production (Future)
77
Status
88
------
99

10-
The images described in this guide are not yet recommended for production usage.
10+
The images described in this guide are not yet recommended for production usage, but we think we are close. We'd like to make the following improvements:
11+
12+
- Tagged releases
13+
14+
- Currently, you have the choice between "alpha" images that change under your feet every time a new version of Dataverse is released or "unstable" images that track the "develop" branch, which is updated frequently. Instead, we'd like to offer images like 6.4, 6.5, etc. We are tracking this work at https://github.com/IQSS/dataverse/issues/10478 and there is some preliminary code at https://github.com/IQSS/dataverse/tree/10478-version-base-img . You are welcome to join the following discussions:
15+
16+
- https://dataverse.zulipchat.com/#narrow/stream/375812-containers/topic/change.20version.20scheme.20base.20image.3F/near/405636949
17+
- https://dataverse.zulipchat.com/#narrow/stream/375812-containers/topic/tagging.20images.20with.20versions/near/366600747
18+
19+
- More docs on setting up additional features
20+
21+
- How to set up previewers. See https://github.com/IQSS/dataverse/issues/10506
22+
- How to set up Rserve.
23+
24+
- Go through all the features in docs and check what needs to be done differently with containers
25+
26+
- Check ports, for example.
27+
28+
To join the discussion on what else might be needed before declaring images ready for production, please comment on https://dataverse.zulipchat.com/#narrow/stream/375812-containers/topic/containers.20for.20production/near/434979159
29+
30+
You are also very welcome to join our meetings. See "how to help" below.
31+
32+
Limitations
33+
-----------
34+
35+
- Multiple apps servers are not supported. See :ref:`multiple-app-servers` for more on this topic.
1136

1237
How to Help
1338
-----------

doc/sphinx-guides/source/developers/tools.rst

+8
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,14 @@ For example...
137137
138138
would be consistent with a file descriptor leak on the dataset page.
139139

140+
JProfiler
141+
+++++++++
142+
143+
Tracking down resource drainage, bottlenecks etc gets easier using a profiler.
144+
145+
We thank EJ Technologies for granting us a free open source project license for their Java profiler
146+
`JProfiler <https://www.ej-technologies.com/products/jprofiler/overview.html>`_.
147+
140148
jmap and jstat
141149
++++++++++++++
142150

0 commit comments

Comments
 (0)