From 1db9821b8e87b299bd455320bc825d02dc0de735 Mon Sep 17 00:00:00 2001
From: garciaerin <garciaerinjade@gmail.com>
Date: Fri, 8 Nov 2024 12:20:09 -0500
Subject: [PATCH 1/5] fix: reverted tomcat to previous version with java11

tomcat version 9.0.56
---
 .devcontainer/development/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.devcontainer/development/Dockerfile b/.devcontainer/development/Dockerfile
index 9af72aded65..ff8a7f20d7a 100644
--- a/.devcontainer/development/Dockerfile
+++ b/.devcontainer/development/Dockerfile
@@ -1,4 +1,4 @@
-FROM tomcat:9.0.56-jdk8-openjdk
+FROM tomcat:9.0.56-jdk11
 
 # Labels
 LABEL author="OpenOSP" \

From 873cb07278075a88369934056af7409bc0a48c1f Mon Sep 17 00:00:00 2001
From: garciaerin <garciaerinjade@gmail.com>
Date: Fri, 8 Nov 2024 14:59:53 -0500
Subject: [PATCH 2/5] fix: compilation errors when building the application

---
 pom.xml | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index d1d2cf90760..c7d5ae15779 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,6 +28,8 @@
         <slf4j.version>1.7.32</slf4j.version>
         <hapifhir.version>5.4.0</hapifhir.version>
         <struts.version>1.3.11</struts.version>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
     </properties>
 
     <repositories>
@@ -1431,12 +1433,22 @@
             <version>4.4.1</version>
         </dependency>
         <!-- Coming soon: JAVA 11 -->
-        <!--<dependency>-->
-        <!--    <groupId>com.sun.xml.ws</groupId>-->
-        <!--    <artifactId>jaxws-ri</artifactId>-->
-        <!--    <version>2.3.0</version>-->
-        <!--    <type>pom</type>-->
-        <!--</dependency>-->
+        <dependency>
+           <groupId>com.sun.xml.ws</groupId>
+           <artifactId>jaxws-ri</artifactId>
+           <version>2.3.0</version>
+           <type>pom</type>
+        </dependency>
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>2.3.1</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>1.3.2</version>
+        </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>jstl</artifactId>
@@ -1534,8 +1546,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.8.1</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>11</source>
+                    <target>11</target>
                 </configuration>
             </plugin>
 

From 0d062df47ba658ebf5ccca60e317a0928dfd7f64 Mon Sep 17 00:00:00 2001
From: garciaerin <garciaerinjade@gmail.com>
Date: Mon, 11 Nov 2024 12:42:32 -0500
Subject: [PATCH 3/5] fix: removed the maven.compiler property in pom.xml

---
 pom.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index c7d5ae15779..262a8ef0a98 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,8 +28,6 @@
         <slf4j.version>1.7.32</slf4j.version>
         <hapifhir.version>5.4.0</hapifhir.version>
         <struts.version>1.3.11</struts.version>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
     </properties>
 
     <repositories>

From 6dd838eb9d94d1d58d72568f1200fdb5c5adbdee Mon Sep 17 00:00:00 2001
From: garciaerin <garciaerinjade@gmail.com>
Date: Wed, 13 Nov 2024 09:53:05 -0500
Subject: [PATCH 4/5] update: tomcat9.0.56 to tomcat 9.0.97

- updated packages
- updated dependency versions
- added dependency
---
 .devcontainer/development/Dockerfile | 8 ++++----
 pom.xml                              | 8 +++++++-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/.devcontainer/development/Dockerfile b/.devcontainer/development/Dockerfile
index ff8a7f20d7a..99c526c2b1f 100644
--- a/.devcontainer/development/Dockerfile
+++ b/.devcontainer/development/Dockerfile
@@ -1,4 +1,4 @@
-FROM tomcat:9.0.56-jdk11
+FROM tomcat:9.0.97-jdk11
 
 # Labels
 LABEL author="OpenOSP" \
