From 21a1cd61cb6a220cba21bfcbc4cc5b6aa44fa1be Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sun, 5 Nov 2023 17:07:54 +0400
Subject: [PATCH 01/58] c

---
 jenkisfiles/deployk8 | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 jenkisfiles/deployk8

diff --git a/jenkisfiles/deployk8 b/jenkisfiles/deployk8
new file mode 100644
index 0000000..9f7935b
--- /dev/null
+++ b/jenkisfiles/deployk8
@@ -0,0 +1,22 @@
+properties([
+    parameters([
+        string(defaultValue: 'dev-uat', name: 'BRANCH'),
+        string(defaultValue: 'master', name: 'comp'),
+        string(defaultValue: 'service', name: 'action')
+    ])
+])
+
+node {
+    cleanWs()
+
+    stage('Git Checkout') {
+        git branch: "${params.BRANCH}", credentialsId: 'myjenkins', url: 'git@github.com:pjitss/docker-Java-kubernetes-project.git'
+    }
+
+    stage('Build with Maven') {
+        def mvnHome = tool 'maven'
+        dir('shopfront') {
+            sh "${mvnHome}/bin/mvn clean"
+        }
+    }
+}
\ No newline at end of file

From 1c90dcb816324fd5e9e541a34a30ce1d469e3ad5 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sun, 5 Nov 2023 17:16:09 +0400
Subject: [PATCH 02/58] kl

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 9cec002..4cc2a7c 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
 # docker-Java-kubernetes-project
-Deploying Java Applications with Docker and Kubernetes
+Deploying Java Application with Docker and Kubernetes
 
 Credit: https://github.com/danielbryantuk/oreilly-docker-java-shopping/

From d2115e7940198de32e111b191fe8ba2a29801dab Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sun, 5 Nov 2023 17:17:48 +0400
Subject: [PATCH 03/58] dfa

---
 {jenkisfiles => jenkinsfiles}/deployk8 | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename {jenkisfiles => jenkinsfiles}/deployk8 (100%)

diff --git a/jenkisfiles/deployk8 b/jenkinsfiles/deployk8
similarity index 100%
rename from jenkisfiles/deployk8
rename to jenkinsfiles/deployk8

From 3e91bb3d1d74a327cc96ebfb27504fd4dd7b674c Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sun, 5 Nov 2023 17:51:04 +0400
Subject: [PATCH 04/58] sd

---
 jenkinsfiles/deployk8       | 11 ++++++-----
 playbooks/k8deploy-main.yml | 24 ++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 5 deletions(-)
 create mode 100644 playbooks/k8deploy-main.yml

diff --git a/jenkinsfiles/deployk8 b/jenkinsfiles/deployk8
index 9f7935b..ecf27d3 100644
--- a/jenkinsfiles/deployk8
+++ b/jenkinsfiles/deployk8
@@ -2,6 +2,7 @@ properties([
     parameters([
         string(defaultValue: 'dev-uat', name: 'BRANCH'),
         string(defaultValue: 'master', name: 'comp'),
+        string(defaultValue: 'master', name: 'mvn'),
         string(defaultValue: 'service', name: 'action')
     ])
 ])
@@ -13,10 +14,10 @@ node {
         git branch: "${params.BRANCH}", credentialsId: 'myjenkins', url: 'git@github.com:pjitss/docker-Java-kubernetes-project.git'
     }
 
-    stage('Build with Maven') {
-        def mvnHome = tool 'maven'
-        dir('shopfront') {
-            sh "${mvnHome}/bin/mvn clean"
-        }
+    stage('Execute Ansible Playbooks on Kubernetes Master') {
+        ansiblePlaybook(
+            playbook: "playbooks/k8deploy-main.yml",
+            extras: " -e mvn=${mvn}"
+        )
     }
 }
\ No newline at end of file
diff --git a/playbooks/k8deploy-main.yml b/playbooks/k8deploy-main.yml
new file mode 100644
index 0000000..9b59e01
--- /dev/null
+++ b/playbooks/k8deploy-main.yml
@@ -0,0 +1,24 @@
+- hosts: "{{ target_host }}"
+  gather_facts: false
+  #become: yes
+  #become_method: sudo
+  #become_user: jits
+  tasks:
+
+    - name: execute mvn command for shopfront
+      command: mvn clean package
+      args:
+        chdir: shopfront
+      when: mvn == "shop"
+
+    - name: execute mvn command for productcatalogue
+      command: mvn clean package
+      args:
+        chdir: productcatalogue
+      when: mvn == "product"
+
+    - name: execute mvn command for stockmanager
+      command: mvn clean package
+      args:
+        chdir: stockmanager
+      when: mvn == "stock"
\ No newline at end of file

From dc456d1aff2bde982fcb536f5b165187284f962f Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sun, 5 Nov 2023 17:55:29 +0400
Subject: [PATCH 05/58] Fsd

---
 inventory/k8-inventory | 2 ++
 jenkinsfiles/deployk8  | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 inventory/k8-inventory

diff --git a/inventory/k8-inventory b/inventory/k8-inventory
new file mode 100644
index 0000000..8404623
--- /dev/null
+++ b/inventory/k8-inventory
@@ -0,0 +1,2 @@
+[MAVEN]
+192.168.0.112
\ No newline at end of file
diff --git a/jenkinsfiles/deployk8 b/jenkinsfiles/deployk8
index ecf27d3..4d2b2a2 100644
--- a/jenkinsfiles/deployk8
+++ b/jenkinsfiles/deployk8
@@ -17,7 +17,7 @@ node {
     stage('Execute Ansible Playbooks on Kubernetes Master') {
         ansiblePlaybook(
             playbook: "playbooks/k8deploy-main.yml",
-            extras: " -e mvn=${mvn}"
+            extras: "-i inventory/k8-inventory -e target_host=${comp} -e mvn=${mvn}"
         )
     }
 }
\ No newline at end of file

From 96b1b861907ce8013fe3df28ef6742077df16d37 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sun, 5 Nov 2023 17:57:21 +0400
Subject: [PATCH 06/58] df

---
 jenkinsfiles/deployk8 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jenkinsfiles/deployk8 b/jenkinsfiles/deployk8
index 4d2b2a2..539f828 100644
--- a/jenkinsfiles/deployk8
+++ b/jenkinsfiles/deployk8
@@ -17,7 +17,7 @@ node {
     stage('Execute Ansible Playbooks on Kubernetes Master') {
         ansiblePlaybook(
             playbook: "playbooks/k8deploy-main.yml",
-            extras: "-i inventory/k8-inventory -e target_host=${comp} -e mvn=${mvn}"
+            extras: "-u jits -i inventory/k8-inventory -e target_host=${comp} -e mvn=${mvn}"
         )
     }
 }
\ No newline at end of file

From 805000f8daec2fe580face5a75b564ef6b9d5a0a Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sun, 5 Nov 2023 18:00:07 +0400
Subject: [PATCH 07/58] D

---
 inventory/k8-inventory | 1 +
 1 file changed, 1 insertion(+)

diff --git a/inventory/k8-inventory b/inventory/k8-inventory
index 8404623..0520a15 100644
--- a/inventory/k8-inventory
+++ b/inventory/k8-inventory
@@ -1,2 +1,3 @@
 [MAVEN]
+192.168.0.195
 192.168.0.112
\ No newline at end of file

From e5057ee033d01dc8eb2a007f9ce7a6af63a14f71 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sun, 5 Nov 2023 18:02:18 +0400
Subject: [PATCH 08/58] xc

---
 jenkinsfiles/deployk8       | 2 +-
 playbooks/k8deploy-main.yml | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/jenkinsfiles/deployk8 b/jenkinsfiles/deployk8
index 539f828..4d2b2a2 100644
--- a/jenkinsfiles/deployk8
+++ b/jenkinsfiles/deployk8
@@ -17,7 +17,7 @@ node {
     stage('Execute Ansible Playbooks on Kubernetes Master') {
         ansiblePlaybook(
             playbook: "playbooks/k8deploy-main.yml",
-            extras: "-u jits -i inventory/k8-inventory -e target_host=${comp} -e mvn=${mvn}"
+            extras: "-i inventory/k8-inventory -e target_host=${comp} -e mvn=${mvn}"
         )
     }
 }
\ No newline at end of file
diff --git a/playbooks/k8deploy-main.yml b/playbooks/k8deploy-main.yml
index 9b59e01..5474625 100644
--- a/playbooks/k8deploy-main.yml
+++ b/playbooks/k8deploy-main.yml
@@ -1,8 +1,8 @@
 - hosts: "{{ target_host }}"
   gather_facts: false
-  #become: yes
-  #become_method: sudo
-  #become_user: jits
+  become: yes
+  become_method: sudo
+  become_user: jits
   tasks:
 
     - name: execute mvn command for shopfront

From e0910492ad8e2eea6b7096d88e2f9a7c80edd54a Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sun, 5 Nov 2023 18:08:08 +0400
Subject: [PATCH 09/58] cv

---
 inventory/k8-inventory | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/inventory/k8-inventory b/inventory/k8-inventory
index 0520a15..442986c 100644
--- a/inventory/k8-inventory
+++ b/inventory/k8-inventory
@@ -1,3 +1,2 @@
 [MAVEN]
