assorted fixes; makes it possible to add arbitrary labels to the version number.

Author: landreev

.github/workflows/deploy_to_internal.yml

@@ -3,10 +3,10 @@ name: 'Deploy to dataverse-internal.iq.harvard.edu'
 on:
   workflow_dispatch:
     inputs:
-      branch name:
-        description: Desired branch 
+      buildlabel:
+        description: 'Custom label that will appear after the version number (the equivalent of the old "build number" entry).'
         type: string
-        required: true
+        required: false
 
 concurrency:
   group: deploy-to-internal
@@ -24,12 +24,8 @@ jobs:
           distribution: 'zulu'
           java-version: '21'
 
-      - name: Enable API Session Auth feature flag
-        working-directory: src/main/resources/META-INF
-        run: echo -e "dataverse.feature.api-session-auth=true" >> microprofile-config.properties
-
       - name: Set build number
-        run: scripts/installer/custom-build-number
+        run: scripts/installer/custom-build-number ${{ github.event.inputs.buildlabel }}
 
       - name: Build application war
         run: mvn package

.github/workflows/generate_war_file.yml

@@ -21,7 +21,7 @@ jobs:
           java-version: '21'
 
       - name: Set build number
-        run: scripts/installer/custom-build-number ${{ github.event.inputs.basepath }}
+        run: scripts/installer/custom-build-number ${{ github.event.inputs.buildlabel }}
 
       - name: Get branch name
         id: branch-name

scripts/installer/custom-build-number-hook

@@ -1,7 +1,7 @@
 #!/bin/sh
 # Git changes workdir to root of repo per git documentation
 BRANCH_COMMIT=$(git rev-parse --abbrev-ref HEAD)-$(git log --oneline | head -1 | awk '{print $1}')
-echo "build.number=$BRANCH_COMMIT" > src/main/java/BuildNumber.properties
+echo "build.number=build $BRANCH_COMMIT" > src/main/java/BuildNumber.properties
 
 # Based on https://stackoverflow.com/questions/25590267
 # $6 = previous branch, $8 is next branch

src/main/java/edu/harvard/iq/dataverse/util/SystemConfig.java

@@ -125,7 +125,7 @@ public String getVersion(boolean withBuildNumber) {
             }
 
             if (!buildNumber.equals("")) {
-                return appVersion + " build " + buildNumber;
+                return appVersion + " " + buildNumber;
             }
         }