Merge branch 'main' into 1691-change-to-jakarta-ee-namespace

.github/workflows/maven-regression-test.yml

@@ -0,0 +1,33 @@
+name: Maven Regression Test
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+  regression_test_hindi:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: 11
+          cache: maven
+      - run: mvn clean
+      - run: mvn verify -P regression-testing-rest -D base.url=http://hin.elimu.ai
+
+  regression_test_tagalog:
+    needs: regression_test_hindi
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: 11
+          cache: maven
+      - run: mvn clean
+      - run: mvn verify -P regression-testing-rest -D base.url=http://tgl.elimu.ai

pom.xml

@@ -4,7 +4,7 @@
     <groupId>ai.elimu</groupId>
     <artifactId>webapp</artifactId>
     <packaging>war</packaging>
-    <version>2.4.24-SNAPSHOT</version>
+    <version>2.4.25-SNAPSHOT</version>
 
     <properties>
     	<java.version>17</java.version>
@@ -421,7 +421,7 @@
   <dependency>
    <groupId>commons-validator</groupId>
    <artifactId>commons-validator</artifactId>
-   <version>1.7</version>
+   <version>1.9.0</version>
   </dependency>
   <dependency>
    <groupId>org.apache.commons</groupId>
@@ -551,7 +551,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>4.11.0</version>
+            <version>5.12.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>

src/main/config/centos-stream-9/~/.elimu-ai/deploy-webapp.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+VERSION=$1
+echo "VERSION: $VERSION"
+
+echo "Stopping Jetty..."
+systemctl stop jetty
+
+WAR_FILE_URL=https://jitpack.io/com/github/elimu-ai/webapp/webapp-$VERSION/webapp-webapp-$VERSION.war
+echo "Downloading WAR file from $WAR_FILE_URL"
+wget -O /opt/jetty-base/webapps/webapp.war $WAR_FILE_URL
+
+echo "Starting Jetty"
+systemctl start jetty