IQSS · ErykKul · Jan 11, 2023 · Jan 12, 2023 · Jan 13, 2023 · Jan 13, 2023
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,11 +1,13 @@
 ---
 name: Bug report
-about: Did you encounter something unexpected or incorrect in the Dataverse software? We'd like to hear about it!
+about: Did you encounter something unexpected or incorrect in the Dataverse software?
+  We'd like to hear about it!
 title: ''
 labels: ''
 assignees: ''
 
 ---
+
 <!--
 Thank you for contributing to the Dataverse Project through the creation of a bug report!
 

diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -6,6 +6,7 @@ labels: ''
 assignees: ''
 
 ---
+
 <!--
 Thank you for contributing to the Dataverse Project through the creation of a feature request!
 
@@ -32,4 +33,4 @@ Start below this comment section.
 **Any brand new behavior do you want to add to Dataverse?**
 
 
-**Any related open or closed issues to this feature request?**
+**Any open or closed issues related to this feature request?**
diff --git a/.github/workflows/container_base_push.yml b/.github/workflows/container_base_push.yml
@@ -31,7 +31,7 @@ jobs:
             packages: read
         strategy:
             matrix:
-                jdk: [ '11' ]
+                jdk: [ '17' ]
         # Only run in upstream repo - avoid unnecessary runs in forks
         if: ${{ github.repository_owner == 'IQSS' }}
 

diff --git a/.github/workflows/maven_unit_test.yml b/.github/workflows/maven_unit_test.yml
@@ -18,7 +18,7 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                jdk: [ '11' ]
+                jdk: [ '17' ]
                 experimental: [false]
                 status:  ["Stable"]
                 #

diff --git a/conf/docker-aio/0prep_deps.sh b/conf/docker-aio/0prep_deps.sh
@@ -2,11 +2,11 @@
 if [ ! -d dv/deps ]; then
 	mkdir -p dv/deps
 fi
-wdir=`pwd`
+wdir="pwd"
 
-if [ ! -e dv/deps/payara-6.2022.1.zip ]; then
+if [ ! -e dv/deps/payara-6.2023.2.zip ]; then
 	echo "payara dependency prep"
-	wget https://s3.eu-west-1.amazonaws.com/payara.fish/Payara+Downloads/6.2022.1/payara-6.2022.1.zip -O dv/deps/payara-6.2022.1.zip
+	wget https://s3.eu-west-1.amazonaws.com/payara.fish/Payara+Downloads/6.2023.2/payara-6.2023.2.zip -O dv/deps/payara-6.2023.2.zip
 fi
 
 if [ ! -e dv/deps/solr-8.11.1dv.tgz ]; then
@@ -16,4 +16,3 @@ if [ ! -e dv/deps/solr-8.11.1dv.tgz ]; then
 	wget https://archive.apache.org/dist/lucene/solr/8.11.1/solr-8.11.1.tgz -O solr-8.11.1dv.tgz
 	cd ../../
 fi
