From 62d84f16a0ed713012f63a0d5c3d4c198c669950 Mon Sep 17 00:00:00 2001
From: BodeOmoboya01 <124751324+BodeOmoboya01@users.noreply.github.com>
Date: Wed, 24 Jan 2024 13:38:43 -0600
Subject: [PATCH 1/5] small change to trigger build -1

---
 webapp/src/main/webapp/index.jsp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp
index 7f5bec63ce..fdd88ad55b 100644
--- a/webapp/src/main/webapp/index.jsp
+++ b/webapp/src/main/webapp/index.jsp
@@ -13,8 +13,7 @@
     <br>
 
     <label for="email"><b>Enter Email</b></label>
-    <input type="text" placeholder="Enter Email" name="email" id="email" required>
-    <br>
+    <input type="text" placeholder="Enter Email" name="email" id="email" required>    
 
     <label for="psw"><b>Password</b></label>
     <input type="password" placeholder="Enter Password" name="psw" id="psw" required>

From cd80673b7e3695d6139808c2ad7edaf22915c67b Mon Sep 17 00:00:00 2001
From: BodeOmoboya01 <124751324+BodeOmoboya01@users.noreply.github.com>
Date: Fri, 26 Jan 2024 12:54:59 -0600
Subject: [PATCH 2/5] adding ansible playbooks for kubernetes

---
 ansible-playbook-regapp-deploy.yaml  | 8 ++++++++
 ansible-playbook-regapp-service.yaml | 8 ++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 ansible-playbook-regapp-deploy.yaml
 create mode 100644 ansible-playbook-regapp-service.yaml

diff --git a/ansible-playbook-regapp-deploy.yaml b/ansible-playbook-regapp-deploy.yaml
new file mode 100644
index 0000000000..cb85ecd90a
--- /dev/null
+++ b/ansible-playbook-regapp-deploy.yaml
@@ -0,0 +1,8 @@
+---
+- hosts: kubernetes
+  user: root
+#  become: true
+
+  tasks:
+  - name: deploy regapp on kubernetes
+    command: kubectl apply -f regapp-deploy.yaml
diff --git a/ansible-playbook-regapp-service.yaml b/ansible-playbook-regapp-service.yaml
new file mode 100644
index 0000000000..8fdd10334b
--- /dev/null
+++ b/ansible-playbook-regapp-service.yaml
@@ -0,0 +1,8 @@
+---
+- hosts: kubernetes
+  user: root
+#  become: true
+
+  tasks:
+  - name: deploy regapp service on kubernetes
+    command: kubectl apply -f regapp-service.yaml

From 759cd644b01fbc969f81504fd886c96c0f7efbfa Mon Sep 17 00:00:00 2001
From: BodeOmoboya01 <124751324+BodeOmoboya01@users.noreply.github.com>
Date: Fri, 26 Jan 2024 13:07:17 -0600
Subject: [PATCH 3/5] typo correction

---
 ...ce.yaml => ansible-playbook-regapp-deploy-service.yaml | 2 ++
 ansible-playbook-regapp-deploy.yaml                       | 8 --------
 2 files changed, 2 insertions(+), 8 deletions(-)
 rename ansible-playbook-regapp-service.yaml => ansible-playbook-regapp-deploy-service.yaml (64%)
 delete mode 100644 ansible-playbook-regapp-deploy.yaml

diff --git a/ansible-playbook-regapp-service.yaml b/ansible-playbook-regapp-deploy-service.yaml
similarity index 64%
rename from ansible-playbook-regapp-service.yaml
rename to ansible-playbook-regapp-deploy-service.yaml
index 8fdd10334b..2a9e5ebd02 100644
--- a/ansible-playbook-regapp-service.yaml
+++ b/ansible-playbook-regapp-deploy-service.yaml
@@ -6,3 +6,5 @@
   tasks:
   - name: deploy regapp service on kubernetes
     command: kubectl apply -f regapp-service.yaml
+  - name: deploy regapp on kubernetes
+    command: kubectl apply -f regapp-deploy.yaml
diff --git a/ansible-playbook-regapp-deploy.yaml b/ansible-playbook-regapp-deploy.yaml
deleted file mode 100644
index cb85ecd90a..0000000000
--- a/ansible-playbook-regapp-deploy.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- hosts: kubernetes
-  user: root
-#  become: true
-
-  tasks:
-  - name: deploy regapp on kubernetes
-    command: kubectl apply -f regapp-deploy.yaml

From 5edbb6173eebbf4678338ee8a1f0ce2ab353ca5d Mon Sep 17 00:00:00 2001
From: BodeOmoboya01 <124751324+BodeOmoboya01@users.noreply.github.com>
Date: Fri, 30 Aug 2024 12:04:36 -0500
Subject: [PATCH 4/5] adding circleci yaml file

---
 .circleci/config.yaml | 69 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 .circleci/config.yaml

diff --git a/.circleci/config.yaml b/.circleci/config.yaml
new file mode 100644
index 0000000000..27db3196c9
--- /dev/null
+++ b/.circleci/config.yaml
@@ -0,0 +1,69 @@
+version: 2.1
+
+orbs:
+  docker: circleci/docker@1.5.0
+
+jobs:
+
+  build:
+    docker:
+      - image: cimg/openjdk:11.0
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+            - maven-deps-{{ checksum "pom.xml" }}
+      - run:
+          name: Build with Maven
+          command: mvn clean package
+      - save_cache:
+          paths:
+            - ~/.m2
+          key: maven-deps-{{ checksum "pom.xml" }}
+      - persist_to_workspace:
+          root: .
+          paths:
+            - target/*.war
+            - Dockerfile
+
+  test:
+    docker:
+      - image: cimg/openjdk:11.0
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+            - maven-deps-{{ checksum "pom.xml" }}
+      - run:
+          name: Run tests
+          command: mvn test
+
+  build_and_push_image:
+    docker:
+      - image: cimg/base:stable
+    steps:
+      - setup_remote_docker
+      - attach_workspace:
+          at: .
+      - docker/check
+      - docker/build:
+          image: bodeomoboya01/java-hello-world-01
+          tag: ${CIRCLE_SHA1}
+      - docker/push:
+          image: bodeomoboya01/java-hello-world-01
+          tag: ${CIRCLE_SHA1}
+
+workflows:
+  version: 2
+  build-test-deploy:
+    jobs:
+      - build
+      - test:
+          requires:
+            - build
+      - build_and_push_image:
+          requires:
+            - test
+          filters:
+            branches:
+              only: develop
\ No newline at end of file

From e6bb453cfe8a723f6302cb3c2fd5a8e1cb63d80e Mon Sep 17 00:00:00 2001
From: BodeOmoboya01 <124751324+BodeOmoboya01@users.noreply.github.com>
Date: Fri, 30 Aug 2024 12:14:38 -0500
Subject: [PATCH 5/5] adding circleci yaml dorrect typo

---
 .circleci/{config.yaml => config.yml} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename .circleci/{config.yaml => config.yml} (100%)

diff --git a/.circleci/config.yaml b/.circleci/config.yml
similarity index 100%
rename from .circleci/config.yaml
rename to .circleci/config.yml