2323 DATAWAVE_JAVA_VERSION : ' 11'
2424 JAVA_DISTRIBUTION : ' zulu' # This is the default on v1 of the action for 1.8
2525 GITHUB_REGISTRY : ghcr.io
26- GITHUB_USER_NAME : ${{ secrets.GHCR_WRITE_USER_NAME }}
27- GITHUB_ACCESS_TOKEN : ${{ secrets.GHCR_WRITE_ACCESS_TOKEN }}
26+ GITHUB_USERNAME : ${{ secrets.GHCR_WRITE_USER_NAME }}
27+ GITHUB_PASSWORD : ${{ secrets.GHCR_WRITE_ACCESS_TOKEN }}
2828
2929jobs :
3030 build-and-deploy-accumulo :
@@ -54,15 +54,19 @@ jobs:
5454 distribution : ${{env.JAVA_DISTRIBUTION}}
5555 java-version : ${{env.ACCUMULO_JAVA_VERSION}}
5656 cache : ' maven'
57+ server-id : github-datawave
5758 - run : echo "ACCUMULO_JAVA=$JAVA_HOME" >> $GITHUB_ENV
5859 - name : Set up JDK ${{env.DATAWAVE_JAVA_VERSION}}
5960 uses : actions/setup-java@v4
6061 with :
6162 distribution : ${{env.JAVA_DISTRIBUTION}}
6263 java-version : ${{env.DATAWAVE_JAVA_VERSION}}
6364 cache : ' maven'
65+ server-id : github-datawave
66+ # username and password are the env variables names that maven will use
67+ server-username : GITHUB_USERNAME
68+ server-password : GITHUB_PASSWORD
6469 - run : echo "DATAWAVE_JAVA=$JAVA_HOME" >> $GITHUB_ENV
65-
6670 - name : Get Accumulo Version
6771 id : get-accumulo-version
6872 run : |
@@ -76,24 +80,24 @@ jobs:
7680 run : |
7781 export JAVA_HOME="$ACCUMULO_JAVA"
7882 cd "$GITHUB_WORKSPACE/accumulo"
79- mvn -DaltDeploymentRepository=github-datawave::https://maven.pkg.github.com/NationalSecurityAgency/datawave --show-version --batch-mode --errors --no-transfer-progress "-Dstyle.color=always" -DskipTests -T1C clean source:jar deploy -s "$GITHUB_WORKSPACE/datawave/.github/workflows/settings.xml"
83+ mvn -DaltDeploymentRepository=github-datawave::https://maven.pkg.github.com/NationalSecurityAgency/datawave --show-version --batch-mode --errors --no-transfer-progress "-Dstyle.color=always" -DskipTests -T1C clean source:jar deploy
8084 - name : Log in to the Container registry
8185 uses : docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
8286 with :
8387 registry : ${{ env.GITHUB_REGISTRY }}
84- username : ${{ env.GITHUB_USER_NAME }}
85- password : ${{ env.GITHUB_ACCESS_TOKEN }}
88+ username : ${{ secrets.GHCR_WRITE_USER_NAME }}
89+ password : ${{ secrets.GHCR_WRITE_ACCESS_TOKEN }}
8690
8791 - name : Update DataWave Dependency Version
8892 run : |
8993
9094 export JAVA_HOME="$DATAWAVE_JAVA"
9195 cd "$GITHUB_WORKSPACE/datawave"
92- mvn --settings $GITHUB_WORKSPACE/.github/workflows/settings.xml versions:set-property -Dproperty=version.accumulo -DnewVersion=${{ steps.get-accumulo-version.outputs.accumuloVersion }} -DgenerateBackupPoms=false
96+ mvn versions:set-property -Dproperty=version.accumulo -DnewVersion=${{ steps.get-accumulo-version.outputs.accumuloVersion }} -DgenerateBackupPoms=false
9397 - name : Build Web and Ingest Docker Images (Maven)
9498 run : |
9599 export JAVA_HOME="$DATAWAVE_JAVA"
96100 cd "$GITHUB_WORKSPACE/datawave"
97- mvn --settings $GITHUB_WORKSPACE/.github/workflows/settings.xml clean deploy -Pkubernetes -Dtar -Ddeploy -Ddist -Pdocker -Ddocker-release -DskipTests -Dversion.accumulo=${{ steps.get-accumulo-version.outputs.accumuloVersion }}
101+ mvn clean deploy -Pkubernetes -Dtar -Ddeploy -Ddist -Pdocker -Ddocker-release -DskipTests -Dversion.accumulo=${{ steps.get-accumulo-version.outputs.accumuloVersion }}
98102
99103
0 commit comments