-
diff --git a/conf/docker-aio/1prep.sh b/conf/docker-aio/1prep.sh
@@ -16,13 +16,14 @@ wget -q https://downloads.apache.org/maven/maven-3/3.8.5/binaries/apache-maven-3
 tar xfz apache-maven-3.8.5-bin.tar.gz
 mkdir maven
 mv apache-maven-3.8.5/* maven/
-echo "export JAVA_HOME=/usr/lib/jvm/jre-openjdk" > maven/maven.sh
+echo "export JAVA_HOME=/usr/lib/jvm/java-17-openjdk" > maven/maven.sh
 echo "export M2_HOME=../maven" >> maven/maven.sh
 echo "export MAVEN_HOME=../maven" >> maven/maven.sh
 echo "export PATH=../maven/bin:${PATH}" >> maven/maven.sh
 chmod 0755 maven/maven.sh
 
 # not using dvinstall.zip for setupIT.bash; but still used in install.bash for normal ops
+cp conf/docker-aio/microprofile-config.properties src/main/resources/META-INF/microprofile-config.properties
 source maven/maven.sh && mvn clean
 ./scripts/installer/custom-build-number
 source maven/maven.sh && mvn package

diff --git a/conf/docker-aio/c8.dockerfile b/conf/docker-aio/c8.dockerfile
@@ -5,7 +5,7 @@ RUN dnf -qy module disable postgresql
 RUN yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-8-x86_64/pgdg-redhat-repo-latest.noarch.rpm
 
 RUN echo "fastestmirror=true" >> /etc/dnf/dnf.conf
-RUN yum install -y java-11-openjdk-devel postgresql13-server sudo epel-release unzip curl httpd python2 diffutils
+RUN yum install -y java-17-openjdk-devel postgresql13-server sudo epel-release unzip curl httpd python2 diffutils procps
 RUN yum install -y jq lsof awscli
 
 # for older search scripts
@@ -24,7 +24,7 @@ COPY disableipv6.conf /etc/sysctl.d/
 RUN rm /etc/httpd/conf/*
 COPY httpd.conf /etc/httpd/conf 
 RUN cd /opt ; tar zxf /tmp/dv/deps/solr-8.11.1dv.tgz
-RUN cd /opt ; unzip /tmp/dv/deps/payara-6.2022.1.zip ; ln -s /opt/payara6 /opt/glassfish4
+RUN cd /opt ; unzip /tmp/dv/deps/payara-6.2023.2.zip ; ln -s /opt/payara6 /opt/glassfish4
 
 # 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`
 # this dies under Java 11, do we keep it?

diff --git a/conf/docker-aio/dv/install/default.config b/conf/docker-aio/dv/install/default.config
@@ -1,5 +1,5 @@
 HOST_DNS_ADDRESS	localhost
-GLASSFISH_DIRECTORY	/opt/glassfish4
+GLASSFISH_DIRECTORY	/opt/payara6
 ADMIN_EMAIL	 
 MAIL_SERVER	mail.hmdc.harvard.edu
 POSTGRES_ADMIN_PASSWORD	secret
@@ -8,7 +8,7 @@ POSTGRES_PORT	5432
 POSTGRES_DATABASE	dvndb
 POSTGRES_USER	dvnapp
 POSTGRES_PASSWORD	secret
-SOLR_LOCATION	idx
+SOLR_LOCATION	LOCAL
 RSERVE_HOST	localhost
 RSERVE_PORT	6311
 RSERVE_USER	rserve

diff --git a/conf/docker-aio/microprofile-config.properties b/conf/docker-aio/microprofile-config.properties
@@ -0,0 +1,42 @@
+# GENERAL
+# Will be replaced by Maven property in /target via filtering (see <build><resources><resource>)
+dataverse.version=6.0.0
+dataverse.build=
+
+# Default only for containers! (keep mimicking the current behaviour -
+# changing that is part of https://github.com/IQSS/dataverse/issues/6636)
+%ct.dataverse.fqdn=localhost
+%ct.dataverse.siteUrl=http://${dataverse.fqdn}:8084
+
+# FILES
+dataverse.files.directory=/tmp/dataverse
+
+# SEARCH INDEX
+dataverse.solr.host=localhost
+# Activating mp config profile -Dmp.config.profile=ct changes default to "solr" as DNS name
+%ct.dataverse.solr.host=solr
+dataverse.solr.port=8983
+dataverse.solr.protocol=http
+dataverse.solr.core=collection1
+dataverse.solr.path=/solr/${dataverse.solr.core}
+
+# DATABASE
+dataverse.db.host=localhost
+dataverse.db.port=5432
+dataverse.db.user=dataverse
+dataverse.db.name=dataverse
+
+# RSERVE
+dataverse.rserve.host=localhost
+dataverse.rserve.port=6311
+dataverse.rserve.user=rserve
+dataverse.rserve.password=rserve
+dataverse.rserve.tempdir=/tmp/Rserv
+
+# OAI SERVER
+dataverse.oai.server.maxidentifiers=2
+dataverse.oai.server.maxrecords=2
+dataverse.oai.server.maxsets=100
+# the OAI repository name, as shown by the Identify verb,
+# can be customized via the setting below:
+#dataverse.oai.server.repositoryname=
diff --git a/conf/docker-aio/microprofile-config.properties2 b/conf/docker-aio/microprofile-config.properties2
@@ -0,0 +1,42 @@
+# GENERAL
+# Will be replaced by Maven property in /target via filtering (see <build><resources><resource>)
+dataverse.version=${project.version}
+dataverse.build=
+
+# Default only for containers! (keep mimicking the current behaviour -
+# changing that is part of https://github.com/IQSS/dataverse/issues/6636)
+%ct.dataverse.fqdn=localhost
+%ct.dataverse.siteUrl=http://${dataverse.fqdn}:8080
+
+# FILES
+dataverse.files.directory=/tmp/dataverse
+
+# SEARCH INDEX
+dataverse.solr.host=localhost
+# Activating mp config profile -Dmp.config.profile=ct changes default to "solr" as DNS name
+%ct.dataverse.solr.host=solr
+dataverse.solr.port=8983
+dataverse.solr.protocol=http
+dataverse.solr.core=collection1
+dataverse.solr.path=/solr/${dataverse.solr.core}
+
+# DATABASE
+dataverse.db.host=localhost
+dataverse.db.port=5432
+dataverse.db.user=dataverse
+dataverse.db.name=dataverse
+
+# RSERVE
+dataverse.rserve.host=localhost
+dataverse.rserve.port=6311
+dataverse.rserve.user=rserve
+dataverse.rserve.password=rserve
+dataverse.rserve.tempdir=/tmp/Rserv
+
+# OAI SERVER
+dataverse.oai.server.maxidentifiers=100
+dataverse.oai.server.maxrecords=10
+dataverse.oai.server.maxsets=100
+# the OAI repository name, as shown by the Identify verb,
+# can be customized via the setting below:
+#dataverse.oai.server.repositoryname=
diff --git a/conf/docker-aio/prep_it.bash b/conf/docker-aio/prep_it.bash
@@ -14,7 +14,7 @@ docker build -t dv0 -f c8.dockerfile .
 # cleanup from previous runs if necessary
 docker rm -f dv
 # start container
-docker run -d -p 8084:80 -p 8083:8080 -p 9010:9009 --name dv dv0
+docker run -d -p 8084:80 -p 8083:8080 -p 9010:9009 -p 8983:8983 --name dv dv0
 # wait for glassfish to be healthy
 i_wait=0
 d_wait=10
@@ -36,20 +36,23 @@ if [ $err -ne 0 ]; then
 	echo "error - setupIT failure"
 	exit 1
 fi
+echo -n "Waiting for Dataverse ready "
+while [ "$(curl -sk -m 1 -I http://localhost:8084/api/info/version | head -n 1 | cut -d' ' -f2)" != "200" ]; do \
+		[[ $? -gt 0 ]] && echo -n 'x' || echo -n '.'; sleep 1; done && true
+echo	' OK.'
 # configure DOI provider based on docker build arguments / environmental variables
 docker exec dv /opt/dv/configure_doi.bash
 err=$?
 if [ $err -ne 0 ]; then
 	echo "error - DOI configuration failure"
 	exit 1
 fi
-# handle config for the private url test (and things like publishing...)
-./seturl.bash
-
 
 cd ../..
 #echo "docker-aio ready to run integration tests ($i_retry)"
 echo "docker-aio ready to run integration tests"
 curl http://localhost:8084/api/info/version
 echo $?
 
+cp conf/docker-aio/microprofile-config.properties2 src/main/resources/META-INF/microprofile-config.properties
+docker system prune -a -f
diff --git a/conf/docker-aio/seturl.bash b/conf/docker-aio/seturl.bash
diff --git a/conf/docker-aio/testscripts/install b/conf/docker-aio/testscripts/install
@@ -15,6 +15,7 @@ export RSERVE_PASS=rserve
 export SMTP_SERVER=localhost
 export MEM_HEAP_SIZE=2048
 export GLASSFISH_DOMAIN=domain1
+export SOLR_LOCATION=LOCAL
 cd scripts/installer
 #cp ../../conf/jhove/jhove.conf $GLASSFISH_ROOT/glassfish/domains/$GLASSFISH_DOMAIN/config/jhove.conf
 cp /opt/dv/testdata/jhove.conf $GLASSFISH_ROOT/glassfish/domains/$GLASSFISH_DOMAIN/config/jhove.conf

diff --git a/conf/docker-aio/testscripts/post b/conf/docker-aio/testscripts/post
@@ -1,15 +1,8 @@
-#/bin/sh
+#!/bin/sh
 cd scripts/api
 ./setup-all.sh --insecure -p=admin1 | tee /tmp/setup-all.sh.out
 cd ../..
 psql -U dvnapp dvndb -f doc/sphinx-guides/source/_static/util/createsequence.sql
 scripts/search/tests/publish-dataverse-root
-#git checkout scripts/api/data/dv-root.json
 scripts/search/tests/grant-authusers-add-on-root
-echo "exiting post script early (not creating test users, etc.)"
 exit
-scripts/search/populate-users
-scripts/search/create-users
-scripts/search/tests/create-all-and-test
-scripts/search/tests/publish-spruce1-and-test
-#java -jar downloads/schemaSpy_5.0.0.jar -t pgsql -host localhost -db dvndb -u postgres -p secret -s public -dp scripts/installer/pgdriver/postgresql-9.1-902.jdbc4.jar -o /var/www/html/schemaspy/latest
diff --git a/conf/solr/8.11.1/schema.xml b/conf/solr/8.11.1/schema.xml
@@ -266,9 +266,6 @@
     <field name="cleaningOperations" type="text_en" multiValued="false" stored="true" indexed="true"/>
     <field name="collectionMode" type="text_en" multiValued="true" stored="true" indexed="true"/>
     <field name="collectorTraining" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="workflowType" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="workflowCodeRepository" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="workflowDocumentation" type="text_en" multiValued="true" stored="true" indexed="true"/>
     <field name="contributor" type="text_en" multiValued="true" stored="true" indexed="true"/>
     <field name="contributorName" type="text_en" multiValued="true" stored="true" indexed="true"/>
     <field name="contributorType" type="text_en" multiValued="true" stored="true" indexed="true"/>
@@ -350,7 +347,7 @@
     <field name="producerName" type="text_en" multiValued="true" stored="true" indexed="true"/>
     <field name="producerURL" type="text_en" multiValued="true" stored="true" indexed="true"/>
     <field name="productionDate" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="productionPlace" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="productionPlace" type="text_en" multiValued="true" stored="true" indexed="true"/>
     <field name="publication" type="text_en" multiValued="true" stored="true" indexed="true"/>
     <field name="publicationCitation" type="text_en" multiValued="true" stored="true" indexed="true"/>
     <field name="publicationIDNumber" type="text_en" multiValued="true" stored="true" indexed="true"/>
@@ -506,9 +503,6 @@
     <copyField source="cleaningOperations" dest="_text_" maxChars="3000"/>
     <copyField source="collectionMode" dest="_text_" maxChars="3000"/>
     <copyField source="collectorTraining" dest="_text_" maxChars="3000"/>
-    <copyField source="workflowType" dest="_text_" maxChars="3000"/>
-    <copyField source="workflowCodeRepository" dest="_text_" maxChars="3000"/>
-    <copyField source="workflowDocumentation" dest="_text_" maxChars="3000"/>
     <copyField source="contributor" dest="_text_" maxChars="3000"/>
     <copyField source="contributorName" dest="_text_" maxChars="3000"/>
     <copyField source="contributorType" dest="_text_" maxChars="3000"/>

diff --git a/doc/release-notes/1249-collapse_dataverse_description.md b/doc/release-notes/1249-collapse_dataverse_description.md
@@ -0,0 +1 @@
+Long descriptions for collections are now truncated but can be expanded to read the full description.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Long descriptions for collections are now truncated but can be expanded to read the full description.