From a34e4881daf36c217e9b34746f6220c28e423a63 Mon Sep 17 00:00:00 2001
From: Adam Lerman <awlerma@uwe.nsa.gov>
Date: Fri, 27 Sep 2024 10:38:18 +0000
Subject: [PATCH] run build

---
 .github/workflows/build-accumulo.yml | 42 +++++++++++++---------------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/build-accumulo.yml b/.github/workflows/build-accumulo.yml
index 12955a24f27..1b85d2c3533 100644
--- a/.github/workflows/build-accumulo.yml
+++ b/.github/workflows/build-accumulo.yml
@@ -53,29 +53,27 @@ jobs:
         java-version: ${{env.JAVA_VERSION}}
         cache: 'maven'
     - name: Build Accumulo
+      id: build-accumulo
       run: |
         cd $GITHUB_WORKSPACE/accumulo
-        echo $(git rev-parse --short HEAD)
-    #     mvn -V -B -e -ntp "-Dstyle.color=always" -DskipTests -T1C clean deploy -s $GITHUB_WORKSPACE/datawave/.github/workflows/settings.xml
-    #     cd $GITHUB_WORKSPACE
-
-    # - name: Extract Maven project version
-    #   run: echo version=$(cd $GITHUB_WORKSPACE/accumulo && mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec) >> $GITHUB_OUTPUT
-    #   id: project
-
-    # - name: Log in to the Container registry
-    #   uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
-    #   with:
-    #     registry: ${{ env.REGISTRY }}
-    #     username: ${{ env.USER_NAME }}
-    #     password: ${{ env.ACCESS_TOKEN }}
-    # - name: Update DataWave Dependency Version
-    #   run: |
-    #     cd $GITHUB_WORKSPACE/datawave
-    #     mvn -s $GITHUB_WORKSPACE/datawave.github/workflows/settings.xml versions:set-property -Dproperty=version.accumulo -DnewVersion=${{ steps.project.outputs.version }} -DgenerateBackupPoms=false
-    # - name: Build Web and Ingest Docker Images (Maven)
-    #   run: |
-    #     cd $GITHUB_WORKSPACE/datawave
-    #     mvn -s $GITHUB_WORKSPACE/datawave.github/workflows/settings.xml clean install -Prpm,kubernetes,assemble,deploy-ws -Ddist -Pdocker -DpushImage -Ddocker-release -DskipTests
+        export NEWVERSION=$(mvn help:evaluate -Dexpression=project.version.major -q -DforceStdout).$(mvn help:evaluate -Dexpression=project.version.minor -q -DforceStdout).$(mvn help:evaluate -Dexpression=project.version.incremental -q -DforceStdout)-$(git rev-parse --short HEAD)
+        echo accumuloversion=$NEWVERSION >> $GITHUB_OUTPUT
+        mvn versions:set -DnewVersion=$NEWVERSION
+        mvn -V -B -e -ntp "-Dstyle.color=always" -DskipTests -T1C clean deploy -s $GITHUB_WORKSPACE/datawave/.github/workflows/settings.xml
+        
+    - name: Log in to the Container registry
+      uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
+      with:
+        registry: ${{ env.REGISTRY }}
+        username: ${{ env.USER_NAME }}
+        password: ${{ env.ACCESS_TOKEN }}
+    - name: Update DataWave Dependency Version
+      run: |
+        cd $GITHUB_WORKSPACE/datawave
+        mvn -s $GITHUB_WORKSPACE/datawave.github/workflows/settings.xml versions:set-property -Dproperty=version.accumulo -DnewVersion=${{ steps.build-accumulo.outputs.accumuloversion }} -DgenerateBackupPoms=false
+    - name: Build Web and Ingest Docker Images (Maven)
+      run: |
+        cd $GITHUB_WORKSPACE/datawave
+        mvn -s $GITHUB_WORKSPACE/datawave.github/workflows/settings.xml clean install -Prpm,kubernetes,assemble,deploy-ws -Ddist -Pdocker -DpushImage -Ddocker-release -DskipTests