Skip to content

Commit 4e07b62

Browse files
authored
Merge pull request #6788 from IQSS/develop
v4.20
2 parents affbf4f + eb2fa18 commit 4e07b62

189 files changed

Lines changed: 8561 additions & 2365 deletions

File tree

Some content is hidden

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

CODE_OF_CONDUCT.md

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
# Contributor Covenant Code of Conduct
2+
3+
## Our Pledge
4+
5+
In the interest of fostering an open and welcoming environment, we as
6+
contributors and maintainers pledge to making participation in our project and
7+
our community a harassment-free experience for everyone, regardless of age, body
8+
size, disability, ethnicity, sex characteristics, gender identity and expression,
9+
level of experience, education, socio-economic status, nationality, personal
10+
appearance, race, religion, or sexual identity and orientation.
11+
12+
## Our Standards
13+
14+
Examples of behavior that contributes to creating a positive environment
15+
include:
16+
17+
* Using welcoming and inclusive language
18+
* Being respectful of differing viewpoints and experiences
19+
* Gracefully accepting constructive criticism
20+
* Focusing on what is best for the community
21+
* Showing empathy towards other community members
22+
23+
Examples of unacceptable behavior by participants include:
24+
25+
* The use of sexualized language or imagery and unwelcome sexual attention or
26+
advances
27+
* Trolling, insulting/derogatory comments, and personal or political attacks
28+
* Public or private harassment
29+
* Publishing others' private information, such as a physical or electronic
30+
address, without explicit permission
31+
* Other conduct which could reasonably be considered inappropriate in a
32+
professional setting
33+
34+
## Our Responsibilities
35+
36+
Project maintainers are responsible for clarifying the standards of acceptable
37+
behavior and are expected to take appropriate and fair corrective action in
38+
response to any instances of unacceptable behavior.
39+
40+
Project maintainers have the right and responsibility to remove, edit, or
41+
reject comments, commits, code, wiki edits, issues, and other contributions
42+
that are not aligned to this Code of Conduct, or to ban temporarily or
43+
permanently any contributor for other behaviors that they deem inappropriate,
44+
threatening, offensive, or harmful.
45+
46+
## Scope
47+
48+
This Code of Conduct applies both within project spaces and in public spaces
49+
when an individual is representing the project or its community. Examples of
50+
representing a project or community include using an official project e-mail
51+
address, posting via an official social media account, or acting as an appointed
52+
representative at an online or offline event. Representation of a project may be
53+
further defined and clarified by project maintainers.
54+
55+
## Enforcement
56+
57+
Instances of abusive, harassing, or otherwise unacceptable behavior may be
58+
reported by contacting the project team at support at dataverse dot org. All
59+
complaints will be reviewed and investigated and will result in a response that
60+
is deemed necessary and appropriate to the circumstances. The project team is
61+
obligated to maintain confidentiality with regard to the reporter of an incident.
62+
Further details of specific enforcement policies may be posted separately.
63+
64+
Project maintainers who do not follow or enforce the Code of Conduct in good
65+
faith may face temporary or permanent repercussions as determined by other
66+
members of the project's leadership.
67+
68+
## Attribution
69+
70+
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
71+
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
72+
73+
[homepage]: https://www.contributor-covenant.org
74+
75+
For answers to common questions about this code of conduct, see
76+
https://www.contributor-covenant.org/faq

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ Dataverse is a trademark of President and Fellows of Harvard College and is regi
1818
[![Dataverse Project logo](src/main/webapp/resources/images/dataverseproject_logo.jpg?raw=true "Dataverse Project")](http://dataverse.org)
1919

2020
[![API Test Status](https://jenkins.dataverse.org/buildStatus/icon?job=IQSS-dataverse-develop&subject=API%20Test%20Status)](https://jenkins.dataverse.org/job/IQSS-dataverse-develop/)
21+
[![API Test Coverage](https://img.shields.io/jenkins/coverage/jacoco?jobUrl=https%3A%2F%2Fjenkins.dataverse.org%2Fjob%2FIQSS-dataverse-develop&label=API%20Test%20Coverage)](https://jenkins.dataverse.org/job/IQSS-dataverse-develop/)
2122
[![Unit Test Status](https://img.shields.io/travis/IQSS/dataverse?label=Unit%20Test%20Status)](https://travis-ci.org/IQSS/dataverse)
2223
[![Unit Test Coverage](https://img.shields.io/coveralls/github/IQSS/dataverse?label=Unit%20Test%20Coverage)](https://coveralls.io/github/IQSS/dataverse?branch=develop)
2324

conf/docker-aio/0prep_deps.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ if [ ! -e dv/deps/glassfish4dv.tgz ]; then
1717
# assuming that folks usually have /tmp auto-clean as needed
1818
fi
1919

20-
if [ ! -e dv/deps/solr-7.3.1dv.tgz ]; then
20+
if [ ! -e dv/deps/solr-7.7.2dv.tgz ]; then
2121
echo "solr dependency prep"
2222
# schema changes *should* be the only ones...
2323
cd dv/deps/
2424
#wget https://archive.apache.org/dist/lucene/solr/7.3.0/solr-7.3.0.tgz -O solr-7.3.0dv.tgz
25-
wget https://archive.apache.org/dist/lucene/solr/7.3.1/solr-7.3.1.tgz -O solr-7.3.1dv.tgz
25+
wget https://archive.apache.org/dist/lucene/solr/7.7.2/solr-7.7.2.tgz -O solr-7.7.2dv.tgz
2626
cd ../../
2727
fi
2828

conf/docker-aio/1prep.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
# this was based off the phoenix deployment; and is likely uglier and bulkier than necessary in a perfect world
55

66
mkdir -p testdata/doc/sphinx-guides/source/_static/util/
7-
cp ../solr/7.3.1/schema*.xml testdata/
8-
cp ../solr/7.3.1/solrconfig.xml testdata/
9-
cp ../solr/7.3.1/updateSchemaMDB.sh testdata/
7+
cp ../solr/7.7.2/schema*.xml testdata/
8+
cp ../solr/7.7.2/solrconfig.xml testdata/
9+
cp ../solr/7.7.2/updateSchemaMDB.sh testdata/
1010
cp ../jhove/jhove.conf testdata/
1111
cp ../jhove/jhoveConfig.xsd testdata/
1212
cd ../../

conf/docker-aio/c7.dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ COPY testdata/sushi_sample_logs.json /tmp/
1717
COPY disableipv6.conf /etc/sysctl.d/
1818
RUN rm /etc/httpd/conf/*
1919
COPY httpd.conf /etc/httpd/conf
20-
RUN cd /opt ; tar zxf /tmp/dv/deps/solr-7.3.1dv.tgz
20+
RUN cd /opt ; tar zxf /tmp/dv/deps/solr-7.7.2dv.tgz
2121
RUN cd /opt ; tar zxf /tmp/dv/deps/glassfish4dv.tgz
2222

2323
# 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`
@@ -28,9 +28,9 @@ RUN sudo -u postgres /usr/pgsql-9.6/bin/initdb -D /var/lib/pgsql/data
2828

2929
# copy configuration related files
3030
RUN cp /tmp/dv/pg_hba.conf /var/lib/pgsql/data/
31-
RUN cp -r /opt/solr-7.3.1/server/solr/configsets/_default /opt/solr-7.3.1/server/solr/collection1
32-
RUN cp /tmp/dv/schema*.xml /opt/solr-7.3.1/server/solr/collection1/conf/
33-
RUN cp /tmp/dv/solrconfig.xml /opt/solr-7.3.1/server/solr/collection1/conf/solrconfig.xml
31+
RUN cp -r /opt/solr-7.7.2/server/solr/configsets/_default /opt/solr-7.7.2/server/solr/collection1
32+
RUN cp /tmp/dv/schema*.xml /opt/solr-7.7.2/server/solr/collection1/conf/
33+
RUN cp /tmp/dv/solrconfig.xml /opt/solr-7.7.2/server/solr/collection1/conf/solrconfig.xml
3434

3535
# skipping glassfish user and solr user (run both as root)
3636

conf/docker-aio/entrypoint.bash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
export LANG=en_US.UTF-8
33
#sudo -u postgres /usr/bin/postgres -D /var/lib/pgsql/data &
44
sudo -u postgres /usr/pgsql-9.6/bin/postgres -D /var/lib/pgsql/data &
5-
cd /opt/solr-7.3.1/
5+
cd /opt/solr-7.7.2/
66
# TODO: Run Solr as non-root and remove "-force".
77
bin/solr start -force
88
bin/solr create_core -c collection1 -d server/solr/collection1/conf -force

conf/docker-aio/testscripts/install

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export SMTP_SERVER=localhost
1515
export MEM_HEAP_SIZE=2048
1616
export GLASSFISH_DOMAIN=domain1
1717
cd scripts/installer
18-
cp pgdriver/postgresql-42.2.2.jar $GLASSFISH_ROOT/glassfish/lib
18+
cp pgdriver/postgresql-42.2.9.jar $GLASSFISH_ROOT/glassfish/lib
1919
#cp ../../conf/jhove/jhove.conf $GLASSFISH_ROOT/glassfish/domains/$GLASSFISH_DOMAIN/config/jhove.conf
2020
cp /opt/dv/testdata/jhove.conf $GLASSFISH_ROOT/glassfish/domains/$GLASSFISH_DOMAIN/config/jhove.conf
2121
cp /opt/dv/testdata/jhoveConfig.xsd $GLASSFISH_ROOT/glassfish/domains/$GLASSFISH_DOMAIN/config/jhoveConfig.xsd

conf/docker/dataverse-glassfish/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ RUN /tmp/dvinstall/glassfish-setup.sh
7070
###glassfish-setup will handle everything in Dockerbuild
7171

7272
##install jdbc driver
73-
RUN cp /tmp/dvinstall/pgdriver/postgresql-42.2.2.jar /usr/local/glassfish4/glassfish/domains/domain1/lib
73+
RUN cp /tmp/dvinstall/pgdriver/postgresql-42.2.9.jar /usr/local/glassfish4/glassfish/domains/domain1/lib
7474

7575
# Customized persistence xml to avoid database recreation
7676
#RUN mkdir -p /tmp/WEB-INF/classes/META-INF/
File renamed without changes.
Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,12 @@
171171
<field name="variableName" type="text_en" stored="true" indexed="true" multiValued="true"/>
172172
<field name="variableLabel" type="text_en" stored="true" indexed="true" multiValued="true"/>
173173

174+
<field name="literalQuestion" type="text_en" stored="true" indexed="true" multiValued="true"/>
175+
<field name="interviewInstructions" type="text_en" stored="true" indexed="true" multiValued="true"/>
176+
<field name="postQuestion" type="text_en" stored="true" indexed="true" multiValued="true"/>
177+
<field name="variableUniverse" type="text_en" stored="true" indexed="true" multiValued="true"/>
178+
<field name="variableNotes" type="text_en" stored="true" indexed="true" multiValued="true"/>
179+
174180
<field name="fileDescription" type="text_en" stored="true" indexed="true" multiValued="false"/>
175181

176182
<field name="fileTypeGroupFacet" type="string" stored="true" indexed="true" multiValued="false"/>
@@ -229,6 +235,12 @@
229235
<!-- Added for Dataverse 4.0 Beta: make variable names and labels searchable in basic search https://redmine.hmdc.harvard.edu/issues/3945 -->
230236
<copyField source="variableName" dest="_text_" maxChars="3000"/>
231237
<copyField source="variableLabel" dest="_text_" maxChars="3000"/>
238+
<!-- Added variable level metadata that can be updated from DCT -->
239+
<copyField source="literalQuestion" dest="_text_" maxChars="3000"/>
240+
<copyField source="interviewInstructions" dest="_text_" maxChars="3000"/>
241+
<copyField source="postQuestion" dest="_text_" maxChars="3000"/>
242+
<copyField source="variableUniverse" dest="_text_" maxChars="3000"/>
243+
<copyField source="variableNotes" dest="_text_" maxChars="3000"/>
232244
<!-- Make dataverse subject and affiliation searchable from basic search: https://github.com/IQSS/dataverse/issues/1431 -->
233245
<copyField source="dvSubject" dest="_text_" maxChars="3000"/>
234246
<copyField source="dvAlias" dest="_text_" maxChars="3000"/>
@@ -281,7 +293,7 @@
281293
<!-- Dataverse copyField from http://localhost:8080/api/admin/index/solr/schema -->
282294
<xi:include href="schema_dv_mdb_copies.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
283295

284-
<!-- End: Dataverse Specific -->
296+
<!-- End: Dataverse-specific -->
285297

286298
<!-- This can be enabled, in case the client does not know what fields may be searched. It isn't enabled by default
287299
because it's very expensive to index everything twice. -->

0 commit comments

Comments
 (0)