-192.168.0.195
-192.168.0.112
\ No newline at end of file
+192.168.0.112 ansible_user=jits ansible_ssh_pass=redhat
\ No newline at end of file

From 95c5ce9fde38c9916eac9bb2eecc3f9fc05a3ec7 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sun, 5 Nov 2023 18:13:35 +0400
Subject: [PATCH 10/58] SD

---
 inventory/k8-inventory      | 5 ++++-
 playbooks/k8deploy-main.yml | 8 ++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/inventory/k8-inventory b/inventory/k8-inventory
index 442986c..63b5e73 100644
--- a/inventory/k8-inventory
+++ b/inventory/k8-inventory
@@ -1,2 +1,5 @@
 [MAVEN]
-192.168.0.112 ansible_user=jits ansible_ssh_pass=redhat
\ No newline at end of file
+192.168.0.112 ansible_user=jits ansible_ssh_pass=redhat
+
+[localhost]
+localhost
\ No newline at end of file
diff --git a/playbooks/k8deploy-main.yml b/playbooks/k8deploy-main.yml
index 5474625..cf1b2b7 100644
--- a/playbooks/k8deploy-main.yml
+++ b/playbooks/k8deploy-main.yml
@@ -1,8 +1,8 @@
-- hosts: "{{ target_host }}"
+- hosts: localhost
   gather_facts: false
-  become: yes
-  become_method: sudo
-  become_user: jits
+  #become: yes
+  #become_method: sudo
+  #become_user: jits
   tasks:
 
     - name: execute mvn command for shopfront

From d36f85785a463ee274dd0d8755ae34aad87b9e1f Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sun, 5 Nov 2023 18:14:21 +0400
Subject: [PATCH 11/58] vc

---
 jenkinsfiles/deployk8 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jenkinsfiles/deployk8 b/jenkinsfiles/deployk8
index 4d2b2a2..3abebcb 100644
--- a/jenkinsfiles/deployk8
+++ b/jenkinsfiles/deployk8
@@ -17,7 +17,7 @@ node {
     stage('Execute Ansible Playbooks on Kubernetes Master') {
         ansiblePlaybook(
             playbook: "playbooks/k8deploy-main.yml",
-            extras: "-i inventory/k8-inventory -e target_host=${comp} -e mvn=${mvn}"
+            extras: "-e mvn=${mvn}"
         )
     }
 }
\ No newline at end of file

From c70247b269d47cb2f8c7d9b8838a3748637c4ecd Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sun, 5 Nov 2023 18:16:17 +0400
Subject: [PATCH 12/58] CX

---
 playbooks/k8deploy-main.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/playbooks/k8deploy-main.yml b/playbooks/k8deploy-main.yml
index cf1b2b7..ffc4d98 100644
--- a/playbooks/k8deploy-main.yml
+++ b/playbooks/k8deploy-main.yml
@@ -9,16 +9,16 @@
       command: mvn clean package
       args:
         chdir: shopfront
-      when: mvn == "shop"
+      when: mvn == "../shop"
 
     - name: execute mvn command for productcatalogue
       command: mvn clean package
       args:
         chdir: productcatalogue
-      when: mvn == "product"
+      when: mvn == "../product"
 
     - name: execute mvn command for stockmanager
       command: mvn clean package
       args:
         chdir: stockmanager
-      when: mvn == "stock"
\ No newline at end of file
+      when: mvn == "../stock"
\ No newline at end of file

From 06f2e910b7dbdb2e1f72acab44dbd6b1c34c8ac5 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sun, 5 Nov 2023 18:18:24 +0400
Subject: [PATCH 13/58] dd

---
 playbooks/k8deploy-main.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/playbooks/k8deploy-main.yml b/playbooks/k8deploy-main.yml
index ffc4d98..6b62da6 100644
--- a/playbooks/k8deploy-main.yml
+++ b/playbooks/k8deploy-main.yml
@@ -8,17 +8,17 @@
     - name: execute mvn command for shopfront
       command: mvn clean package
       args:
-        chdir: shopfront
-      when: mvn == "../shop"
+        chdir: ../shopfront
+      when: mvn == "shop"
 
     - name: execute mvn command for productcatalogue
       command: mvn clean package
       args:
-        chdir: productcatalogue
-      when: mvn == "../product"
+        chdir: ../productcatalogue
+      when: mvn == "product"
 
     - name: execute mvn command for stockmanager
       command: mvn clean package
       args:
-        chdir: stockmanager
-      when: mvn == "../stock"
\ No newline at end of file
+        chdir: ../stockmanager
+      when: mvn == "stock"
\ No newline at end of file

From 7b6d543443712db37246169631d9e5bb1499c483 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sun, 5 Nov 2023 18:20:51 +0400
Subject: [PATCH 14/58] vc

---
 playbooks/k8deploy-main.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/playbooks/k8deploy-main.yml b/playbooks/k8deploy-main.yml
index 6b62da6..9247742 100644
--- a/playbooks/k8deploy-main.yml
+++ b/playbooks/k8deploy-main.yml
@@ -1,8 +1,8 @@
 - hosts: localhost
   gather_facts: false
-  #become: yes
-  #become_method: sudo
-  #become_user: jits
+  become: yes
+  become_method: sudo
+  become_user: jits
   tasks:
 
     - name: execute mvn command for shopfront

From b5a2fad5bab82ef2ebbdf6e9427d08dbed0d021a Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sun, 5 Nov 2023 18:21:36 +0400
Subject: [PATCH 15/58] c

---
 playbooks/k8deploy-main.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/playbooks/k8deploy-main.yml b/playbooks/k8deploy-main.yml
index 9247742..f6cd089 100644
--- a/playbooks/k8deploy-main.yml
+++ b/playbooks/k8deploy-main.yml
@@ -1,8 +1,8 @@
 - hosts: localhost
   gather_facts: false
   become: yes
-  become_method: sudo
-  become_user: jits
+  #become_method: sudo
+  become_user: root
   tasks:
 
     - name: execute mvn command for shopfront

From 32fa20979a742a897b9dae76ad885be59e857f82 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sun, 5 Nov 2023 18:22:43 +0400
Subject: [PATCH 16/58] F

---
 playbooks/k8deploy-main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/playbooks/k8deploy-main.yml b/playbooks/k8deploy-main.yml
index f6cd089..272334a 100644
--- a/playbooks/k8deploy-main.yml
+++ b/playbooks/k8deploy-main.yml
@@ -6,7 +6,7 @@
   tasks:
 
     - name: execute mvn command for shopfront
-      command: mvn clean package
+      command: whoami && ls -ltr && mvn clean package
       args:
         chdir: ../shopfront
       when: mvn == "shop"

From 6aca75e8af954dcc62709349aedbf401f8183105 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sun, 5 Nov 2023 18:23:09 +0400
Subject: [PATCH 17/58] vz

---
 playbooks/k8deploy-main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/playbooks/k8deploy-main.yml b/playbooks/k8deploy-main.yml
index 272334a..1a4dc81 100644
--- a/playbooks/k8deploy-main.yml
+++ b/playbooks/k8deploy-main.yml
@@ -2,7 +2,7 @@
   gather_facts: false
   become: yes
   #become_method: sudo
-  become_user: root
+  #become_user: root
   tasks:
 
     - name: execute mvn command for shopfront

From d78b3123de5f24977dd931643e55fc877af10dbb Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sun, 5 Nov 2023 18:23:45 +0400
Subject: [PATCH 18/58] zv

---
 playbooks/k8deploy-main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/playbooks/k8deploy-main.yml b/playbooks/k8deploy-main.yml
index 1a4dc81..63848e0 100644
--- a/playbooks/k8deploy-main.yml
+++ b/playbooks/k8deploy-main.yml
@@ -1,6 +1,6 @@
 - hosts: localhost
   gather_facts: false
-  become: yes
+  #become: yes
   #become_method: sudo
   #become_user: root
   tasks:

From 7732dc44999e08e8b516fab9e88e13c529c5696a Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sun, 5 Nov 2023 18:24:33 +0400
Subject: [PATCH 19/58] fd

---
 playbooks/k8deploy-main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/playbooks/k8deploy-main.yml b/playbooks/k8deploy-main.yml
index 63848e0..dc6f947 100644
--- a/playbooks/k8deploy-main.yml
+++ b/playbooks/k8deploy-main.yml
@@ -6,7 +6,7 @@
   tasks:
 
     - name: execute mvn command for shopfront
-      command: whoami && ls -ltr && mvn clean package
+      shell: whoami && ls -ltr && mvn clean package
       args:
         chdir: ../shopfront
       when: mvn == "shop"

From 772e27ca0443a7c96016594e0e9b60b71761b010 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sun, 5 Nov 2023 18:27:05 +0400
Subject: [PATCH 20/58] ds

---
 playbooks/k8deploy-main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/playbooks/k8deploy-main.yml b/playbooks/k8deploy-main.yml
index dc6f947..ff593ee 100644
--- a/playbooks/k8deploy-main.yml
+++ b/playbooks/k8deploy-main.yml
@@ -6,7 +6,7 @@
   tasks:
 
     - name: execute mvn command for shopfront
