From f1a81df05500199b5b0e20735fa8d90d61e2c778 Mon Sep 17 00:00:00 2001
From: teleivo <teleivo@users.noreply.github.com>
Date: Thu, 10 Oct 2024 16:32:08 +0200
Subject: [PATCH] ci: run dependency check during verify

so it only runs once on GH and not during 'mvn test'. It will
run after the package phase.

Therefore change the run-api-tests to run 'mvn verify'. We run 'mvn
install' on Jenkins.
---
 .github/workflows/run-api-tests.yml | 4 ++--
 dhis-2/pom.xml                      | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/run-api-tests.yml b/.github/workflows/run-api-tests.yml
index 49020edd0de1..b649cd9e848e 100644
--- a/.github/workflows/run-api-tests.yml
+++ b/.github/workflows/run-api-tests.yml
@@ -40,13 +40,13 @@ jobs:
           if [ "$DOCKERHUB_PUSH" = "true" ]; then
             # build and publish multi-arch images using Jib. Image is used for api tests in
             # this workflow and can be pulled from Dockerhub by devs to run locally, ...
-            mvn clean package --threads 2C --batch-mode --no-transfer-progress \
+            mvn clean verify --threads 2C --batch-mode --no-transfer-progress \
               -DskipTests -Dmaven.test.skip=true --update-snapshots --file dhis-2/pom.xml \
               --projects dhis-web-server --also-make --activate-profiles jibBuild \
               -Djib.to.image=$CORE_IMAGE_NAME -Djib.container.labels=DHIS2_BUILD_REVISION=${{github.event.pull_request.head.sha}},DHIS2_BUILD_BRANCH=${{github.head_ref}}
           else
             # only build image for running api tests in this workflow i.e. master, 2.39, ...
-            mvn clean package --threads 2C --batch-mode --no-transfer-progress \
+            mvn clean verify --threads 2C --batch-mode --no-transfer-progress \
               -DskipTests -Dmaven.test.skip=true --update-snapshots --file dhis-2/pom.xml \
               --projects dhis-web-server --also-make --activate-profiles jibDockerBuild \
               -Djib.to.image=$CORE_IMAGE_NAME
diff --git a/dhis-2/pom.xml b/dhis-2/pom.xml
index 48d02912bd8f..afda13e7db1e 100644
--- a/dhis-2/pom.xml
+++ b/dhis-2/pom.xml
@@ -2368,10 +2368,8 @@ jasperreports.version=${jasperreports.version}
             <goals>
               <goal>analyze-only</goal>
             </goals>
-            <phase>process-test-classes</phase>
             <configuration>
               <failOnWarning>true</failOnWarning>
-              <skip>${skipTests}</skip>
             </configuration>
           </execution>
         </executions>