Merge branch 'develop' into 360-modify-notvalid-deaccession-reason

Author: stevenwinship

doc/release-notes/12246-guard-npe-bag-generator.md

@@ -0,0 +1 @@
+Fixed a problem in the BagPack generator, which caused the export to fail for datasets with multiple Contact Points, of which some had no name while others did.

modules/dataverse-parent/pom.xml

@@ -461,8 +461,8 @@
                     Once the release has been made (tag created), change this back to "${parsedVersion.majorVersion}.${parsedVersion.nextMinorVersion}"
                     (These properties are provided by the build-helper plugin below.)
                 -->
-                <!-- <base.image.version>${parsedVersion.majorVersion}.${parsedVersion.nextMinorVersion}</base.image.version> -->
-                <base.image.version>${revision}</base.image.version>
+                <base.image.version>${parsedVersion.majorVersion}.${parsedVersion.nextMinorVersion}</base.image.version>
+                <!-- <base.image.version>${revision}</base.image.version> -->
                 <!-- This is used by the maintenance CI jobs, no need to adapt during releases. -->
                 <app.image.version>${base.image.version}</app.image.version>
             </properties>

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

@@ -938,7 +938,7 @@ private String generateInfoFile() {
                         info.append(CRLF);
 
                     } else {
-                        if (contactNameTerm != null) {
+                        if (contactNameTerm != null && ((JsonObject) person).has(contactNameTerm.getLabel())) {
                             info.append(multilineWrap(CONTACT_NAME + ((JsonObject) person).get(contactNameTerm.getLabel()).getAsString()));
                             info.append(CRLF);
                         }