Merge pull request #11416 from QualitativeDataRepository/IQSS/10680-BagitFix

IQSS/10680-Bagit warning fix

Author: ofahimIQSS

doc/release-notes/10680-Bagit-Change.md

@@ -0,0 +1,9 @@
+### Archival Bag Configuration Change
+
+Archival Bags now use the JVM option `dataverse.bagit.sourceorg.name` in generating the bag-info.txt file's "Internal-Sender-Identifier" (in addition to its use for "Source-Organization") rather than pulling the value from a deprecated `bagit.SourceOrganization` entry in Bundle.properties ("Internal-Sender-Identifier" is generated by appending " Catalog" in both cases). Sites using archival bags would not see a change if these settings were already using the same value. See #10680 and #11416.
+
+## Upgrade Instructions
+
+If you are using archival bags, be sure that the `dataverse.bagit.sourceorg.name` JVM option is set.
+
+

src/main/java/edu/harvard/iq/dataverse/util/bagit/BagGenerator.java

@@ -871,7 +871,7 @@ private String generateInfoFile() {
         info.append(CRLF);
 
         info.append("Internal-Sender-Identifier: ");
-        String catalog = BundleUtil.getStringFromBundle("bagit.sourceOrganization") + " Catalog";
+        String catalog = orgName + " Catalog";
         if (aggregation.has(JsonLDTerm.schemaOrg("includedInDataCatalog").getLabel())) {
             catalog = aggregation.get(JsonLDTerm.schemaOrg("includedInDataCatalog").getLabel()).getAsString();
         }