-      shell: whoami && ls -ltr && mvn clean package
+      shell: whoami && ls -ltr
       args:
         chdir: ../shopfront
       when: mvn == "shop"

From b0e539e0def4ff9e45c82b9df0609de420ce7852 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sun, 5 Nov 2023 18:28:25 +0400
Subject: [PATCH 21/58] cv

---
 playbooks/k8deploy-main.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/playbooks/k8deploy-main.yml b/playbooks/k8deploy-main.yml
index ff593ee..7e916b9 100644
--- a/playbooks/k8deploy-main.yml
+++ b/playbooks/k8deploy-main.yml
@@ -7,10 +7,13 @@
 
     - name: execute mvn command for shopfront
       shell: whoami && ls -ltr
+      register: output
       args:
         chdir: ../shopfront
       when: mvn == "shop"
 
+    - debug: var="output"  
+
     - name: execute mvn command for productcatalogue
       command: mvn clean package
       args:

From 852cf4ae4de9fa0e7bce94920dd35d9aeb08f829 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sun, 5 Nov 2023 18:40:36 +0400
Subject: [PATCH 22/58] f

---
 playbooks/k8deploy-main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/playbooks/k8deploy-main.yml b/playbooks/k8deploy-main.yml
index 7e916b9..d7b3051 100644
--- a/playbooks/k8deploy-main.yml
+++ b/playbooks/k8deploy-main.yml
@@ -6,7 +6,7 @@
   tasks:
 
     - name: execute mvn command for shopfront
-      shell: whoami && ls -ltr
+      shell: whoami && ls -ltr && mvn clean
       register: output
       args:
         chdir: ../shopfront

From 36b66c5a6a25576dc3615f9c6da06394c85f11bb Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sun, 5 Nov 2023 18:41:30 +0400
Subject: [PATCH 23/58] fd

---
 playbooks/k8deploy-main.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/playbooks/k8deploy-main.yml b/playbooks/k8deploy-main.yml
index d7b3051..0f7bb00 100644
--- a/playbooks/k8deploy-main.yml
+++ b/playbooks/k8deploy-main.yml
@@ -1,7 +1,7 @@
 - hosts: localhost
   gather_facts: false
-  #become: yes
-  #become_method: sudo
+  become: yes
+  become_method: sudo
   #become_user: root
   tasks:
 

From 65d768f8fc77d18a638ace5f68ad4203e0557774 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sun, 5 Nov 2023 18:43:28 +0400
Subject: [PATCH 24/58] vc

---
 playbooks/k8deploy-main.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/playbooks/k8deploy-main.yml b/playbooks/k8deploy-main.yml
index 0f7bb00..0dedca1 100644
--- a/playbooks/k8deploy-main.yml
+++ b/playbooks/k8deploy-main.yml
@@ -1,12 +1,12 @@
 - hosts: localhost
   gather_facts: false
-  become: yes
-  become_method: sudo
+  #become: yes
+  #become_method: sudo
   #become_user: root
   tasks:
 
     - name: execute mvn command for shopfront
-      shell: whoami && ls -ltr && mvn clean
+      shell: whoami && ls -ltr && sudo su - $USER -c "mvn --version"
       register: output
       args:
         chdir: ../shopfront

From e70ab1bc4056fd0ceff2bc04696f433f0e61aa0a Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sun, 5 Nov 2023 18:46:04 +0400
Subject: [PATCH 25/58] df

---
 playbooks/k8deploy-main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/playbooks/k8deploy-main.yml b/playbooks/k8deploy-main.yml
index 0dedca1..22dfe12 100644
--- a/playbooks/k8deploy-main.yml
+++ b/playbooks/k8deploy-main.yml
@@ -6,7 +6,7 @@
   tasks:
 
     - name: execute mvn command for shopfront
-      shell: whoami && ls -ltr && sudo su - $USER -c "mvn --version"
+      shell: whoami && ls -ltr && sudo su - $USER -c "mvn clean"
       register: output
       args:
         chdir: ../shopfront

From 085849f21c16ad8cefa7d31ffcfd3de63c6c6faf Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sun, 5 Nov 2023 18:51:43 +0400
Subject: [PATCH 26/58] dF

---
 playbooks/k8deploy-main.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/playbooks/k8deploy-main.yml b/playbooks/k8deploy-main.yml
index 22dfe12..2c351fd 100644
--- a/playbooks/k8deploy-main.yml
+++ b/playbooks/k8deploy-main.yml
@@ -6,10 +6,10 @@
   tasks:
 
     - name: execute mvn command for shopfront
-      shell: whoami && ls -ltr && sudo su - $USER -c "mvn clean"
+      shell: mvn clean
       register: output
       args:
-        chdir: ../shopfront
+        chdir: docker-Java-kubernetes-project/shopfront
       when: mvn == "shop"
 
     - debug: var="output"  

From 8d281f95fb8eed053761fd08c0612d67154e32da Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sun, 5 Nov 2023 18:54:08 +0400
Subject: [PATCH 27/58] df

---
 playbooks/k8deploy-main.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/playbooks/k8deploy-main.yml b/playbooks/k8deploy-main.yml
index 2c351fd..75e73fe 100644
--- a/playbooks/k8deploy-main.yml
+++ b/playbooks/k8deploy-main.yml
@@ -6,10 +6,10 @@
   tasks:
 
     - name: execute mvn command for shopfront
-      shell: mvn clean
+      shell: pwd && mvn clean
       register: output
       args:
-        chdir: docker-Java-kubernetes-project/shopfront
+        chdir: ../shopfront
       when: mvn == "shop"
 
     - debug: var="output"  

From db9e7da52d8f520c3fdae6e6c3b9f2377a6c92f4 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sun, 5 Nov 2023 18:55:33 +0400
Subject: [PATCH 28/58] vc

---
 playbooks/k8deploy-main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/playbooks/k8deploy-main.yml b/playbooks/k8deploy-main.yml
index 75e73fe..fa330eb 100644
--- a/playbooks/k8deploy-main.yml
+++ b/playbooks/k8deploy-main.yml
@@ -6,7 +6,7 @@
   tasks:
 
     - name: execute mvn command for shopfront
-      shell: pwd && mvn clean
+      shell: pwd && sudo su - $USER -c "mvn clean"
       register: output
       args:
         chdir: ../shopfront

From 7178f038184d1e1aa00859720fe601ba5671c81b Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sun, 5 Nov 2023 18:56:39 +0400
Subject: [PATCH 29/58] cx

---
 playbooks/k8deploy-main.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/playbooks/k8deploy-main.yml b/playbooks/k8deploy-main.yml
index fa330eb..2af3e58 100644
--- a/playbooks/k8deploy-main.yml
+++ b/playbooks/k8deploy-main.yml
@@ -1,12 +1,12 @@
 - hosts: localhost
   gather_facts: false
-  #become: yes
-  #become_method: sudo
+  become: yes
+  become_method: sudo
   #become_user: root
   tasks:
 
     - name: execute mvn command for shopfront
-      shell: pwd && sudo su - $USER -c "mvn clean"
+      shell: pwd && "mvn clean"
       register: output
       args:
         chdir: ../shopfront

From ff02e19eee83c85fb4035acea2f383848aed2d5d Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sun, 5 Nov 2023 18:59:47 +0400
Subject: [PATCH 30/58] ds

---
 playbooks/k8deploy-main.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/playbooks/k8deploy-main.yml b/playbooks/k8deploy-main.yml
index 2af3e58..baaedd1 100644
--- a/playbooks/k8deploy-main.yml
+++ b/playbooks/k8deploy-main.yml
@@ -2,11 +2,11 @@
   gather_facts: false
   become: yes
   become_method: sudo
-  #become_user: root
+  become_user: jits
   tasks:
 
     - name: execute mvn command for shopfront
-      shell: pwd && "mvn clean"
+      shell: pwd && mvn clean
       register: output
       args:
         chdir: ../shopfront

From 293aebf987b7249a164c8910695b3af0b2da74a4 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sun, 5 Nov 2023 19:00:57 +0400
Subject: [PATCH 31/58] fd

---
 playbooks/k8deploy-main.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/playbooks/k8deploy-main.yml b/playbooks/k8deploy-main.yml
index baaedd1..91ef08b 100644
--- a/playbooks/k8deploy-main.yml
+++ b/playbooks/k8deploy-main.yml
@@ -1,7 +1,7 @@
 - hosts: localhost
   gather_facts: false
-  become: yes
-  become_method: sudo
+  #become: yes
+  #become_method: sudo
   become_user: jits
   tasks:
 

From d8925b2414cd08008cd82806f7378fa43325bed9 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sun, 5 Nov 2023 19:02:04 +0400
Subject: [PATCH 32/58] df

---
 playbooks/k8deploy-main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/playbooks/k8deploy-main.yml b/playbooks/k8deploy-main.yml
index 91ef08b..bf56fa1 100644
--- a/playbooks/k8deploy-main.yml
+++ b/playbooks/k8deploy-main.yml
@@ -6,7 +6,7 @@
   tasks:
 
     - name: execute mvn command for shopfront
-      shell: pwd && mvn clean
+      shell: pwd && whoami && "mvn clean"
       register: output
       args:
         chdir: ../shopfront

