From 6821dedda58c3c2865b8eb6e21f31fb37b33e427 Mon Sep 17 00:00:00 2001
From: tesobe-daniel <daniel@tesobe.com>
Date: Fri, 24 Nov 2023 17:17:11 +0100
Subject: [PATCH 1/6] Create Dockerfile_PreBuild_OC

---
 .github/Dockerfile_PreBuild_OC | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 .github/Dockerfile_PreBuild_OC

diff --git a/.github/Dockerfile_PreBuild_OC b/.github/Dockerfile_PreBuild_OC
new file mode 100644
index 00000000..58922ff2
--- /dev/null
+++ b/.github/Dockerfile_PreBuild_OC
@@ -0,0 +1,10 @@
+FROM jetty:9.4.49-jre11-alpine
+
+# Copy OBP source code
+# Copy build artifact (.war file) into jetty from 'maven' stage.
+COPY /target/API_Explorer-1.0.war /var/lib/jetty/webapps/ROOT.war
+USER root
+RUN chgrp -R 0 /tmp/jetty && chmod -R g+rwX /tmp/jetty
+RUN chgrp -R 0 /var/lib/jetty && chmod -R g+rwX /var/lib/jetty
+RUN chgrp -R 0 /usr/local/jetty && chmod -R g+rwX /usr/local/jetty
+USER jetty

From 7f53aa3ab779f27187dc81ffb58cec7de8f7aeeb Mon Sep 17 00:00:00 2001
From: tesobe-daniel <daniel@tesobe.com>
Date: Fri, 24 Nov 2023 20:03:25 +0100
Subject: [PATCH 2/6] Update build_package.yml

---
 .github/workflows/build_package.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_package.yml b/.github/workflows/build_package.yml
index 2a7d4e6b..8ba59c1b 100644
--- a/.github/workflows/build_package.yml
+++ b/.github/workflows/build_package.yml
@@ -26,7 +26,7 @@ jobs:
         run: |
           echo "${{ secrets.DOCKER_HUB_TOKEN }}" | docker login -u "${{ secrets.DOCKER_HUB_USERNAME }}" --password-stdin docker.io
           docker build . --file .github/Dockerfile_PreBuild --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:$GITHUB_SHA --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:latest --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:develop
-          docker build . --file .github/Dockerfile_PreBuild_OC --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:$GITHUB_SHA-OC --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:latest-OC --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:develop-OC
+          docker build . --file .github/Dockerfile_PreBuild_OC --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:$GITHUB_SHA-OC --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:latest-OC --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:develop-OC docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:v100.0.5-OC 
           docker push docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }} --all-tags
           echo docker done
 

From b534b4363b132f1e67a1a9af0ac4241a7d1c9629 Mon Sep 17 00:00:00 2001
From: tesobe-daniel <daniel@tesobe.com>
Date: Sun, 26 Nov 2023 19:50:31 +0100
Subject: [PATCH 3/6] Update build_package.yml

---
 .github/workflows/build_package.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_package.yml b/.github/workflows/build_package.yml
index 8ba59c1b..dc87cefd 100644
--- a/.github/workflows/build_package.yml
+++ b/.github/workflows/build_package.yml
@@ -26,7 +26,7 @@ jobs:
         run: |
           echo "${{ secrets.DOCKER_HUB_TOKEN }}" | docker login -u "${{ secrets.DOCKER_HUB_USERNAME }}" --password-stdin docker.io
           docker build . --file .github/Dockerfile_PreBuild --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:$GITHUB_SHA --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:latest --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:develop
-          docker build . --file .github/Dockerfile_PreBuild_OC --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:$GITHUB_SHA-OC --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:latest-OC --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:develop-OC docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:v100.0.5-OC 
+          docker build . --file .github/Dockerfile_PreBuild_OC --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:$GITHUB_SHA-OC --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:latest-OC --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:develop-OC --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:v100.0.5-OC 
           docker push docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }} --all-tags
           echo docker done
 

From 7e3f94a08ef1ea0e2e1a8f72354fa3c95b94835a Mon Sep 17 00:00:00 2001
From: tesobe-daniel <daniel@tesobe.com>
Date: Fri, 12 Jan 2024 16:31:13 +0100
Subject: [PATCH 4/6] Delete web.xml

---
 src/main/webapp/WEB-INF/web.xml | 29 -----------------------------
 1 file changed, 29 deletions(-)
 delete mode 100755 src/main/webapp/WEB-INF/web.xml

diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
deleted file mode 100755
index e128e1cf..00000000
--- a/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!DOCTYPE web-app
-        PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-        "web-app_2_3.dtd">
-
-<web-app>
-  <filter>
-    <filter-name>LiftFilter</filter-name>
-    <display-name>Lift Filter</display-name>
-    <description>The Filter that intercepts lift calls</description>
-    <filter-class>net.liftweb.http.LiftFilter</filter-class>
-  </filter>
-
-
-  <filter-mapping>
-    <filter-name>LiftFilter</filter-name>
-    <url-pattern>/*</url-pattern>
-  </filter-mapping>
-
-  <!--set  the status of HttpOnly and Secure cookie flags-->
-  <session-config>
-    <cookie-config>
-      <secure>true</secure>
-      <http-only>true</http-only>
-    </cookie-config>
-  </session-config>
-  
-</web-app>

From b4621db8e6badaa308cfb7a6691e53f207f16d63 Mon Sep 17 00:00:00 2001
From: tesobe-daniel <daniel@tesobe.com>
Date: Fri, 12 Jan 2024 16:40:25 +0100
Subject: [PATCH 5/6] Create web.xml

---
 src/main/webapp/WEB-INF/web.xml | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 src/main/webapp/WEB-INF/web.xml

diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 00000000..e128e1cf
--- /dev/null
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!DOCTYPE web-app
+        PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+        "web-app_2_3.dtd">
+
+<web-app>
+  <filter>
+    <filter-name>LiftFilter</filter-name>
+    <display-name>Lift Filter</display-name>
+    <description>The Filter that intercepts lift calls</description>
+    <filter-class>net.liftweb.http.LiftFilter</filter-class>
+  </filter>
+
+
+  <filter-mapping>
+    <filter-name>LiftFilter</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+
+  <!--set  the status of HttpOnly and Secure cookie flags-->
+  <session-config>
+    <cookie-config>
+      <secure>true</secure>
+      <http-only>true</http-only>
+    </cookie-config>
+  </session-config>
+  
+</web-app>

From aad724d79fb309e465231c285091846761885cc6 Mon Sep 17 00:00:00 2001
From: tesobe-daniel <daniel@tesobe.com>
Date: Fri, 12 Jan 2024 16:41:48 +0100
Subject: [PATCH 6/6] Update web.xml

---
 src/main/webapp/WEB-INF/web.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index e128e1cf..0c5bb12c 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -21,8 +21,8 @@
   <!--set  the status of HttpOnly and Secure cookie flags-->
   <session-config>
     <cookie-config>
-      <secure>true</secure>
-      <http-only>true</http-only>
+      <secure>false</secure>
+      <http-only>false</http-only>
     </cookie-config>
   </session-config>