Updates to important End of Life components (Tomcat, Java, Spring)

.github/workflows/ci.yml

@@ -10,10 +10,10 @@ jobs:
   checkFormat-build-unitTest-and-run:
     runs-on: ubuntu-latest
     steps:
-      - name: Set up JDK 11
+      - name: Set up JDK 21
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 21
       - name: Cache local Maven repository
         uses: actions/cache@v4
         with:
@@ -51,4 +51,4 @@ jobs:
         if: github.event_name == 'push'
         uses: JamesIves/github-pages-deploy-action@v4
         with:
-          folder: target/html/    
+          folder: target/html/

Dockerfile

@@ -1,7 +1,7 @@
 ##
 # Build Stage
 #
-FROM maven:3-jdk-11 AS build
+FROM maven:3-eclipse-temurin-21 AS build
 
 RUN --mount=target=/var/lib/apt/lists,type=cache,sharing=locked \
     --mount=target=/var/cache/apt,type=cache,sharing=locked \
@@ -49,7 +49,7 @@ RUN --mount=type=cache,target=/root/.m2,sharing=locked \
 ##
 # Run Stage
 #
-FROM tomcat:8.5-jdk11
+FROM tomcat:10-jre21
 
 COPY install/createDefaultPassword.sh ./
 

Dockerfile.dev

@@ -1,7 +1,23 @@
 ##
 # Build Stage
 #
-FROM maven:3-jdk-11 as build
+FROM maven:3-eclipse-temurin-21 AS build
+ADD ./dataexport /build/dataexport
+##
+# Build DataExport
+
+WORKDIR /build/dataexport/dataexport-core
+RUN --mount=type=cache,target=/root/.m2,sharing=locked \
+    mvn dependency:go-offline 
+RUN --mount=type=cache,target=/root/.m2,sharing=locked \
+    mvn clean install -DskipTests
+WORKDIR /build/dataexport/
+RUN --mount=type=cache,target=/root/.m2,sharing=locked \
+    mvn dependency:go-offline 
+RUN --mount=type=cache,target=/root/.m2,sharing=locked \
+    mvn clean install -DskipTests
+
+
 
 RUN --mount=target=/var/lib/apt/lists,type=cache,sharing=locked \
     --mount=target=/var/cache/apt,type=cache,sharing=locked \
@@ -10,6 +26,7 @@ RUN --mount=target=/var/lib/apt/lists,type=cache,sharing=locked \
     && apt-get -y --no-install-recommends install \
     git apache2-utils 
 
+
 ##
 # Copy Source Code
 #
@@ -25,19 +42,6 @@ ARG DEFAULT_PW="adminADMIN!"
 ADD ./install/createDefaultPassword.sh /build/install/createDefaultPassword.sh
 RUN ./install/createDefaultPassword.sh -c -p ${DEFAULT_PW}
 
-##
-# Build DataExport
-#
-WORKDIR /build/dataexport/dataexport-core
-RUN --mount=type=cache,target=/root/.m2,sharing=locked \
-    mvn dependency:go-offline 
-RUN --mount=type=cache,target=/root/.m2,sharing=locked \
-    mvn clean install -DskipTests
-WORKDIR /build/dataexport/
-RUN --mount=type=cache,target=/root/.m2,sharing=locked \
-    mvn dependency:go-offline 
-RUN --mount=type=cache,target=/root/.m2,sharing=locked \
-    mvn clean install -DskipTests
 
 ##
 # Build the Project
@@ -53,7 +57,7 @@ RUN --mount=type=cache,target=/root/.m2,sharing=locked \
 ##
 # Run Stage
 #
-FROM tomcat:8.5-jdk11
+FROM tomcat:10-jre21
 
 ADD install/createDefaultPassword.sh ./
 

dev.docker-compose.yml

@@ -38,6 +38,9 @@ services:
 
     oe.openelis.org:
         container_name: openelisglobal-webapp 
+        build:
+            context: .
+            dockerfile: Dockerfile.dev
         image: itechuw/openelis-global-2-dev:develop 
         # platform: linux/amd64
         depends_on:
@@ -50,7 +53,6 @@ services:
         networks:
           default:
               ipv4_address: 172.20.1.121
-
         environment:
             - DEFAULT_PW=adminADMIN! 
             - TZ=Africa/Nairobi
@@ -60,7 +62,7 @@ services:
             -  key_trust-store-volume:/etc/openelis-global
             - ./volume/plugins/:/var/lib/openelis-global/plugins
             - ./volume/tomcat/oe_server.xml:/usr/local/tomcat/conf/server.xml
-            - ./target/OpenELIS-Global.war:/usr/local/tomcat/webapps/OpenELIS-Global.war
+            # - ./target/OpenELIS-Global.war:/usr/local/tomcat/webapps/OpenELIS-Global.war
             - ./volume/properties/SystemConfiguration.properties:/var/lib/openelis-global/properties/SystemConfiguration.properties
             -  lucene_index-vol:/var/lib/lucene_index
         secrets:

frontend/src/components/Login.js

@@ -166,6 +166,7 @@ function Login(props) {
                   password: "",
                 }}
                 onSubmit={(values) => {
+                  doLogin(values);
                   fetch(config.serverBaseUrl + "/LoginPage", {
                     //includes the browser sessionId in the Header for Authentication on the backend server
                     credentials: "include",

frontend/src/components/layout/Header.js

@@ -71,10 +71,12 @@ function OEHeader(props) {
   }, []);
 
   useEffect(() => {
-    getFromOpenElisServer("/rest/menu", (res) => {
-      handleMenuItems("menu", res);
-    });
-  }, []);
+    userSessionDetails.authenticated
+      ? getFromOpenElisServer("/rest/menu", (res) => {
+          handleMenuItems("menu", res);
+        })
+      : console.log("User not authenticated, not getting menu");
+  }, [userSessionDetails.authenticated]);
 
   const panelSwitchLabel = () => {
     return userSessionDetails.authenticated ? "User" : "Lang";