From 800ac317a756aff14ac8e4521d62313d370998dc Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sun, 5 Nov 2023 19:04:19 +0400
Subject: [PATCH 33/58] df

---
 playbooks/k8deploy-main.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/playbooks/k8deploy-main.yml b/playbooks/k8deploy-main.yml
index bf56fa1..6365889 100644
--- a/playbooks/k8deploy-main.yml
+++ b/playbooks/k8deploy-main.yml
@@ -11,6 +11,7 @@
       args:
         chdir: ../shopfront
       when: mvn == "shop"
+      become_user: jits
 
     - debug: var="output"  
 

From 4f8795c98521f15915926a58143ac1560f5bdefa Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sun, 5 Nov 2023 19:07:34 +0400
Subject: [PATCH 34/58] fda

---
 playbooks/k8deploy-main.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/playbooks/k8deploy-main.yml b/playbooks/k8deploy-main.yml
index 6365889..2bd4b77 100644
--- a/playbooks/k8deploy-main.yml
+++ b/playbooks/k8deploy-main.yml
@@ -2,16 +2,15 @@
   gather_facts: false
   #become: yes
   #become_method: sudo
-  become_user: jits
+  #become_user: jits
   tasks:
 
     - name: execute mvn command for shopfront
-      shell: pwd && whoami && "mvn clean"
+      shell: pwd && whoami && /opt/maven/apache-maven-3.8.8/bin/mvn clean
       register: output
       args:
         chdir: ../shopfront
       when: mvn == "shop"
-      become_user: jits
 
     - debug: var="output"  
 

From 5205cf98ae99d7171e5aa7f91139b52ad4a1d535 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sun, 5 Nov 2023 19:25:30 +0400
Subject: [PATCH 35/58] df

---
 jenkinsfiles/deployk8       |  4 ++++
 playbooks/k8deploy-main.yml | 12 ++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/jenkinsfiles/deployk8 b/jenkinsfiles/deployk8
index 3abebcb..a9bde25 100644
--- a/jenkinsfiles/deployk8
+++ b/jenkinsfiles/deployk8
@@ -14,6 +14,10 @@ node {
         git branch: "${params.BRANCH}", credentialsId: 'myjenkins', url: 'git@github.com:pjitss/docker-Java-kubernetes-project.git'
     }
 
