Merge branch '2.40' into DHIS2-19782_2.40

Author: jason-p-pickering

.github/workflows/analyse-pr.yml

@@ -22,7 +22,7 @@ jobs:
   sonarqube:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           fetch-depth: 0

.github/workflows/check-formatting.yml

@@ -9,7 +9,7 @@ jobs:
   check-formatting:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Set up JDK 11
         uses: actions/setup-java@v5
         with:

.github/workflows/codeql-analysis.yml

@@ -39,7 +39,7 @@ jobs:
           LATEST_IM_TAG=$(git ls-remote --tags --sort='v:refname' https://github.com/dhis2-sre/im-manager | tail -1 | awk '{print $2}')
           echo "LATEST_IM_TAG=$LATEST_IM_TAG" >> $GITHUB_ENV
 
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           repository: dhis2-sre/im-manager
           ref: ${{ env.LATEST_IM_TAG }}

.github/workflows/deploy-instance.yml

@@ -40,7 +40,7 @@ jobs:
           LATEST_IM_TAG=$(git ls-remote --tags --sort='v:refname' https://github.com/dhis2-sre/im-manager | tail -1 | awk '{print $2}')
           echo "LATEST_IM_TAG=$LATEST_IM_TAG" >> $GITHUB_ENV
 
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           repository: dhis2-sre/im-manager
           ref: ${{ env.LATEST_IM_TAG }}

.github/workflows/destroy-instance.yml

@@ -23,7 +23,7 @@ jobs:
     runs-on: ubuntu-latest
     if: "contains(github.event.pull_request.labels.*.name, 'run-api-analytics-tests')"
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Set up JDK 11
         uses: actions/setup-java@v5
@@ -68,7 +68,7 @@ jobs:
           cd dhis-2/dhis-test-e2e
           docker compose logs web > ~/logs.txt
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v5
         if: failure()
         with:
           name: "tomcat_logs"

.github/workflows/run-api-analytics-tests.yml

@@ -20,7 +20,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Set up JDK 11
         uses: actions/setup-java@v5
         with:
@@ -64,7 +64,7 @@ jobs:
           cd dhis-2/dhis-test-e2e
           docker compose logs web > ~/logs.txt
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v5
         if: failure()
         with:
           name: "tomcat_logs"

.github/workflows/run-api-tests.yml

@@ -14,7 +14,7 @@ jobs:
   unit-test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Set up JDK 11
         uses: actions/setup-java@v5
         with:
@@ -34,7 +34,7 @@ jobs:
       # delete the next 2 steps once we are confident in the coverage setup
       - name: Tar jacoco coverage report to debug
         run: tar -cvf coverage.tar dhis-2/dhis-test-coverage/target/site/jacoco-aggregate
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v5
         name: Upload jacoco coverage report to debug
         with:
           name: unit-test-coverage
@@ -50,7 +50,7 @@ jobs:
       - name: Tar surefire individual reports
         run: find . -name "surefire-reports" -type d -exec find {} -type f -name "*.xml" -printf '%p\0' \; | tar --null --files-from=- -cvf surefire_reports.tar
       - name: Archive surefire reports
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: unit-test-surefire-reports
           path: |
@@ -61,7 +61,7 @@ jobs:
   integration-test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Set up JDK 11
         uses: actions/setup-java@v5
         with:
@@ -71,7 +71,7 @@ jobs:
       - name: Run integration tests
         run: mvn clean test --threads 2C --batch-mode --no-transfer-progress -f ./dhis-2/pom.xml -pl -dhis-web-embedded-jetty --activate-profiles integration-test
         timeout-minutes: 30
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v5
         name: Upload test logs on failure
         if: failure()
         with:
@@ -89,7 +89,7 @@ jobs:
       # delete the next 2 steps once we are confident in the coverage setup
       - name: Tar jacoco coverage report to debug
         run: tar -cvf coverage.tar dhis-2/dhis-test-coverage/target/site/jacoco-aggregate
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v5
         name: Upload jacoco coverage report to debug
         with:
           name: integration-test-coverage
@@ -101,7 +101,7 @@ jobs:
       - name: Tar surefire individual reports
         run: find . -name "surefire-reports" -type d -exec find {} -type f -name "*.xml" -printf '%p\0' \; | tar --null --files-from=- -cvf surefire_reports.tar
       - name: Archive surefire reports
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: integration-test-surefire-reports
           path: |
@@ -112,7 +112,7 @@ jobs:
   integration-h2-test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Set up JDK 11
         uses: actions/setup-java@v5
         with:
@@ -122,7 +122,7 @@ jobs:
       - name: Run integration h2 tests
         run: mvn clean test --threads 2C --batch-mode --no-transfer-progress -f ./dhis-2/pom.xml -pl -dhis-web-embedded-jetty --activate-profiles integration-h2-test
         timeout-minutes: 30
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v5
         name: Upload test logs on failure
         if: failure()
         with:
@@ -140,7 +140,7 @@ jobs:
       # delete the next 2 steps once we are confident in the coverage setup
       - name: Tar jacoco coverage report to debug
         run: tar -cvf coverage.tar dhis-2/dhis-test-coverage/target/site/jacoco-aggregate
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v5
         name: Upload jacoco coverage report to debug
         with:
           name: integration-h2-test-coverage
@@ -152,7 +152,7 @@ jobs:
       - name: Tar surefire individual reports
         run: find . -name "surefire-reports" -type d -exec find {} -type f -name "*.xml" -printf '%p\0' \; | tar --null --files-from=- -cvf surefire_reports.tar
       - name: Archive surefire reports
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: integration-h2-test-surefire-reports
           path: |

.github/workflows/run-tests.yml

@@ -56,3 +56,6 @@ http-client.private.env.json
 
 # Java version file for jenv
 .java-version
+
+# Bundled apps temporary download folder
+/dhis-web-server/bundled_apps/

dhis-2/.gitignore

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.hisp.dhis</groupId>
     <artifactId>dhis</artifactId>
-    <version>2.40.10-SNAPSHOT</version>
+    <version>2.40.11-SNAPSHOT</version>
   </parent>
 
   <artifactId>dhis-api</artifactId>