@@ -15,9 +15,9 @@ WORKDIR /workspace
 # Install required packages and clean up apt lists
 RUN apt-get update && apt-get install -y --no-install-recommends \
     dos2unix curl git wget apt-transport-https ca-certificates gnupg lsb-release \
-    locales iputils-ping gettext fontconfig libc6 libfreetype6 libjpeg62-turbo \
-    libpng16-16 libssl1.1 libstdc++6 libx11-6 libxcb1 libxext6 libxtst6 \
-    libxrender1 xfonts-75dpi xfonts-base zlib1g maven mariadb-client \
+    locales iputils-ping gettext fontconfig libc6 libfreetype6 libjpeg-turbo8 \
+    libpng16-16 libssl3 libstdc++6 libx11-6 libxcb1 libxext6 libxtst6 \
+    libxrender1 libxi6 xfonts-75dpi xfonts-base zlib1g maven mariadb-client \
     nano openssh-client vim-tiny \
     && apt-get clean && rm -rf /var/lib/apt/lists/*
 
diff --git a/pom.xml b/pom.xml
index 262a8ef0a98..629579c3a56 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1434,7 +1434,7 @@
         <dependency>
            <groupId>com.sun.xml.ws</groupId>
            <artifactId>jaxws-ri</artifactId>
-           <version>2.3.0</version>
+           <version>2.3.3</version>
            <type>pom</type>
         </dependency>
         <dependency>
@@ -1446,6 +1446,12 @@
             <groupId>javax.annotation</groupId>
             <artifactId>javax.annotation-api</artifactId>
             <version>1.3.2</version>
+        </dependency>
+         <!-- Added for Tomcat9.0.97 -->
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+            <version>2.3.3</version>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>

From 8ee12fb2ab564a4aa02dc919c0f8222f21650652 Mon Sep 17 00:00:00 2001
From: garciaerin <garciaerinjade@gmail.com>
Date: Wed, 13 Nov 2024 12:10:56 -0500
Subject: [PATCH 5/5] fix: OpenJDK version of java 11

- uses OpenJDK version of java 11 instead of Temurin.
---
 .devcontainer/development/Dockerfile | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/.devcontainer/development/Dockerfile b/.devcontainer/development/Dockerfile
index 99c526c2b1f..75027efa838 100644
--- a/.devcontainer/development/Dockerfile
+++ b/.devcontainer/development/Dockerfile
@@ -1,4 +1,11 @@
-FROM tomcat:9.0.97-jdk11
+FROM openjdk:11-jdk-slim
+
+# Set environment variables for Tomcat
+ENV CATALINA_HOME /usr/local/tomcat
+ENV PATH $CATALINA_HOME/bin:$PATH
+
+# Copy Tomcat installation from the official Tomcat image
+COPY --from=tomcat:9.0.97 /usr/local/tomcat $CATALINA_HOME
 
 # Labels
 LABEL author="OpenOSP" \
@@ -15,8 +22,8 @@ WORKDIR /workspace
 # Install required packages and clean up apt lists
 RUN apt-get update && apt-get install -y --no-install-recommends \
     dos2unix curl git wget apt-transport-https ca-certificates gnupg lsb-release \
-    locales iputils-ping gettext fontconfig libc6 libfreetype6 libjpeg-turbo8 \
-    libpng16-16 libssl3 libstdc++6 libx11-6 libxcb1 libxext6 libxtst6 \
+    locales iputils-ping gettext fontconfig libc6 libfreetype6 libjpeg62-turbo \
+    libpng16-16 libssl-dev libstdc++6 libx11-6 libxcb1 libxext6 libxtst6 \
     libxrender1 libxi6 xfonts-75dpi xfonts-base zlib1g maven mariadb-client \
     nano openssh-client vim-tiny \
     && apt-get clean && rm -rf /var/lib/apt/lists/*