+    //stage('setting maven path') {
+        // Ensure the tool 'Maven' is configured in Jenkins Global Tool Configuration
+    //    def mvnHome = tool 'maven'
+    //}
     stage('Execute Ansible Playbooks on Kubernetes Master') {
         ansiblePlaybook(
             playbook: "playbooks/k8deploy-main.yml",
diff --git a/playbooks/k8deploy-main.yml b/playbooks/k8deploy-main.yml
index 2bd4b77..0df347a 100644
--- a/playbooks/k8deploy-main.yml
+++ b/playbooks/k8deploy-main.yml
@@ -6,22 +6,22 @@
   tasks:
 
     - name: execute mvn command for shopfront
-      shell: pwd && whoami && /opt/maven/apache-maven-3.8.8/bin/mvn clean
+      shell: /opt/maven/apache-maven-3.8.8/bin/mvn clean package
       register: output
       args:
         chdir: ../shopfront
-      when: mvn == "shop"
+      when: mvn == "shop" or mvn == "allapps"
 
     - debug: var="output"  
 
     - name: execute mvn command for productcatalogue
-      command: mvn clean package
+      command: /opt/maven/apache-maven-3.8.8/bin/mvn clean package
       args:
         chdir: ../productcatalogue
-      when: mvn == "product"
+      when: mvn == "product" or mvn == "allapps"
 
     - name: execute mvn command for stockmanager
-      command: mvn clean package
+      command: /opt/maven/apache-maven-3.8.8/bin/mvn clean package
       args:
         chdir: ../stockmanager
-      when: mvn == "stock"
\ No newline at end of file
+      when: mvn == "stock" or mvn == "allapps"
\ No newline at end of file

From c5adcc40151bb45bffac940fdd29c3a2fa17df9d Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sun, 5 Nov 2023 19:33:35 +0400
Subject: [PATCH 36/58] AS

---
 playbooks/k8deploy-main.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/playbooks/k8deploy-main.yml b/playbooks/k8deploy-main.yml
index 0df347a..d15b09f 100644
--- a/playbooks/k8deploy-main.yml
+++ b/playbooks/k8deploy-main.yml
@@ -6,22 +6,22 @@
   tasks:
 
     - name: execute mvn command for shopfront
-      shell: /opt/maven/apache-maven-3.8.8/bin/mvn clean package
-      register: output
+      shell: /opt/maven/apache-maven-3.8.8/bin/mvn clean
+      register: shop_output
       args:
         chdir: ../shopfront
-      when: mvn == "shop" or mvn == "allapps"
-
-    - debug: var="output"  
+      when: mvn == "shop" or mvn == "allapps" 
 
     - name: execute mvn command for productcatalogue
-      command: /opt/maven/apache-maven-3.8.8/bin/mvn clean package
+      command: /opt/maven/apache-maven-3.8.8/bin/mvn clean
+      register: product_output
       args:
         chdir: ../productcatalogue
       when: mvn == "product" or mvn == "allapps"
 
     - name: execute mvn command for stockmanager
-      command: /opt/maven/apache-maven-3.8.8/bin/mvn clean package
+      command: /opt/maven/apache-maven-3.8.8/bin/mvn clean
+      register: stock_output
       args:
         chdir: ../stockmanager
       when: mvn == "stock" or mvn == "allapps"
\ No newline at end of file

From 93aab9501c8a24a71685ba2d90417b768f65bfdf Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sun, 5 Nov 2023 20:48:22 +0400
Subject: [PATCH 37/58] asf

---
 inventory/k8-inventory      | 2 +-
 jenkinsfiles/deployk8       | 2 +-
 playbooks/k8deploy-main.yml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/inventory/k8-inventory b/inventory/k8-inventory
index 63b5e73..f619db1 100644
--- a/inventory/k8-inventory
+++ b/inventory/k8-inventory
@@ -2,4 +2,4 @@
 192.168.0.112 ansible_user=jits ansible_ssh_pass=redhat
 
 [localhost]
-localhost
\ No newline at end of file
+192.168.0.112
\ No newline at end of file
diff --git a/jenkinsfiles/deployk8 b/jenkinsfiles/deployk8
index a9bde25..253b0d7 100644
--- a/jenkinsfiles/deployk8
+++ b/jenkinsfiles/deployk8
@@ -21,7 +21,7 @@ node {
     stage('Execute Ansible Playbooks on Kubernetes Master') {
         ansiblePlaybook(
             playbook: "playbooks/k8deploy-main.yml",
-            extras: "-e mvn=${mvn}"
+            extras: "-i inventory/k8-inventory -e target_host=${comp} -e mvn=${mvn}"
         )
     }
 }
\ No newline at end of file
diff --git a/playbooks/k8deploy-main.yml b/playbooks/k8deploy-main.yml
index d15b09f..671c88d 100644
--- a/playbooks/k8deploy-main.yml
+++ b/playbooks/k8deploy-main.yml
@@ -1,4 +1,4 @@
-- hosts: localhost
+- hosts: "{{ target_host }}"
   gather_facts: false
   #become: yes
   #become_method: sudo

From 0fffe11d5ccf4c8e128bce0c261b166ae08db3e0 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sun, 5 Nov 2023 20:55:42 +0400
Subject: [PATCH 38/58] fv

---
 jenkinsfiles/deployk8       | 2 ++
 playbooks/k8deploy-main.yml | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/jenkinsfiles/deployk8 b/jenkinsfiles/deployk8
index 253b0d7..2123e5a 100644
--- a/jenkinsfiles/deployk8
+++ b/jenkinsfiles/deployk8
@@ -10,6 +10,8 @@ properties([
 node {
     cleanWs()
 
+    echo "The workspace directory is ${env.WORKSPACE}"
+
     stage('Git Checkout') {
         git branch: "${params.BRANCH}", credentialsId: 'myjenkins', url: 'git@github.com:pjitss/docker-Java-kubernetes-project.git'
     }
diff --git a/playbooks/k8deploy-main.yml b/playbooks/k8deploy-main.yml
index 671c88d..e037d82 100644
--- a/playbooks/k8deploy-main.yml
+++ b/playbooks/k8deploy-main.yml
@@ -9,7 +9,7 @@
       shell: /opt/maven/apache-maven-3.8.8/bin/mvn clean
       register: shop_output
       args:
-        chdir: ../shopfront
+        chdir: "{{ lookup('env', 'WORKSPACE') }}/shopfront"
       when: mvn == "shop" or mvn == "allapps" 
 
     - name: execute mvn command for productcatalogue

From fefc25c54bc4c8d86d1fe41fe86f19e3b31eadc9 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sun, 5 Nov 2023 20:57:01 +0400
Subject: [PATCH 39/58] sv

---
 playbooks/k8deploy-main.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/playbooks/k8deploy-main.yml b/playbooks/k8deploy-main.yml
index e037d82..ddd8510 100644
--- a/playbooks/k8deploy-main.yml
+++ b/playbooks/k8deploy-main.yml
@@ -16,12 +16,12 @@
       command: /opt/maven/apache-maven-3.8.8/bin/mvn clean
       register: product_output
       args:
-        chdir: ../productcatalogue
+        chdir: "{{ lookup('env', 'WORKSPACE') }}/productcatalogue
       when: mvn == "product" or mvn == "allapps"
 
     - name: execute mvn command for stockmanager
       command: /opt/maven/apache-maven-3.8.8/bin/mvn clean
       register: stock_output
       args:
-        chdir: ../stockmanager
+        chdir: "{{ lookup('env', 'WORKSPACE') }}/stockmanager
       when: mvn == "stock" or mvn == "allapps"
\ No newline at end of file

From f11f50fcde7016f7386e9566710cf0caae37b0e7 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sun, 5 Nov 2023 20:59:51 +0400
Subject: [PATCH 40/58] v

---
 playbooks/k8deploy-main.yml | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/playbooks/k8deploy-main.yml b/playbooks/k8deploy-main.yml
index ddd8510..ae8485e 100644
--- a/playbooks/k8deploy-main.yml
+++ b/playbooks/k8deploy-main.yml
@@ -16,12 +16,19 @@
       command: /opt/maven/apache-maven-3.8.8/bin/mvn clean
       register: product_output
       args:
-        chdir: "{{ lookup('env', 'WORKSPACE') }}/productcatalogue
+        chdir: "{{ lookup('env', 'WORKSPACE') }}/productcatalogue"
       when: mvn == "product" or mvn == "allapps"
 
     - name: execute mvn command for stockmanager
       command: /opt/maven/apache-maven-3.8.8/bin/mvn clean
       register: stock_output
       args:
-        chdir: "{{ lookup('env', 'WORKSPACE') }}/stockmanager
-      when: mvn == "stock" or mvn == "allapps"
\ No newline at end of file
+        chdir: "{{ lookup('env', 'WORKSPACE') }}/stockmanager"
+      when: mvn == "stock" or mvn == "allapps"
+
+    - name: Print all mvn outputs
+      debug:
+        msg: |
+          Shopfront output: {{ shop_output.stdout | default('Not executed') }}
+          Product Catalogue output: {{ product_output.stdout | default('Not executed') }}
+          Stock Manager output: {{ stock_output.stdout | default('Not executed') }}
\ No newline at end of file

From bb9116b41e4ddcccd49cc6ef5c839b3bc6f19a66 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sun, 5 Nov 2023 21:09:16 +0400
Subject: [PATCH 41/58] dvd

---
 playbooks/k8deploy-main.yml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/playbooks/k8deploy-main.yml b/playbooks/k8deploy-main.yml
index ae8485e..9c355df 100644
--- a/playbooks/k8deploy-main.yml
+++ b/playbooks/k8deploy-main.yml
@@ -6,29 +6,29 @@
   tasks:
 
     - name: execute mvn command for shopfront
-      shell: /opt/maven/apache-maven-3.8.8/bin/mvn clean
-      register: shop_output
+      shell: /opt/maven/apache-maven-3.8.8/bin/mvn clean install
+      #register: shop_output
       args:
         chdir: "{{ lookup('env', 'WORKSPACE') }}/shopfront"
       when: mvn == "shop" or mvn == "allapps" 
 
     - name: execute mvn command for productcatalogue
-      command: /opt/maven/apache-maven-3.8.8/bin/mvn clean
-      register: product_output
+      command: /opt/maven/apache-maven-3.8.8/bin/mvn clean install
+      #register: product_output
       args:
         chdir: "{{ lookup('env', 'WORKSPACE') }}/productcatalogue"
       when: mvn == "product" or mvn == "allapps"
 
     - name: execute mvn command for stockmanager
-      command: /opt/maven/apache-maven-3.8.8/bin/mvn clean
-      register: stock_output
+      command: /opt/maven/apache-maven-3.8.8/bin/mvn clean install
+      #register: stock_output
       args:
         chdir: "{{ lookup('env', 'WORKSPACE') }}/stockmanager"
       when: mvn == "stock" or mvn == "allapps"
 
-    - name: Print all mvn outputs
-      debug:
-        msg: |
-          Shopfront output: {{ shop_output.stdout | default('Not executed') }}
-          Product Catalogue output: {{ product_output.stdout | default('Not executed') }}
-          Stock Manager output: {{ stock_output.stdout | default('Not executed') }}
\ No newline at end of file
+    #- name: Print all mvn outputs
+    #  debug:
+    #    msg: |
+    #      Shopfront output: {{ shop_output.stdout | default('Not executed') }}
+    #      Product Catalogue output: {{ product_output.stdout | default('Not executed') }}
+    #      Stock Manager output: {{ stock_output.stdout | default('Not executed') }}
\ No newline at end of file

From 4766032cdcbfc689e36b21240eeb404732ab8b54 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sun, 5 Nov 2023 21:17:36 +0400
Subject: [PATCH 42/58] vz

---
 playbooks/k8deploy-main.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/playbooks/k8deploy-main.yml b/playbooks/k8deploy-main.yml
index 9c355df..6d2eb76 100644
--- a/playbooks/k8deploy-main.yml
+++ b/playbooks/k8deploy-main.yml
@@ -5,6 +5,16 @@
   #become_user: jits
   tasks:
 
+    - name: Ensure jenkins owns the workspace directory
+      file:
+        path: "/var/lib/jenkins/workspace/cicd-k8/shopfrontss"
+        state: directory
+        owner: jenkins
+        group: jenkins
+        recurse: yes
+      become: yes
+      when: mvn == "prm"
+
     - name: execute mvn command for shopfront
       shell: /opt/maven/apache-maven-3.8.8/bin/mvn clean install
       #register: shop_output

From 0c7c91e279daa0bf1fe23ec28461f8d33bc2976d Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sun, 5 Nov 2023 21:19:24 +0400
Subject: [PATCH 43/58] vvs

---
 playbooks/k8deploy-main.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/playbooks/k8deploy-main.yml b/playbooks/k8deploy-main.yml
index 6d2eb76..520fa06 100644
--- a/playbooks/k8deploy-main.yml
+++ b/playbooks/k8deploy-main.yml
@@ -20,7 +20,8 @@
       #register: shop_output
       args:
         chdir: "{{ lookup('env', 'WORKSPACE') }}/shopfront"
-      when: mvn == "shop" or mvn == "allapps" 
+      when: mvn == "shop" or mvn == "allapps"
+      become: yes 
 
     - name: execute mvn command for productcatalogue
       command: /opt/maven/apache-maven-3.8.8/bin/mvn clean install

From ad7541b6d3a27a99901b12180f9c1638f2c0fe82 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sun, 5 Nov 2023 21:23:12 +0400
Subject: [PATCH 44/58] df

---
 playbooks/k8deploy-main.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/playbooks/k8deploy-main.yml b/playbooks/k8deploy-main.yml
index 520fa06..d4f3d35 100644
--- a/playbooks/k8deploy-main.yml
+++ b/playbooks/k8deploy-main.yml
@@ -29,6 +29,7 @@
       args:
         chdir: "{{ lookup('env', 'WORKSPACE') }}/productcatalogue"
       when: mvn == "product" or mvn == "allapps"
+      become: yes
 
     - name: execute mvn command for stockmanager
       command: /opt/maven/apache-maven-3.8.8/bin/mvn clean install
@@ -36,6 +37,7 @@
       args:
         chdir: "{{ lookup('env', 'WORKSPACE') }}/stockmanager"
       when: mvn == "stock" or mvn == "allapps"
+      become: yes
 
     #- name: Print all mvn outputs
     #  debug:

From 10092e31cbc34a3d3399d88d5b2da1f4ebd4adec Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sun, 5 Nov 2023 21:23:37 +0400
Subject: [PATCH 45/58] zvc

---
 playbooks/k8deploy-main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/playbooks/k8deploy-main.yml b/playbooks/k8deploy-main.yml
index d4f3d35..426b7b1 100644
--- a/playbooks/k8deploy-main.yml
+++ b/playbooks/k8deploy-main.yml
@@ -20,7 +20,7 @@
       #register: shop_output
       args:
         chdir: "{{ lookup('env', 'WORKSPACE') }}/shopfront"
-      when: mvn == "shop" or mvn == "allapps"
+      when: mvn == "shop" or mvn == "allapps_"
       become: yes 
 
     - name: execute mvn command for productcatalogue

From 2b02a73d48cffe6b2763f2e3a3dbce7e6fbfa97d Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sun, 5 Nov 2023 21:34:17 +0400
Subject: [PATCH 46/58] zcv

---
 playbooks/k8deploy-main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/playbooks/k8deploy-main.yml b/playbooks/k8deploy-main.yml
index 426b7b1..d4f3d35 100644
--- a/playbooks/k8deploy-main.yml
+++ b/playbooks/k8deploy-main.yml
@@ -20,7 +20,7 @@
       #register: shop_output
       args:
         chdir: "{{ lookup('env', 'WORKSPACE') }}/shopfront"
-      when: mvn == "shop" or mvn == "allapps_"
+      when: mvn == "shop" or mvn == "allapps"
       become: yes 
 
     - name: execute mvn command for productcatalogue

From d798092f9e4f1616ed2fd68b5be4cc28e8925a64 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sun, 5 Nov 2023 22:39:21 +0400
Subject: [PATCH 47/58] va

---
 playbooks/k8deploy-main.yml | 50 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 49 insertions(+), 1 deletion(-)

diff --git a/playbooks/k8deploy-main.yml b/playbooks/k8deploy-main.yml
index d4f3d35..8794fee 100644
--- a/playbooks/k8deploy-main.yml
+++ b/playbooks/k8deploy-main.yml
@@ -44,4 +44,52 @@
     #    msg: |
     #      Shopfront output: {{ shop_output.stdout | default('Not executed') }}
     #      Product Catalogue output: {{ product_output.stdout | default('Not executed') }}
-    #      Stock Manager output: {{ stock_output.stdout | default('Not executed') }}
\ No newline at end of file
+    #      Stock Manager output: {{ stock_output.stdout | default('Not executed') }}
+
+    - name: Build Docker image for shopfront
+      docker_image:
+        build:
+          path: "{{ lookup('env', 'WORKSPACE') }}/shopfront"
+          tag: "jitss/shopfront:1.1"
+        source: build
+      when: mvn == "shop" or mvn == "alldocker"
+      become: yes
+
+    - name: Push Docker image to registry
+      docker_image:
+        name: "jitss/shopfront:1.1"
+        push: yes
+      when: mvn == "shop" or mvn == "alldocker"
+      become: yes
+
+    - name: Build Docker image for productcatalogue
+      docker_image:
+        build:
+          path: "{{ lookup('env', 'WORKSPACE') }}/productcatalogue"
+          tag: "jitss/productcatalogue:1.1"
+        source: build
+      when: mvn == "shop" or mvn == "alldocker"
+      become: yes
+
+    - name: Push Docker image to registry
+      docker_image:
+        name: "jitss/productcatalogue:1.1"
+        push: yes
+      when: mvn == "shop" or mvn == "alldocker"
+      become: yes
+
+    - name: Build Docker image for stockmanager
+      docker_image:
+        build:
+          path: "{{ lookup('env', 'WORKSPACE') }}/stockmanager"
+          tag: "jitss/stockmanager:1.1"
+        source: build
+      when: mvn == "shop" or mvn == "allapps"
+      become: yes
+
+    - name: Push Docker image to registry
+      docker_image:
+        name: "jitss/stockmanager:1.1"
+        push: yes
+      when: mvn == "shop" or mvn == "alldocker"
+      become: yes
\ No newline at end of file

From 35cd1fc156de8687d4429388bb5e90fe0307f97f Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sun, 5 Nov 2023 22:48:02 +0400
Subject: [PATCH 48/58] zvc

---
 playbooks/k8deploy-main.yml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/playbooks/k8deploy-main.yml b/playbooks/k8deploy-main.yml
index 8794fee..e4e74ed 100644
--- a/playbooks/k8deploy-main.yml
+++ b/playbooks/k8deploy-main.yml
@@ -50,7 +50,8 @@
       docker_image:
         build:
           path: "{{ lookup('env', 'WORKSPACE') }}/shopfront"
-          tag: "jitss/shopfront:1.1"
+          name: "jitss/shopfront"
+          tag: "1.1"
         source: build
       when: mvn == "shop" or mvn == "alldocker"
       become: yes
@@ -66,7 +67,8 @@
       docker_image:
         build:
           path: "{{ lookup('env', 'WORKSPACE') }}/productcatalogue"
-          tag: "jitss/productcatalogue:1.1"
+          name: "jitss/productcatalogue"
+          tag: "1.1"
         source: build
       when: mvn == "shop" or mvn == "alldocker"
       become: yes
@@ -82,7 +84,8 @@
       docker_image:
         build:
           path: "{{ lookup('env', 'WORKSPACE') }}/stockmanager"
-          tag: "jitss/stockmanager:1.1"
+          name: "jitss/stockmanager"
+          tag: "1.1"
         source: build
       when: mvn == "shop" or mvn == "allapps"
       become: yes

From 93530a7f8a08115e66d5171166723c89a3b4f68e Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sun, 5 Nov 2023 23:03:04 +0400
Subject: [PATCH 49/58] afd

---
 playbooks/k8deploy-main.yml | 49 +++++++++----------------------------
 1 file changed, 11 insertions(+), 38 deletions(-)

diff --git a/playbooks/k8deploy-main.yml b/playbooks/k8deploy-main.yml
index e4e74ed..bc03479 100644
--- a/playbooks/k8deploy-main.yml
+++ b/playbooks/k8deploy-main.yml
@@ -46,53 +46,26 @@
     #      Product Catalogue output: {{ product_output.stdout | default('Not executed') }}
     #      Stock Manager output: {{ stock_output.stdout | default('Not executed') }}
 
-    - name: Build Docker image for shopfront
-      docker_image:
+    - name: Build and Push Docker image for shopfront
+      community.docker.docker_image:
+        name: "jitss/shopfront:1.1"
         build:
           path: "{{ lookup('env', 'WORKSPACE') }}/shopfront"
-          name: "jitss/shopfront"
-          tag: "1.1"
-        source: build
-      when: mvn == "shop" or mvn == "alldocker"
-      become: yes
-
-    - name: Push Docker image to registry
-      docker_image:
-        name: "jitss/shopfront:1.1"
         push: yes
       when: mvn == "shop" or mvn == "alldocker"
-      become: yes
 
-    - name: Build Docker image for productcatalogue
-      docker_image:
+    - name: Build and Push Docker image for productcatalogue
+      community.docker.docker_image:
+        name: "jitss/productcatalogue:1.1"
         build:
           path: "{{ lookup('env', 'WORKSPACE') }}/productcatalogue"
-          name: "jitss/productcatalogue"
-          tag: "1.1"
-        source: build
-      when: mvn == "shop" or mvn == "alldocker"
-      become: yes
-
-    - name: Push Docker image to registry
-      docker_image:
-        name: "jitss/productcatalogue:1.1"
         push: yes
-      when: mvn == "shop" or mvn == "alldocker"
-      become: yes
+      when: mvn == "product" or mvn == "alldocker"
 
-    - name: Build Docker image for stockmanager
-      docker_image:
+    - name: Build and Push Docker image for stockmanager
+      community.docker.docker_image:
+        name: "jitss/productcatalogue:1.1"
         build:
           path: "{{ lookup('env', 'WORKSPACE') }}/stockmanager"
-          name: "jitss/stockmanager"
-          tag: "1.1"
-        source: build
-      when: mvn == "shop" or mvn == "allapps"
-      become: yes
-
-    - name: Push Docker image to registry
-      docker_image:
-        name: "jitss/stockmanager:1.1"
         push: yes
-      when: mvn == "shop" or mvn == "alldocker"
-      become: yes
\ No newline at end of file
+      when: mvn == "product" or mvn == "alldocker"
\ No newline at end of file

From 713863d15b2ad47f674d4849397940025a74a070 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sun, 5 Nov 2023 23:04:20 +0400
Subject: [PATCH 50/58] fv

---
 playbooks/k8deploy-main.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/playbooks/k8deploy-main.yml b/playbooks/k8deploy-main.yml
index bc03479..0ea2a32 100644
--- a/playbooks/k8deploy-main.yml
+++ b/playbooks/k8deploy-main.yml
@@ -47,7 +47,7 @@
     #      Stock Manager output: {{ stock_output.stdout | default('Not executed') }}
 
     - name: Build and Push Docker image for shopfront
-      community.docker.docker_image:
+      docker_image:
         name: "jitss/shopfront:1.1"
         build:
           path: "{{ lookup('env', 'WORKSPACE') }}/shopfront"
@@ -55,7 +55,7 @@
       when: mvn == "shop" or mvn == "alldocker"
 
     - name: Build and Push Docker image for productcatalogue
-      community.docker.docker_image:
+      docker_image:
         name: "jitss/productcatalogue:1.1"
         build:
           path: "{{ lookup('env', 'WORKSPACE') }}/productcatalogue"
@@ -63,7 +63,7 @@
       when: mvn == "product" or mvn == "alldocker"
 
     - name: Build and Push Docker image for stockmanager
-      community.docker.docker_image:
+      docker_image:
         name: "jitss/productcatalogue:1.1"
         build:
           path: "{{ lookup('env', 'WORKSPACE') }}/stockmanager"

From 75ede11e9a72c96bf0a031b0442ca12e996162a8 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sun, 5 Nov 2023 23:12:53 +0400
Subject: [PATCH 51/58] fD

---
 playbooks/k8deploy-main.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/playbooks/k8deploy-main.yml b/playbooks/k8deploy-main.yml
index 0ea2a32..ea41b3c 100644
--- a/playbooks/k8deploy-main.yml
+++ b/playbooks/k8deploy-main.yml
@@ -52,7 +52,7 @@
         build:
           path: "{{ lookup('env', 'WORKSPACE') }}/shopfront"
         push: yes
-      when: mvn == "shop" or mvn == "alldocker"
+      when: mvn == "shop" or mvn == "allapps"
 
     - name: Build and Push Docker image for productcatalogue
       docker_image:
@@ -60,7 +60,7 @@
         build:
           path: "{{ lookup('env', 'WORKSPACE') }}/productcatalogue"
         push: yes
-      when: mvn == "product" or mvn == "alldocker"
+      when: mvn == "product" or mvn == "allapps"
 
     - name: Build and Push Docker image for stockmanager
       docker_image:
@@ -68,4 +68,4 @@
         build:
           path: "{{ lookup('env', 'WORKSPACE') }}/stockmanager"
         push: yes
-      when: mvn == "product" or mvn == "alldocker"
\ No newline at end of file
+      when: mvn == "product" or mvn == "allapps"
\ No newline at end of file

From a9ade910fdb92755d05fba46073faa66a9a016af Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sun, 12 Nov 2023 12:10:03 +0400
Subject: [PATCH 52/58] D

---
 playbooks/k8deploy-main.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/playbooks/k8deploy-main.yml b/playbooks/k8deploy-main.yml
index ea41b3c..7fd83a2 100644
--- a/playbooks/k8deploy-main.yml
+++ b/playbooks/k8deploy-main.yml
@@ -52,7 +52,7 @@
         build:
           path: "{{ lookup('env', 'WORKSPACE') }}/shopfront"
         push: yes
-      when: mvn == "shop" or mvn == "allapps"
+      when: mvn == "docker"
 
     - name: Build and Push Docker image for productcatalogue
       docker_image:
@@ -60,7 +60,7 @@
         build:
           path: "{{ lookup('env', 'WORKSPACE') }}/productcatalogue"
         push: yes
-      when: mvn == "product" or mvn == "allapps"
+      when: mvn == "docker"
 
     - name: Build and Push Docker image for stockmanager
       docker_image:
@@ -68,4 +68,6 @@
         build:
           path: "{{ lookup('env', 'WORKSPACE') }}/stockmanager"
         push: yes
-      when: mvn == "product" or mvn == "allapps"
\ No newline at end of file
+      when: mvn == "docker"
+
+      
\ No newline at end of file

From 54d7590e6914852969046bafff2650623ebeffeb Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sun, 12 Nov 2023 14:50:22 +0400
Subject: [PATCH 53/58] tg

---
 others/settings.xml_file     | 190 +++++++++++++++++++++++++++++++++++
 productcatalogue/pom.xml     |  17 +++-
 productcatalogue/pom.xml_bkp |  79 +++++++++++++++
 3 files changed, 284 insertions(+), 2 deletions(-)
 create mode 100644 others/settings.xml_file
 create mode 100644 productcatalogue/pom.xml_bkp

diff --git a/others/settings.xml_file b/others/settings.xml_file
new file mode 100644
index 0000000..6c4584e
--- /dev/null
+++ b/others/settings.xml_file
@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<settings xmlns="http://maven.apache.org/SETTINGS/1.2.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.2.0 https://maven.apache.org/xsd/settings-1.2.0.xsd">
+
+    <!-- Licensed to the Apache Software Foundation (ASF) under one... [additional license information] ... -->
+
+    <!-- This is the configuration file for Maven... [additional introductory comments] ... -->
+
+    <!-- localRepository
+     | The path to the local repository maven will use to store artifacts.
+     | Default: ${user.home}/.m2/repository
+    <localRepository>/path/to/local/repo</localRepository>
+    -->
+
+    <!-- interactiveMode
+     | This will determine whether maven prompts you when it needs input.
+     | Default: true
+    <interactiveMode>true</interactiveMode>
+    -->
+
+    <!-- offline
+     | Determines whether maven should attempt to connect to the network when executing a build.
+     | Default: false
+    <offline>false</offline>
+    -->
+
+    <!-- pluginGroups
+     | This is a list of additional group identifiers that will be searched when resolving plugins...
+     | [additional pluginGroups information]
+     -->
+    <pluginGroups>
+        <!-- pluginGroup
+         | Specifies a further group identifier to use for plugin lookup.
+        <pluginGroup>com.your.plugins</pluginGroup>
+        -->
+    </pluginGroups>
+
+    <!-- proxies
+     | This is a list of proxies which can be used on this machine to connect to the network...
+     | [additional proxies information]
+     -->
+    <proxies>
+        <!-- proxy
+         | Specification for one proxy, to be used in connecting to the network.
+         |
+        <proxy>
+          <id>optional</id>
+          <active>true</active>
+          <protocol>http</protocol>
+          <username>proxyuser</username>
+          <password>proxypass</password>
+          <host>proxy.host.net</host>
+          <port>80</port>
+          <nonProxyHosts>local.net|some.host.com</nonProxyHosts>
+        </proxy>
+        -->
+    </proxies>
+
+        <!-- servers
+     | This is a list of authentication profiles...
+     | [additional servers information]
+     -->
+    <servers>
+        <!-- Existing server configurations -->
+        <!-- server
+         | Specifies the authentication information to use when connecting to a particular server...
+         | [additional server configuration information]
+         |
+        <server>
+          <id>deploymentRepo</id>
+          <username>repouser</username>
+          <password>repopwd</password>
+        </server>
+        -->
+
+        <!-- Another sample, using keys to authenticate.
+        <server>
+          <id>siteServer</id>
+          <privateKey>/path/to/private/key</privateKey>
+          <passphrase>optional; leave empty if not used.</passphrase>
+        </server>
+        -->
+
+        <!-- Nexus server configurations -->
+        <server>
+            <id>nexus-releases</id>
+            <username>jitsnexus</username>
+            <password>{9VYKv8N4arIHArUuHxu7j/gKBkgIyAt663MEHi5EDPY=}</password>
+        </server>
+        <server>
+            <id>nexus-snapshots</id>
+            <username>jitsnexus</username>
+            <password>{9VYKv8N4arIHArUuHxu7j/gKBkgIyAt663MEHi5EDPY=}</password>
+        </server>
+    </servers>
+
+    <!-- mirrors
+     | This is a list of mirrors to be used in downloading artifacts from remote repositories...
+     | [additional mirrors information]
+     -->
+    <mirrors>
+        <!-- mirror
+         | Specifies a repository mirror site to use instead of a given repository...
+         | [additional mirror configuration information]
+         |
+        <mirror>
+          <id>mirrorId</id>
+          <mirrorOf>repositoryId</mirrorOf>
+          <name>Human Readable Name for this Mirror.</name>
+          <url>http://my.repository.com/repo/path</url>
+        </mirror>
+         -->
+        <mirror>
+          <id>maven-default-http-blocker</id>
+          <mirrorOf>external:http:*</mirrorOf>
+          <name>Pseudo repository to mirror external repositories initially using HTTP.</name>
+          <url>http://0.0.0.0/</url>
+          <blocked>true</blocked>
+        </mirror>
+    </mirrors>
+
+        <!-- profiles
+     | This is a list of profiles which can be activated in a variety of ways...
+     | [additional profiles information]
+     -->
+    <profiles>
+        <!-- Existing profiles configuration -->
+        <!-- profile
+         | Specifies a set of introductions to the build process...
+         | [additional profile configuration information]
+         |
+         <profile>
+           <id>jdk-1.4</id>
+           <activation>
+             <jdk>1.4</jdk>
+           </activation>
+           <repositories>
+             <repository>
+               <id>jdk14</id>
+               <name>Repository for JDK 1.4 builds</name>
+               <url>http://www.myhost.com/maven/jdk14</url>
+               <layout>default</layout>
+               <snapshotPolicy>always</snapshotPolicy>
+             </repository>
+           </repositories>
+         </profile>
+        -->
+
+        <!-- Nexus Repository Profile -->
+        <profile>
+            <id>nexus</id>
+            <repositories>
+                <repository>
+                    <id>nexus-releases</id>
+                    <url>http://192.168.0.190:8081/repository/maven-releases/</url>
+                    <releases><enabled>true</enabled></releases>
+                    <snapshots><enabled>false</enabled></snapshots>
+                </repository>
+                <repository>
+                    <id>nexus-snapshots</id>
+                    <url>http://192.168.0.190:8081/repository/maven-snapshots/</url>
+                    <snapshots><enabled>true</enabled></snapshots>
+                    <releases><enabled>false</enabled></releases>
+                </repository>
+            </repositories>
+            <pluginRepositories>
+                <pluginRepository>
+                    <id>nexus</id>
+                    <url>http://102.168.0.190:8081/repository/maven-public/</url>
+                    <releases><enabled>true</enabled></releases>
+                    <snapshots><enabled>true</enabled></snapshots>
+                </pluginRepository>
+            </pluginRepositories>
+        </profile>
+    </profiles>
+
+    <!-- activeProfiles
+     | List of profiles that are active for all builds.
+     | [additional activeProfiles information]
+     -->
+    <activeProfiles>
+        <!-- Existing active profile configurations -->
+        <activeProfile>alwaysActiveProfile</activeProfile>
+        <activeProfile>anotherAlwaysActiveProfile</activeProfile>
+
+        <!-- Activating Nexus profile -->
+        <activeProfile>nexus</activeProfile>
+    </activeProfiles>
+</settings>
diff --git a/productcatalogue/pom.xml b/productcatalogue/pom.xml
index 14b6206..8e9f359 100644
--- a/productcatalogue/pom.xml
+++ b/productcatalogue/pom.xml
@@ -25,9 +25,9 @@
             <artifactId>guice</artifactId>
             <version>${guice.version}</version>
         </dependency>
+        <!-- Add more dependencies as needed -->
     </dependencies>
 
-
     <build>
         <plugins>
             <plugin>
@@ -76,4 +76,17 @@
             </plugin>
         </plugins>
     </build>
-</project>
+
+    <!-- DistributionManagement for Nexus -->
+    <distributionManagement>
+        <repository>
+            <id>nexus-releases</id> <!-- Match this with the ID in your settings.xml -->
+            <url>http://192.168.0.190:8081/repository/maven-releases/</url> <!-- Replace with your Nexus release repository URL -->
+        </repository>
+        <snapshotRepository>
+            <id>nexus-snapshots</id> <!-- Match this with the ID in your settings.xml -->
+            <url>http://192.168.0.190:8081/repository/maven-snapshots/</url> <!-- Replace with your Nexus snapshot repository URL -->
+        </snapshotRepository>
+    </distributionManagement>
+
+</project>
\ No newline at end of file
diff --git a/productcatalogue/pom.xml_bkp b/productcatalogue/pom.xml_bkp
new file mode 100644
index 0000000..14b6206
--- /dev/null
+++ b/productcatalogue/pom.xml_bkp
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>uk.co.danielbryant.djshopping</groupId>
+    <artifactId>productcatalogue</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <dropwizard.version>1.3.27</dropwizard.version>
+        <guice.version>4.2.3</guice.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.dropwizard</groupId>
+            <artifactId>dropwizard-core</artifactId>
+            <version>${dropwizard.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
+            <version>${guice.version}</version>
+        </dependency>
+    </dependencies>
+
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>1.6</version>
+                <configuration>
+                    <createDependencyReducedPom>true</createDependencyReducedPom>
+                    <filters>
+                        <filter>
+                            <artifact>*:*</artifact>
+                            <excludes>
+                                <exclude>META-INF/*.SF</exclude>
+                                <exclude>META-INF/*.DSA</exclude>
+                                <exclude>META-INF/*.RSA</exclude>
+                            </excludes>
+                        </filter>
+                    </filters>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <transformers>
+                                <transformer
+                                        implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+                                <transformer
+                                        implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                    <mainClass>uk.co.danielbryant.djshopping.productcatalogue.ProductServiceApplication</mainClass>
+                                </transformer>
+                            </transformers>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

From bbdb6d5baf188db032359a33561cab07cd525a61 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sun, 12 Nov 2023 14:54:38 +0400
Subject: [PATCH 54/58] sg

---
 playbooks/k8deploy-main.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/playbooks/k8deploy-main.yml b/playbooks/k8deploy-main.yml
index 7fd83a2..8827342 100644
--- a/playbooks/k8deploy-main.yml
+++ b/playbooks/k8deploy-main.yml
@@ -24,7 +24,7 @@
       become: yes 
 
     - name: execute mvn command for productcatalogue
-      command: /opt/maven/apache-maven-3.8.8/bin/mvn clean install
+      command: /opt/maven/apache-maven-3.8.8/bin/mvn clean deploy
       #register: product_output
       args:
         chdir: "{{ lookup('env', 'WORKSPACE') }}/productcatalogue"
@@ -70,4 +70,3 @@
         push: yes
       when: mvn == "docker"
 
-      
\ No newline at end of file

From 9fb71cbc715f66b5c9d1b1e00d4a19861efc5ef9 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Mon, 13 Nov 2023 18:53:25 +0400
Subject: [PATCH 55/58] pom update

---
 shopfront/pom.xml    | 13 +++++++++++++
 stockmanager/pom.xml | 13 +++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/shopfront/pom.xml b/shopfront/pom.xml
index 1535a9a..c3db46a 100644
--- a/shopfront/pom.xml
+++ b/shopfront/pom.xml
@@ -73,4 +73,17 @@
         </plugins>
 
     </build>
+
+    <!-- DistributionManagement for Nexus -->
+    <distributionManagement>
+        <repository>
+            <id>nexus-releases</id> <!-- Match this with the ID in your settings.xml -->
+            <url>http://192.168.0.190:8081/repository/maven-releases/</url> <!-- Replace with your Nexus release repository URL -->
+        </repository>
+        <snapshotRepository>
+            <id>nexus-snapshots</id> <!-- Match this with the ID in your settings.xml -->
+            <url>http://192.168.0.190:8081/repository/maven-snapshots/</url> <!-- Replace with your Nexus snapshot repository URL -->
+        </snapshotRepository>
+    </distributionManagement>
+
 </project>
diff --git a/stockmanager/pom.xml b/stockmanager/pom.xml
index ca2beaf..42945cb 100644
--- a/stockmanager/pom.xml
+++ b/stockmanager/pom.xml
@@ -82,4 +82,17 @@
             </plugin>
         </plugins>
     </build>
+
+    <!-- DistributionManagement for Nexus -->
+    <distributionManagement>
+        <repository>
+            <id>nexus-releases</id> <!-- Match this with the ID in your settings.xml -->
+            <url>http://192.168.0.190:8081/repository/maven-releases/</url> <!-- Replace with your Nexus release repository URL -->
+        </repository>
+        <snapshotRepository>
+            <id>nexus-snapshots</id> <!-- Match this with the ID in your settings.xml -->
+            <url>http://192.168.0.190:8081/repository/maven-snapshots/</url> <!-- Replace with your Nexus snapshot repository URL -->
+        </snapshotRepository>
+    </distributionManagement>
+
 </project>

From a5d6b0aa604c460ca5150cb7a14d95d3df1b9379 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Mon, 13 Nov 2023 19:22:16 +0400
Subject: [PATCH 56/58] fd

---
 playbooks/k8deploy-main.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/playbooks/k8deploy-main.yml b/playbooks/k8deploy-main.yml
index 8827342..c8aba9f 100644
--- a/playbooks/k8deploy-main.yml
+++ b/playbooks/k8deploy-main.yml
@@ -16,7 +16,7 @@
       when: mvn == "prm"
 
     - name: execute mvn command for shopfront
-      shell: /opt/maven/apache-maven-3.8.8/bin/mvn clean install
+      shell: /opt/maven/apache-maven-3.8.8/bin/mvn clean deploy
       #register: shop_output
       args:
         chdir: "{{ lookup('env', 'WORKSPACE') }}/shopfront"
@@ -32,7 +32,7 @@
       become: yes
 
     - name: execute mvn command for stockmanager
-      command: /opt/maven/apache-maven-3.8.8/bin/mvn clean install
+      command: /opt/maven/apache-maven-3.8.8/bin/mvn clean deploy
       #register: stock_output
       args:
         chdir: "{{ lookup('env', 'WORKSPACE') }}/stockmanager"

From 8b1ca551a4045be282e1f6e22b39233b5491a4d1 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Mon, 13 Nov 2023 20:39:53 +0400
Subject: [PATCH 57/58] ds

---
 jenkinsfiles/deployk8 | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/jenkinsfiles/deployk8 b/jenkinsfiles/deployk8
index 2123e5a..765ae9f 100644
--- a/jenkinsfiles/deployk8
+++ b/jenkinsfiles/deployk8
@@ -16,10 +16,19 @@ node {
         git branch: "${params.BRANCH}", credentialsId: 'myjenkins', url: 'git@github.com:pjitss/docker-Java-kubernetes-project.git'
     }
 
-    //stage('setting maven path') {
-        // Ensure the tool 'Maven' is configured in Jenkins Global Tool Configuration
-    //    def mvnHome = tool 'maven'
-    //}
+    stage('SonarQube Analysis') {
+        withCredentials([string(credentialsId: 'mysonar2', variable: 'SONAR_TOKEN')]) {
+            withSonarQubeEnv('mysonar') {
+            sh """
+               mvn clean verify sonar:sonar \
+               -Dsonar.projectKey=mysonar2 \
+               -Dsonar.host.url=http://192.168.0.190:9000 \
+               -Dsonar.login=$SONAR_TOKEN
+            """
+            }
+        }
+    }
+
     stage('Execute Ansible Playbooks on Kubernetes Master') {
         ansiblePlaybook(
             playbook: "playbooks/k8deploy-main.yml",

From 79caeddbd8ab412eb6609d7c0f9b5fbf42954ab9 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Tue, 2 Jan 2024 21:25:13 +0400
Subject: [PATCH 58/58] kn

---
 jenkinsfiles/deployk8 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/jenkinsfiles/deployk8 b/jenkinsfiles/deployk8
index 765ae9f..051a029 100644
--- a/jenkinsfiles/deployk8
+++ b/jenkinsfiles/deployk8
@@ -16,6 +16,8 @@ node {
         git branch: "${params.BRANCH}", credentialsId: 'myjenkins', url: 'git@github.com:pjitss/docker-Java-kubernetes-project.git'
     }
 
+    
+
     stage('SonarQube Analysis') {
         withCredentials([string(credentialsId: 'mysonar2', variable: 'SONAR_TOKEN')]) {
             withSonarQubeEnv('mysonar') {