From ff2e890736ff6735e50912b2c539c23bca110bed Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Wed, 17 Sep 2025 17:00:20 -0400 Subject: [PATCH 01/11] Payara 6.2025.9 update --- .github/workflows/container_maintenance.yml | 4 ++-- doc/sphinx-guides/source/container/base-image.rst | 2 +- doc/sphinx-guides/source/developers/classic-dev-env.rst | 6 +++--- doc/sphinx-guides/source/installation/prerequisites.rst | 6 +++--- doc/sphinx-guides/source/qa/test-automation.md | 2 +- modules/dataverse-parent/pom.xml | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/container_maintenance.yml b/.github/workflows/container_maintenance.yml index 142363cbe1a..744de1c5165 100644 --- a/.github/workflows/container_maintenance.yml +++ b/.github/workflows/container_maintenance.yml @@ -63,11 +63,11 @@ jobs: - discover outputs: # This is a JSON map with keys of branch names (supported releases & develop) and values containing an array of known image tags for the branch - # Example: {"v6.6": ["latest", "6.6-noble", "6.6-noble-r1"], "v6.5": ["6.5-noble", "6.5-noble-r5"], "v6.4": ["6.4-noble", "6.4-noble-r12"], "develop": ["unstable", "6.7-noble", "6.7-noble-p6.2025.3-j17"]} + # Example: {"v6.6": ["latest", "6.6-noble", "6.6-noble-r1"], "v6.5": ["6.5-noble", "6.5-noble-r5"], "v6.4": ["6.4-noble", "6.4-noble-r12"], "develop": ["unstable", "6.7-noble", "6.7-noble-p6.2025.9-j17"]} supported_tag_matrix: ${{ steps.execute.outputs.supported_tag_matrix }} # This is a JSON list containing a flattened map of branch names and the latest non-rolling tag - # Example: [ "v6.6=gdcc/base:6.6-noble-r1", "v6.5=gdcc/base:6.5-noble-r5", "v6.4=gdcc/base:6.4-noble-r12", "develop=gdcc/base:6.7-noble-p6.2025.3-j17" ] + # Example: [ "v6.6=gdcc/base:6.6-noble-r1", "v6.5=gdcc/base:6.5-noble-r5", "v6.4=gdcc/base:6.4-noble-r12", "develop=gdcc/base:6.7-noble-p6.2025.9-j17" ] rebuilt_images: ${{ steps.execute.outputs.rebuilt_images }} steps: diff --git a/doc/sphinx-guides/source/container/base-image.rst b/doc/sphinx-guides/source/container/base-image.rst index 4adc6bb6fb1..0720995deb2 100644 --- a/doc/sphinx-guides/source/container/base-image.rst +++ b/doc/sphinx-guides/source/container/base-image.rst @@ -82,7 +82,7 @@ For now, stale images will be kept on Docker Hub indefinitely. Will roll over to the rolling production tag after a Dataverse release. - | **Flexible Stack** | Definition: ``.--p-j`` - | Example: :substitution-code:`|nextVersion|-noble-p6.2025.3-j17` + | Example: :substitution-code:`|nextVersion|-noble-p6.2025.9-j17` | Summary: Rolling tag during a development cycle of the Dataverse software (`Dockerfile `__). **NOTE**: In these tags for development usage, the version number will always be 1 minor version ahead of existing Dataverse releases. diff --git a/doc/sphinx-guides/source/developers/classic-dev-env.rst b/doc/sphinx-guides/source/developers/classic-dev-env.rst index d1f54fd9d5f..1c9e4d5c35d 100755 --- a/doc/sphinx-guides/source/developers/classic-dev-env.rst +++ b/doc/sphinx-guides/source/developers/classic-dev-env.rst @@ -93,15 +93,15 @@ On Linux, install ``jq`` from your package manager or download a binary from htt Install Payara ~~~~~~~~~~~~~~ -Payara 6.2025.3 or higher is required. +Payara 6.2025.9 or higher is required. To install Payara, run the following commands: ``cd /usr/local`` -``sudo curl -O -L https://nexus.payara.fish/repository/payara-community/fish/payara/distributions/payara/6.2025.3/payara-6.2025.3.zip`` +``sudo curl -O -L https://nexus.payara.fish/repository/payara-community/fish/payara/distributions/payara/6.2025.9/payara-6.2025.9.zip`` -``sudo unzip payara-6.2025.3.zip`` +``sudo unzip payara-6.2025.9.zip`` ``sudo chown -R $USER /usr/local/payara6`` diff --git a/doc/sphinx-guides/source/installation/prerequisites.rst b/doc/sphinx-guides/source/installation/prerequisites.rst index a5aacc4701c..2b456f7c0ed 100644 --- a/doc/sphinx-guides/source/installation/prerequisites.rst +++ b/doc/sphinx-guides/source/installation/prerequisites.rst @@ -44,7 +44,7 @@ On RHEL/derivative you can make Java 17 the default with the ``alternatives`` co Payara ------ -Payara 6.2025.3 is recommended. Newer versions might work fine. Regular updates are recommended. +Payara 6.2025.9 is recommended. Newer versions might work fine. Regular updates are recommended. Installing Payara ================= @@ -55,8 +55,8 @@ Installing Payara - Download and install Payara (installed in ``/usr/local/payara6`` in the example commands below):: - # wget https://nexus.payara.fish/repository/payara-community/fish/payara/distributions/payara/6.2025.3/payara-6.2025.3.zip - # unzip payara-6.2025.3.zip + # wget https://nexus.payara.fish/repository/payara-community/fish/payara/distributions/payara/6.2025.9/payara-6.2025.9.zip + # unzip payara-6.2025.9.zip # mv payara6 /usr/local If nexus.payara.fish is ever down for maintenance, Payara distributions are also available from https://repo1.maven.org/maven2/fish/payara/distributions/payara/ diff --git a/doc/sphinx-guides/source/qa/test-automation.md b/doc/sphinx-guides/source/qa/test-automation.md index fa995bcaafd..7650b41db81 100644 --- a/doc/sphinx-guides/source/qa/test-automation.md +++ b/doc/sphinx-guides/source/qa/test-automation.md @@ -52,7 +52,7 @@ Go to the end of the log and then scroll up, looking for the failure. A failed A ``` TASK [dataverse : download payara zip] ***************************************** -fatal: [localhost]: FAILED! => {"changed": false, "dest": "/tmp/payara.zip", "elapsed": 10, "msg": "Request failed: ", "url": "https://nexus.payara.fish/repository/payara-community/fish/payara/distributions/payara/6.2025.3/payara-6.2025.3.zip"} +fatal: [localhost]: FAILED! => {"changed": false, "dest": "/tmp/payara.zip", "elapsed": 10, "msg": "Request failed: ", "url": "https://nexus.payara.fish/repository/payara-community/fish/payara/distributions/payara/6.2025.9/payara-6.2025.9.zip"} ``` In the example above, if Payara can't be downloaded, we're obviously going to have problems deploying Dataverse to it! diff --git a/modules/dataverse-parent/pom.xml b/modules/dataverse-parent/pom.xml index 0cb83fffc0f..11e761e2a77 100644 --- a/modules/dataverse-parent/pom.xml +++ b/modules/dataverse-parent/pom.xml @@ -149,7 +149,7 @@ -Duser.timezone=${project.timezone} -Dfile.encoding=${project.build.sourceEncoding} -Duser.language=${project.language} -Duser.region=${project.region} - 6.2025.3 + 6.2025.9 42.7.7 9.8.0 2.33.0 From bc330b73a38166359697eaf1a2abf3bb3d9c7ff4 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Wed, 17 Sep 2025 17:04:22 -0400 Subject: [PATCH 02/11] release note --- doc/release-notes/11827-Payara-6.2025.9.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 doc/release-notes/11827-Payara-6.2025.9.md diff --git a/doc/release-notes/11827-Payara-6.2025.9.md b/doc/release-notes/11827-Payara-6.2025.9.md new file mode 100644 index 00000000000..1a084312358 --- /dev/null +++ b/doc/release-notes/11827-Payara-6.2025.9.md @@ -0,0 +1,3 @@ +The recommended Payara version has been updated to Payara-6.2025.9 + +Standard Payara upgrade instructions - as in the 6.7 release notes should be added. From 49764d8d38fd2c26bd2cdaa5bd19976b3d632fd9 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Thu, 16 Oct 2025 10:51:20 -0400 Subject: [PATCH 03/11] up to 6.2025.10, revert examples in docs to 6.2025.3 --- .github/workflows/container_maintenance.yml | 4 ++-- .../{11827-Payara-6.2025.9.md => 11827-Payara-6.2025.10.md} | 2 +- doc/sphinx-guides/source/container/base-image.rst | 2 +- doc/sphinx-guides/source/developers/classic-dev-env.rst | 6 +++--- doc/sphinx-guides/source/installation/prerequisites.rst | 6 +++--- doc/sphinx-guides/source/qa/test-automation.md | 2 +- modules/dataverse-parent/pom.xml | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) rename doc/release-notes/{11827-Payara-6.2025.9.md => 11827-Payara-6.2025.10.md} (97%) diff --git a/.github/workflows/container_maintenance.yml b/.github/workflows/container_maintenance.yml index 744de1c5165..142363cbe1a 100644 --- a/.github/workflows/container_maintenance.yml +++ b/.github/workflows/container_maintenance.yml @@ -63,11 +63,11 @@ jobs: - discover outputs: # This is a JSON map with keys of branch names (supported releases & develop) and values containing an array of known image tags for the branch - # Example: {"v6.6": ["latest", "6.6-noble", "6.6-noble-r1"], "v6.5": ["6.5-noble", "6.5-noble-r5"], "v6.4": ["6.4-noble", "6.4-noble-r12"], "develop": ["unstable", "6.7-noble", "6.7-noble-p6.2025.9-j17"]} + # Example: {"v6.6": ["latest", "6.6-noble", "6.6-noble-r1"], "v6.5": ["6.5-noble", "6.5-noble-r5"], "v6.4": ["6.4-noble", "6.4-noble-r12"], "develop": ["unstable", "6.7-noble", "6.7-noble-p6.2025.3-j17"]} supported_tag_matrix: ${{ steps.execute.outputs.supported_tag_matrix }} # This is a JSON list containing a flattened map of branch names and the latest non-rolling tag - # Example: [ "v6.6=gdcc/base:6.6-noble-r1", "v6.5=gdcc/base:6.5-noble-r5", "v6.4=gdcc/base:6.4-noble-r12", "develop=gdcc/base:6.7-noble-p6.2025.9-j17" ] + # Example: [ "v6.6=gdcc/base:6.6-noble-r1", "v6.5=gdcc/base:6.5-noble-r5", "v6.4=gdcc/base:6.4-noble-r12", "develop=gdcc/base:6.7-noble-p6.2025.3-j17" ] rebuilt_images: ${{ steps.execute.outputs.rebuilt_images }} steps: diff --git a/doc/release-notes/11827-Payara-6.2025.9.md b/doc/release-notes/11827-Payara-6.2025.10.md similarity index 97% rename from doc/release-notes/11827-Payara-6.2025.9.md rename to doc/release-notes/11827-Payara-6.2025.10.md index 1a084312358..c79ec04e696 100644 --- a/doc/release-notes/11827-Payara-6.2025.9.md +++ b/doc/release-notes/11827-Payara-6.2025.10.md @@ -1,3 +1,3 @@ -The recommended Payara version has been updated to Payara-6.2025.9 +The recommended Payara version has been updated to Payara-6.2025.10 Standard Payara upgrade instructions - as in the 6.7 release notes should be added. diff --git a/doc/sphinx-guides/source/container/base-image.rst b/doc/sphinx-guides/source/container/base-image.rst index 0720995deb2..4adc6bb6fb1 100644 --- a/doc/sphinx-guides/source/container/base-image.rst +++ b/doc/sphinx-guides/source/container/base-image.rst @@ -82,7 +82,7 @@ For now, stale images will be kept on Docker Hub indefinitely. Will roll over to the rolling production tag after a Dataverse release. - | **Flexible Stack** | Definition: ``.--p-j`` - | Example: :substitution-code:`|nextVersion|-noble-p6.2025.9-j17` + | Example: :substitution-code:`|nextVersion|-noble-p6.2025.3-j17` | Summary: Rolling tag during a development cycle of the Dataverse software (`Dockerfile `__). **NOTE**: In these tags for development usage, the version number will always be 1 minor version ahead of existing Dataverse releases. diff --git a/doc/sphinx-guides/source/developers/classic-dev-env.rst b/doc/sphinx-guides/source/developers/classic-dev-env.rst index 1c9e4d5c35d..5dc68325767 100755 --- a/doc/sphinx-guides/source/developers/classic-dev-env.rst +++ b/doc/sphinx-guides/source/developers/classic-dev-env.rst @@ -93,15 +93,15 @@ On Linux, install ``jq`` from your package manager or download a binary from htt Install Payara ~~~~~~~~~~~~~~ -Payara 6.2025.9 or higher is required. +Payara 6.2025.10 or higher is required. To install Payara, run the following commands: ``cd /usr/local`` -``sudo curl -O -L https://nexus.payara.fish/repository/payara-community/fish/payara/distributions/payara/6.2025.9/payara-6.2025.9.zip`` +``sudo curl -O -L https://nexus.payara.fish/repository/payara-community/fish/payara/distributions/payara/6.2025.10/payara-6.2025.10.zip`` -``sudo unzip payara-6.2025.9.zip`` +``sudo unzip payara-6.2025.10.zip`` ``sudo chown -R $USER /usr/local/payara6`` diff --git a/doc/sphinx-guides/source/installation/prerequisites.rst b/doc/sphinx-guides/source/installation/prerequisites.rst index 2b456f7c0ed..70a1c618fe5 100644 --- a/doc/sphinx-guides/source/installation/prerequisites.rst +++ b/doc/sphinx-guides/source/installation/prerequisites.rst @@ -44,7 +44,7 @@ On RHEL/derivative you can make Java 17 the default with the ``alternatives`` co Payara ------ -Payara 6.2025.9 is recommended. Newer versions might work fine. Regular updates are recommended. +Payara 6.2025.10 is recommended. Newer versions might work fine. Regular updates are recommended. Installing Payara ================= @@ -55,8 +55,8 @@ Installing Payara - Download and install Payara (installed in ``/usr/local/payara6`` in the example commands below):: - # wget https://nexus.payara.fish/repository/payara-community/fish/payara/distributions/payara/6.2025.9/payara-6.2025.9.zip - # unzip payara-6.2025.9.zip + # wget https://nexus.payara.fish/repository/payara-community/fish/payara/distributions/payara/6.2025.10/payara-6.2025.10.zip + # unzip payara-6.2025.10.zip # mv payara6 /usr/local If nexus.payara.fish is ever down for maintenance, Payara distributions are also available from https://repo1.maven.org/maven2/fish/payara/distributions/payara/ diff --git a/doc/sphinx-guides/source/qa/test-automation.md b/doc/sphinx-guides/source/qa/test-automation.md index 7650b41db81..a9f40a7dab2 100644 --- a/doc/sphinx-guides/source/qa/test-automation.md +++ b/doc/sphinx-guides/source/qa/test-automation.md @@ -52,7 +52,7 @@ Go to the end of the log and then scroll up, looking for the failure. A failed A ``` TASK [dataverse : download payara zip] ***************************************** -fatal: [localhost]: FAILED! => {"changed": false, "dest": "/tmp/payara.zip", "elapsed": 10, "msg": "Request failed: ", "url": "https://nexus.payara.fish/repository/payara-community/fish/payara/distributions/payara/6.2025.9/payara-6.2025.9.zip"} +fatal: [localhost]: FAILED! => {"changed": false, "dest": "/tmp/payara.zip", "elapsed": 10, "msg": "Request failed: ", "url": "https://nexus.payara.fish/repository/payara-community/fish/payara/distributions/payara/6.2025.10/payara-6.2025.10.zip"} ``` In the example above, if Payara can't be downloaded, we're obviously going to have problems deploying Dataverse to it! diff --git a/modules/dataverse-parent/pom.xml b/modules/dataverse-parent/pom.xml index 33491630848..c2cca5f98e0 100644 --- a/modules/dataverse-parent/pom.xml +++ b/modules/dataverse-parent/pom.xml @@ -149,7 +149,7 @@ -Duser.timezone=${project.timezone} -Dfile.encoding=${project.build.sourceEncoding} -Duser.language=${project.language} -Duser.region=${project.region} - 6.2025.9 + 6.2025.10 42.7.7 9.8.0 2.33.0 From 8d4d14d8715f8daaf20bb143a71339916ddb6f38 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Thu, 16 Oct 2025 11:47:21 -0400 Subject: [PATCH 04/11] storedprocedure fix --- src/main/java/edu/harvard/iq/dataverse/GuestbookResponse.java | 4 +--- .../harvard/iq/dataverse/GuestbookResponseServiceBean.java | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/GuestbookResponse.java b/src/main/java/edu/harvard/iq/dataverse/GuestbookResponse.java index 830c7740e34..ed89ae2a858 100644 --- a/src/main/java/edu/harvard/iq/dataverse/GuestbookResponse.java +++ b/src/main/java/edu/harvard/iq/dataverse/GuestbookResponse.java @@ -29,9 +29,7 @@ @NamedStoredProcedureQuery( name = "GuestbookResponse.estimateGuestBookResponseTableSize", procedureName = "estimateGuestBookResponseTableSize", - parameters = { - @StoredProcedureParameter(mode = ParameterMode.OUT, type = Long.class) - } + resultClasses = Long.class ) @Entity @Table(indexes = { diff --git a/src/main/java/edu/harvard/iq/dataverse/GuestbookResponseServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/GuestbookResponseServiceBean.java index 6c043b78941..1fece900244 100644 --- a/src/main/java/edu/harvard/iq/dataverse/GuestbookResponseServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/GuestbookResponseServiceBean.java @@ -954,7 +954,7 @@ public Long getTotalDownloadCount() { try { StoredProcedureQuery query = this.em.createNamedStoredProcedureQuery("GuestbookResponse.estimateGuestBookResponseTableSize"); query.execute(); - Long totalCount = (Long) query.getOutputParameterValue(1); + Long totalCount = (Long) query.getSingleResult(); if (totalCount != null) { return totalCount; From 603ae73bb519206e9fbf9d284c4ebe7c13e5af67 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Thu, 16 Oct 2025 12:13:46 -0400 Subject: [PATCH 05/11] switch to native query --- .../harvard/iq/dataverse/GuestbookResponse.java | 5 ----- .../dataverse/GuestbookResponseServiceBean.java | 16 ++++++---------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/GuestbookResponse.java b/src/main/java/edu/harvard/iq/dataverse/GuestbookResponse.java index ed89ae2a858..ee444198654 100644 --- a/src/main/java/edu/harvard/iq/dataverse/GuestbookResponse.java +++ b/src/main/java/edu/harvard/iq/dataverse/GuestbookResponse.java @@ -26,11 +26,6 @@ * * @author skraffmiller */ -@NamedStoredProcedureQuery( - name = "GuestbookResponse.estimateGuestBookResponseTableSize", - procedureName = "estimateGuestBookResponseTableSize", - resultClasses = Long.class -) @Entity @Table(indexes = { @Index(columnList = "guestbook_id"), diff --git a/src/main/java/edu/harvard/iq/dataverse/GuestbookResponseServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/GuestbookResponseServiceBean.java index 1fece900244..a49845ce834 100644 --- a/src/main/java/edu/harvard/iq/dataverse/GuestbookResponseServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/GuestbookResponseServiceBean.java @@ -951,16 +951,12 @@ public Long getTotalDownloadCount() { // somehow. -- L.A. 5.6 - try { - StoredProcedureQuery query = this.em.createNamedStoredProcedureQuery("GuestbookResponse.estimateGuestBookResponseTableSize"); - query.execute(); - Long totalCount = (Long) query.getSingleResult(); - - if (totalCount != null) { - return totalCount; - } - } catch (IllegalArgumentException iae) { - // Don't do anything, we'll fall back to using "SELECT COUNT()" + // In GuestbookResponseServiceBean.java + try { + Query query = em.createNativeQuery("SELECT estimateGuestBookResponseTableSize()"); + return ((Number) query.getSingleResult()).longValue(); + } catch (Exception e) { + // Fall back to using "SELECT COUNT()" } Query query = em.createNativeQuery("select count(o.id) from GuestbookResponse o where eventtype != '" + GuestbookResponse.ACCESS_REQUEST +"';"); return (Long) query.getSingleResult(); From 0c9926613d84795774acb3002f6ad40a264ceedb Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Fri, 24 Oct 2025 17:12:40 -0400 Subject: [PATCH 06/11] update release note --- doc/release-notes/11827-Payara-6.2025.10.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/doc/release-notes/11827-Payara-6.2025.10.md b/doc/release-notes/11827-Payara-6.2025.10.md index c79ec04e696..3737c05be27 100644 --- a/doc/release-notes/11827-Payara-6.2025.10.md +++ b/doc/release-notes/11827-Payara-6.2025.10.md @@ -1,3 +1,7 @@ The recommended Payara version has been updated to Payara-6.2025.10 -Standard Payara upgrade instructions - as in the 6.7 release notes should be added. +Payara 6.2025.10 cannot be used with earlier versions of Dataverse, e.g. v6.8. + +Standard Payara upgrade instructions - as in the 6.7 release notes should be added, +but we should assure the instructions don't have you trying to run 6.8 with the latest Payara +and perhaps should explicitly note that you can't. From c06867f0020618cd1f34d64d49f14caddf628122 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Fri, 14 Nov 2025 11:08:58 -0500 Subject: [PATCH 07/11] mime fix --- pom.xml | 2 +- src/main/java/META-INF/{mime.types => jakarta.mime.types} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename src/main/java/META-INF/{mime.types => jakarta.mime.types} (100%) diff --git a/pom.xml b/pom.xml index a9d0bb0b26b..fc9bb5fd671 100644 --- a/pom.xml +++ b/pom.xml @@ -834,7 +834,7 @@ *.properties **/*.properties - **/mime.types + **/jakarta.mime.types **/*.R diff --git a/src/main/java/META-INF/mime.types b/src/main/java/META-INF/jakarta.mime.types similarity index 100% rename from src/main/java/META-INF/mime.types rename to src/main/java/META-INF/jakarta.mime.types From 899c9e54b2b21fb1d655c8342bd172c108d47b2c Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Fri, 14 Nov 2025 14:24:59 -0500 Subject: [PATCH 08/11] old name for FileUtilTest --- src/main/java/META-INF/mime.types | 42 +++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 src/main/java/META-INF/mime.types diff --git a/src/main/java/META-INF/mime.types b/src/main/java/META-INF/mime.types new file mode 100644 index 00000000000..9ef3f2019be --- /dev/null +++ b/src/main/java/META-INF/mime.types @@ -0,0 +1,42 @@ +# Common document formats +application/pdf pdf PDF +application/msword doc DOC +application/vnd.ms-excel xls XLS xlc XLC xll XLL xlm XLM xlw XLW +application/vnd.openxmlformats-officedocument.spreadsheetml.sheet xlsx XLSX +text/comma-separated-values csv CSV +text/plain txt TXT +text/xml xml XML +# Common statistical data formats +text/tsv tab TAB tsv TSV +text/x-fixed-field dat DAT asc ASC +application/x-rlang-transport Rdata RData rdata RDATA +type/x-r-syntax r R +application/x-stata dta DTA +text/x-stata-syntax do DO +application/x-spss-sav sav SAV +application/x-spss-por por POR +text/x-spss-syntax sps SPS +application/x-sas-transport xpt XPT cport CPORT v5x V5X v6x V6X v7x V7X +application/x-sas-system sas7bdat SAS7BDAT sd1 SD1 sd2 SD2 sd7 SD7 ssd01 SSD01 ssd SSD ssd04 SSD04 +text/x-sas-syntax sas SAS +# Common image formats +image/gif gif GIF +image/jpeg jpeg JPEG jpg JPG jpe JPE +image/bmp bmp BMP +image/x-portable-bitmap pbm PBM +image/x-portable-graymap pgm PGM +image/png png PNG +image/x-portable-anymap pnm PNM +image/x-portable-pixmap ppm PPM +image/cmu-raster ras RAS +image/x-rgb rgb RGB +image/tiff tif TIF tiff TIFF +image/x-xbitmap xbm XBM +image/x-xpixmap xpm XPM +image/x-xwindowdump xwd XWD +# Common archive formats +application/zip zip ZIP +application/x-gzip gz GZ +application/x-tar tar TAR +# Rdata +application/octet-stream \ No newline at end of file From 4489b7b9615679104fa4e8d1ee4ebeae7bfddafb Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Fri, 14 Nov 2025 14:40:58 -0500 Subject: [PATCH 09/11] restore mime.types in pom as well --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index fc9bb5fd671..629ca00a658 100644 --- a/pom.xml +++ b/pom.xml @@ -835,6 +835,7 @@ *.properties **/*.properties **/jakarta.mime.types + **/mime.types **/*.R From b93634722b512e8ab78e1f8440f3cb006680b968 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Fri, 14 Nov 2025 15:22:07 -0500 Subject: [PATCH 10/11] document need to retain mime.types --- pom.xml | 3 +++ src/main/java/META-INF/mime.types | 1 + 2 files changed, 4 insertions(+) diff --git a/pom.xml b/pom.xml index 629ca00a658..779136f09eb 100644 --- a/pom.xml +++ b/pom.xml @@ -834,6 +834,9 @@ *.properties **/*.properties + **/jakarta.mime.types **/mime.types **/*.R diff --git a/src/main/java/META-INF/mime.types b/src/main/java/META-INF/mime.types index 9ef3f2019be..6f8aaec6d25 100644 --- a/src/main/java/META-INF/mime.types +++ b/src/main/java/META-INF/mime.types @@ -1,3 +1,4 @@ +# mime.types is a copy of jakarta.mime.types which only used in unit tests (specifically FileUtilTest.testGZipFile) # Common document formats application/pdf pdf PDF application/msword doc DOC From ca44ce860ca58c5e838dc65df378f236218bb261 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Fri, 21 Nov 2025 12:24:45 -0500 Subject: [PATCH 11/11] update release note re *.p12 files (not specifically PR related) --- doc/release-notes/11827-Payara-6.2025.10.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/doc/release-notes/11827-Payara-6.2025.10.md b/doc/release-notes/11827-Payara-6.2025.10.md index 3737c05be27..271b7dbb5ea 100644 --- a/doc/release-notes/11827-Payara-6.2025.10.md +++ b/doc/release-notes/11827-Payara-6.2025.10.md @@ -5,3 +5,12 @@ Payara 6.2025.10 cannot be used with earlier versions of Dataverse, e.g. v6.8. Standard Payara upgrade instructions - as in the 6.7 release notes should be added, but we should assure the instructions don't have you trying to run 6.8 with the latest Payara and perhaps should explicitly note that you can't. + +We should also change the 'standard' language related to Payara updates to include copying the +*.p12 files from the distributed domain1/config directory into the Dataverse domain1/config directory, +at least if/when they are different. Those files include base certs and over time using the old files +can cause SSL errors. If the domain.xml file is old enough, it may also reference *.jks files instead +of the *.p12 ones. That should also be fixed (domain.xml having those lines updated to reference *.p12 files). +FWIW: I ran across this at TDL where a dev machine stopped being able to contact DataCite because the root +cert used by DataCite today is not in the *.jks files that had been copied forward during Payara updates.) +