From 81066f32c16704bb7376c97d19bd2ddf79a91869 Mon Sep 17 00:00:00 2001
From: emile bergin <berginemile098@gmail.com>
Date: Tue, 2 Feb 2021 13:31:47 +0100
Subject: [PATCH 01/19] init travis

---
 .travis.yml                                                   | 0
 sample-application-backend/src/main/resources/application.yml | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 00000000..e69de29b
diff --git a/sample-application-backend/src/main/resources/application.yml b/sample-application-backend/src/main/resources/application.yml
index f30d1f70..d2e8a543 100644
--- a/sample-application-backend/src/main/resources/application.yml
+++ b/sample-application-backend/src/main/resources/application.yml
@@ -18,4 +18,4 @@ management:
     web:
       base-path: /api/actuator
       exposure:
-        include: health,info,env,metrics,beans,configprops,prometheus
\ No newline at end of file
+        include: health,info,env,metrics,beans,configprops,prometheus

From af7b38d3a1816e79003daa98cd1498eba3edd5a7 Mon Sep 17 00:00:00 2001
From: emile bergin <berginemile098@gmail.com>
Date: Tue, 2 Feb 2021 13:38:49 +0100
Subject: [PATCH 02/19] modify travis

---
 .travis.yml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index e69de29b..43ee62d9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -0,0 +1,18 @@
+git:
+  depth: 5
+jobs:
+  include:
+    - stage: "Build and Test Java"
+      language: java
+      jdk: oraclejdk11
+      before_script:
+        - cd sample-application-backend
+    - stage: "Build and Test Nodejs"
+      language: node.js
+      node_js: "12.20"
+      before_script:
+        - cd sample-application-frontend
+cache:
+  directories:
+    - "$HOME/.m2/repository"
+    - "$HOME/.npm"

From 88c967e9d578ad4a48b8bb5b59d55a68917d90a9 Mon Sep 17 00:00:00 2001
From: emile bergin <berginemile098@gmail.com>
Date: Tue, 2 Feb 2021 14:03:36 +0100
Subject: [PATCH 03/19] travis maj

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 43ee62d9..3a8fb9d6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,8 @@ jobs:
       jdk: oraclejdk11
       before_script:
         - cd sample-application-backend
+      script:
+        - ./mvn clean install
     - stage: "Build and Test Nodejs"
       language: node.js
       node_js: "12.20"

From df8a7da094a12af6c7a5132e257c3f32ff078c6b Mon Sep 17 00:00:00 2001
From: emile bergin <berginemile098@gmail.com>
Date: Tue, 2 Feb 2021 14:05:05 +0100
Subject: [PATCH 04/19] travis maj

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 3a8fb9d6..55d2ee6f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ jobs:
       before_script:
         - cd sample-application-backend
       script:
-        - ./mvn clean install
+        - mvn clean install
     - stage: "Build and Test Nodejs"
       language: node.js
       node_js: "12.20"

From 5a56cc95e546db79f30b9ebbc1e0556e9d47f7d5 Mon Sep 17 00:00:00 2001
From: emile bergin <berginemile098@gmail.com>
Date: Tue, 2 Feb 2021 14:08:54 +0100
Subject: [PATCH 05/19] travis maj

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 55d2ee6f..e0ac9b67 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,6 +14,8 @@ jobs:
       node_js: "12.20"
       before_script:
         - cd sample-application-frontend
+      script:
+        - npm run test
 cache:
   directories:
     - "$HOME/.m2/repository"

From 4fe04ca480f74f091baf57bc9035eab1ee223f65 Mon Sep 17 00:00:00 2001
From: emile bergin <berginemile098@gmail.com>
Date: Tue, 2 Feb 2021 14:30:54 +0100
Subject: [PATCH 06/19] travis maj

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index e0ac9b67..76fe6f03 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,3 +20,4 @@ cache:
   directories:
     - "$HOME/.m2/repository"
     - "$HOME/.npm"
+

From b845ae96ce977592b5681db4e94fa5da0967165a Mon Sep 17 00:00:00 2001
From: emile bergin <berginemile098@gmail.com>
Date: Tue, 2 Feb 2021 14:42:48 +0100
Subject: [PATCH 07/19] travis maj

---
 .travis.yml | 37 ++++++++++++++++++++++++++++++++++---
 1 file changed, 34 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 76fe6f03..7071ef01 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,23 +1,54 @@
 git:
   depth: 5
+stages:
+  - "Build and Test"
+  - "Package"
+
 jobs:
   include:
-    - stage: "Build and Test Java"
+    - stage: "Build and Test"
       language: java
       jdk: oraclejdk11
       before_script:
         - cd sample-application-backend
       script:
+        - echo "Maven build"
         - mvn clean install
-    - stage: "Build and Test Nodejs"
+        - echo "Run test coverage and Quality Gate"
+        - mvn test
+    - stage: "Build and Test"
       language: node.js
       node_js: "12.20"
       before_script:
         - cd sample-application-frontend
       script:
+        - echo "NPM install and build"
+        - npm install
+        - npm run build
         - npm run test
+    - stage: "Package"
+      before_script:
+        - cd sample-application-backend
+      script:
+        - echo "Docker build ..."
+        - docker-compose build
+        - echo "Docker login ..."
+        - echo "$DOCKER_HUB_Password" | docker login -u "$DOCKER_HUB_Username" --password-stdin
+        - echo "Docker push ..."
+        - docker push trankilemil/tp02
+    - stage: "Package"
+      before_script:
+        - cd sample-application-frontend
+      script:
+        - echo "Docker build ..."
+        - docker-compose build
+        - echo "Docker login ..."
+        - echo "$DOCKER_HUB_Password" | docker login -u "$DOCKER_HUB_Username" --password-stdin
+        - echo "Docker push ..."
+        - docker push trankilemil/tp02
 cache:
   directories:
     - "$HOME/.m2/repository"
     - "$HOME/.npm"
-
+services:
+  - docker

From b3e98e7e9b391e5970a08a52cbaf786304dbff83 Mon Sep 17 00:00:00 2001
From: emile bergin <berginemile098@gmail.com>
Date: Tue, 2 Feb 2021 15:05:26 +0100
Subject: [PATCH 08/19] travis maj

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7071ef01..615afa23 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,7 +35,7 @@ jobs:
         - echo "Docker login ..."
         - echo "$DOCKER_HUB_Password" | docker login -u "$DOCKER_HUB_Username" --password-stdin
         - echo "Docker push ..."
-        - docker push trankilemil/tp02
+        - docker push trankilemil/tp02-java
     - stage: "Package"
       before_script:
         - cd sample-application-frontend
@@ -45,7 +45,7 @@ jobs:
         - echo "Docker login ..."
         - echo "$DOCKER_HUB_Password" | docker login -u "$DOCKER_HUB_Username" --password-stdin
         - echo "Docker push ..."
-        - docker push trankilemil/tp02
+        - docker push trankilemil/tp02-node
 cache:
   directories:
     - "$HOME/.m2/repository"

From 4068595fd67f25cf134e0fd922d7fa0b5b491555 Mon Sep 17 00:00:00 2001
From: Emile-Bergin <61179669+Emile-Bergin@users.noreply.github.com>
Date: Tue, 2 Feb 2021 15:43:02 +0100
Subject: [PATCH 09/19] Update .travis.yml

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 615afa23..60263129 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,7 +31,7 @@ jobs:
         - cd sample-application-backend
       script:
         - echo "Docker build ..."
-        - docker-compose build
+        - docker-compose build -t trankilemil/tp02-java
         - echo "Docker login ..."
         - echo "$DOCKER_HUB_Password" | docker login -u "$DOCKER_HUB_Username" --password-stdin
         - echo "Docker push ..."
@@ -41,7 +41,7 @@ jobs:
         - cd sample-application-frontend
       script:
         - echo "Docker build ..."
-        - docker-compose build
+        - docker-compose build -t trankilemil/tp02-node
         - echo "Docker login ..."
         - echo "$DOCKER_HUB_Password" | docker login -u "$DOCKER_HUB_Username" --password-stdin
         - echo "Docker push ..."

From e2cafdcd402f73f793bcbea69b64f61b72c059ca Mon Sep 17 00:00:00 2001
From: Emile-Bergin <61179669+Emile-Bergin@users.noreply.github.com>
Date: Tue, 2 Feb 2021 15:49:35 +0100
Subject: [PATCH 10/19] Update .travis.yml

---
 .travis.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 60263129..4654a3a9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,21 +31,21 @@ jobs:
         - cd sample-application-backend
       script:
         - echo "Docker build ..."
-        - docker-compose build -t trankilemil/tp02-java
+        - docker-compose build
         - echo "Docker login ..."
         - echo "$DOCKER_HUB_Password" | docker login -u "$DOCKER_HUB_Username" --password-stdin
         - echo "Docker push ..."
-        - docker push trankilemil/tp02-java
+        - docker-compose push
     - stage: "Package"
       before_script:
         - cd sample-application-frontend
       script:
         - echo "Docker build ..."
-        - docker-compose build -t trankilemil/tp02-node
+        - docker-compose build
         - echo "Docker login ..."
         - echo "$DOCKER_HUB_Password" | docker login -u "$DOCKER_HUB_Username" --password-stdin
         - echo "Docker push ..."
-        - docker push trankilemil/tp02-node
+        - docker-compose push
 cache:
   directories:
     - "$HOME/.m2/repository"

From 494ac1c249e5e92039071fe8d1f71bbba7fec907 Mon Sep 17 00:00:00 2001
From: Emile-Bergin <61179669+Emile-Bergin@users.noreply.github.com>
Date: Tue, 2 Feb 2021 15:50:46 +0100
Subject: [PATCH 11/19] Update docker-compose.yml

---
 docker-compose.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docker-compose.yml b/docker-compose.yml
index 482772b1..6d550677 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,6 +3,7 @@ services:
   backend:
     container_name: backend
     build: ./sample-application-backend
+    image: trankilemil/tp02-java
     environment:
       - SPRING_DATASOURCE_URL=jdbc:postgresql://database:5432/SchoolOrganisation
     networks:
@@ -23,6 +24,7 @@ services:
   frontend:
     container_name: frontend
     build: ./sample-application-frontend
+    image: trankilemil/tp02-node
     ports:
       - "80:80"
     networks:

From 35eae7c931a88a69584687e77683e94bedbf5c75 Mon Sep 17 00:00:00 2001
From: Emile-Bergin <61179669+Emile-Bergin@users.noreply.github.com>
Date: Tue, 2 Feb 2021 16:15:42 +0100
Subject: [PATCH 12/19] Update .travis.yml

---
 .travis.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 4654a3a9..098814ff 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,6 +16,7 @@ jobs:
         - mvn clean install
         - echo "Run test coverage and Quality Gate"
         - mvn test
+        - mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent install sonar:sonar -Dsonar.projectKey=Emile-Bergin_sample-application-stud
     - stage: "Build and Test"
       language: node.js
       node_js: "12.20"
@@ -52,3 +53,9 @@ cache:
     - "$HOME/.npm"
 services:
   - docker
+
+addons:
+  sonarcloud:
+    organization: "emile-bergin"
+    token:
+      secure: "X0rZ9lBr9DLqDKZA74S6g/N4TYwvyeqgFFAKzc1wo1Ovm5+7WgBVioM5i+q+qpL3YlQn9tVrEFzVQmdpDcLRCtYiuxz3KSkxSi7OShxcDN2ZWYvm2Q7YAFUksxe10fgzju4ff6YNwfeKg8AggfNb44+bkeObMdSgAmLA8/5LeVdp8YA35o8/9AjpjjVaoYH5xbzrV0eWNrvAtDfgxm3sTBVMeMobwEUdbDcQtHfAQV1w67t0Q8/LxZZBPHYbIx+l5bMNAvrM5SQR+anJycO5sm+sR9fBlppvu2bI1dJS4/wIzXjf3rjmNgPzR032d48k8+La0ovCFKWuypIeFK+H1I+AuyqXCDUpJcUE4h4liY9McaGTFfnUJoQFGbRkqWoDKHb5JjU9kqLlGo6/1rNSq6cxSojxnwIQCYHsHA+sU6dGjY3hjKL2r1MfnvWBW89D4+PQ4dzJXuPmzCmDyLqfh4fYqeTV0V1B040+y5x6A/j5Se+hEFwQqJUsG/+oLkk9sKDI0+KKd8LuGwADKXjttMQSji6E75RTtJlt2B6LB1r5Pl4Ib8xwM0DFrCByYKqfPu74eyq9CKW7PFf0egbaoOiUBwWyoaaH2HFH9+msJpmEKYT6YZ0LYvAD2GUx2wbhiBvttpakQBiTcFVloo4w1I5CBKpP5zkle8TE3Y3B0gw="

From b34697879d6ad29e7a432c3684b8215dcbb18556 Mon Sep 17 00:00:00 2001
From: emile bergin <berginemile098@gmail.com>
Date: Tue, 2 Feb 2021 17:30:10 +0100
Subject: [PATCH 13/19] disable test

---
 .../sampleapplication/IT/DepartmentControllerTestIT.java        | 1 +
 .../training/sampleapplication/IT/StudentControllerTestIT.java  | 1 +
 .../training/sampleapplication/unit/DepartmentsServiceTest.java | 2 +-
 .../training/sampleapplication/unit/StudentsServiceTest.java    | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/sample-application-backend/src/test/java/fr/takima/training/sampleapplication/IT/DepartmentControllerTestIT.java b/sample-application-backend/src/test/java/fr/takima/training/sampleapplication/IT/DepartmentControllerTestIT.java
index d7601061..d4fb2f34 100644
--- a/sample-application-backend/src/test/java/fr/takima/training/sampleapplication/IT/DepartmentControllerTestIT.java
+++ b/sample-application-backend/src/test/java/fr/takima/training/sampleapplication/IT/DepartmentControllerTestIT.java
@@ -17,6 +17,7 @@
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @AutoConfigureMockMvc
 @ExtendWith(SpringExtension.class)
+@Disabled
 public class DepartmentControllerTestIT {
     @Autowired
     private MockMvc mockMvc;
diff --git a/sample-application-backend/src/test/java/fr/takima/training/sampleapplication/IT/StudentControllerTestIT.java b/sample-application-backend/src/test/java/fr/takima/training/sampleapplication/IT/StudentControllerTestIT.java
index d3e01da9..402acf79 100644
--- a/sample-application-backend/src/test/java/fr/takima/training/sampleapplication/IT/StudentControllerTestIT.java
+++ b/sample-application-backend/src/test/java/fr/takima/training/sampleapplication/IT/StudentControllerTestIT.java
@@ -17,6 +17,7 @@
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @AutoConfigureMockMvc
 @ExtendWith(SpringExtension.class)
+@Disabled
 public class StudentControllerTestIT {
 
     @Autowired
diff --git a/sample-application-backend/src/test/java/fr/takima/training/sampleapplication/unit/DepartmentsServiceTest.java b/sample-application-backend/src/test/java/fr/takima/training/sampleapplication/unit/DepartmentsServiceTest.java
index 29d176e0..66131c9f 100644
--- a/sample-application-backend/src/test/java/fr/takima/training/sampleapplication/unit/DepartmentsServiceTest.java
+++ b/sample-application-backend/src/test/java/fr/takima/training/sampleapplication/unit/DepartmentsServiceTest.java
@@ -12,7 +12,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.Mockito.when;
-
+@Disabled
 public class DepartmentsServiceTest {
 
     @InjectMocks
diff --git a/sample-application-backend/src/test/java/fr/takima/training/sampleapplication/unit/StudentsServiceTest.java b/sample-application-backend/src/test/java/fr/takima/training/sampleapplication/unit/StudentsServiceTest.java
index f27f7221..6192a387 100644
--- a/sample-application-backend/src/test/java/fr/takima/training/sampleapplication/unit/StudentsServiceTest.java
+++ b/sample-application-backend/src/test/java/fr/takima/training/sampleapplication/unit/StudentsServiceTest.java
@@ -17,7 +17,7 @@
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.Mockito.when;
-
+@Disabled
 public class StudentsServiceTest {
 
     @InjectMocks

From 449f9c4f140c43febf984cadea2c52092259252e Mon Sep 17 00:00:00 2001
From: emile bergin <berginemile098@gmail.com>
Date: Tue, 2 Feb 2021 17:40:04 +0100
Subject: [PATCH 14/19] test

---
 .../training/sampleapplication/IT/StudentControllerTestIT.java   | 1 -
 .../training/sampleapplication/unit/DepartmentsServiceTest.java  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/sample-application-backend/src/test/java/fr/takima/training/sampleapplication/IT/StudentControllerTestIT.java b/sample-application-backend/src/test/java/fr/takima/training/sampleapplication/IT/StudentControllerTestIT.java
index 402acf79..d3e01da9 100644
--- a/sample-application-backend/src/test/java/fr/takima/training/sampleapplication/IT/StudentControllerTestIT.java
+++ b/sample-application-backend/src/test/java/fr/takima/training/sampleapplication/IT/StudentControllerTestIT.java
@@ -17,7 +17,6 @@
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @AutoConfigureMockMvc
 @ExtendWith(SpringExtension.class)
-@Disabled
 public class StudentControllerTestIT {
 
     @Autowired
diff --git a/sample-application-backend/src/test/java/fr/takima/training/sampleapplication/unit/DepartmentsServiceTest.java b/sample-application-backend/src/test/java/fr/takima/training/sampleapplication/unit/DepartmentsServiceTest.java
index 66131c9f..0350dc4a 100644
--- a/sample-application-backend/src/test/java/fr/takima/training/sampleapplication/unit/DepartmentsServiceTest.java
+++ b/sample-application-backend/src/test/java/fr/takima/training/sampleapplication/unit/DepartmentsServiceTest.java
@@ -12,7 +12,6 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.Mockito.when;
-@Disabled
 public class DepartmentsServiceTest {
 
     @InjectMocks

From 6306655009bb93542188bb903d4311b0b0fe050d Mon Sep 17 00:00:00 2001
From: emile bergin <berginemile098@gmail.com>
Date: Tue, 2 Feb 2021 17:42:41 +0100
Subject: [PATCH 15/19] test

---
 .../sampleapplication/IT/DepartmentControllerTestIT.java         | 1 -
 .../training/sampleapplication/unit/StudentsServiceTest.java     | 1 -
 2 files changed, 2 deletions(-)

diff --git a/sample-application-backend/src/test/java/fr/takima/training/sampleapplication/IT/DepartmentControllerTestIT.java b/sample-application-backend/src/test/java/fr/takima/training/sampleapplication/IT/DepartmentControllerTestIT.java
index d4fb2f34..d7601061 100644
--- a/sample-application-backend/src/test/java/fr/takima/training/sampleapplication/IT/DepartmentControllerTestIT.java
+++ b/sample-application-backend/src/test/java/fr/takima/training/sampleapplication/IT/DepartmentControllerTestIT.java
@@ -17,7 +17,6 @@
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @AutoConfigureMockMvc
 @ExtendWith(SpringExtension.class)
-@Disabled
 public class DepartmentControllerTestIT {
     @Autowired
     private MockMvc mockMvc;
diff --git a/sample-application-backend/src/test/java/fr/takima/training/sampleapplication/unit/StudentsServiceTest.java b/sample-application-backend/src/test/java/fr/takima/training/sampleapplication/unit/StudentsServiceTest.java
index 6192a387..78b8e963 100644
--- a/sample-application-backend/src/test/java/fr/takima/training/sampleapplication/unit/StudentsServiceTest.java
+++ b/sample-application-backend/src/test/java/fr/takima/training/sampleapplication/unit/StudentsServiceTest.java
@@ -17,7 +17,6 @@
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.Mockito.when;
-@Disabled
 public class StudentsServiceTest {
 
     @InjectMocks

From 3d045b381a194196daea487dee78fb109521e502 Mon Sep 17 00:00:00 2001
From: Emile-Bergin <61179669+Emile-Bergin@users.noreply.github.com>
Date: Tue, 2 Feb 2021 17:51:06 +0100
Subject: [PATCH 16/19] Update .travis.yml

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 098814ff..6856323c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,7 @@ jobs:
         - mvn clean install
         - echo "Run test coverage and Quality Gate"
         - mvn test
-        - mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent install sonar:sonar -Dsonar.projectKey=Emile-Bergin_sample-application-stud
+        - mvn clean verify sonar:sonar -Dsonar.projectKey=Emile-Bergin_sample-application-stud
     - stage: "Build and Test"
       language: node.js
       node_js: "12.20"

From 086bfd596c7a37ce3660f7bda3186e234d560c52 Mon Sep 17 00:00:00 2001
From: Emile-Bergin <61179669+Emile-Bergin@users.noreply.github.com>
Date: Tue, 2 Feb 2021 17:59:58 +0100
Subject: [PATCH 17/19] Update .travis.yml

---
 .travis.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6856323c..e8047482 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,7 @@ jobs:
         - mvn clean install
         - echo "Run test coverage and Quality Gate"
         - mvn test
-        - mvn clean verify sonar:sonar -Dsonar.projectKey=Emile-Bergin_sample-application-stud
+        #- mvn clean verify sonar:sonar -Dsonar.projectKey=Emile-Bergin_sample-application-stud
     - stage: "Build and Test"
       language: node.js
       node_js: "12.20"
@@ -54,8 +54,8 @@ cache:
 services:
   - docker
 
-addons:
-  sonarcloud:
-    organization: "emile-bergin"
-    token:
-      secure: "X0rZ9lBr9DLqDKZA74S6g/N4TYwvyeqgFFAKzc1wo1Ovm5+7WgBVioM5i+q+qpL3YlQn9tVrEFzVQmdpDcLRCtYiuxz3KSkxSi7OShxcDN2ZWYvm2Q7YAFUksxe10fgzju4ff6YNwfeKg8AggfNb44+bkeObMdSgAmLA8/5LeVdp8YA35o8/9AjpjjVaoYH5xbzrV0eWNrvAtDfgxm3sTBVMeMobwEUdbDcQtHfAQV1w67t0Q8/LxZZBPHYbIx+l5bMNAvrM5SQR+anJycO5sm+sR9fBlppvu2bI1dJS4/wIzXjf3rjmNgPzR032d48k8+La0ovCFKWuypIeFK+H1I+AuyqXCDUpJcUE4h4liY9McaGTFfnUJoQFGbRkqWoDKHb5JjU9kqLlGo6/1rNSq6cxSojxnwIQCYHsHA+sU6dGjY3hjKL2r1MfnvWBW89D4+PQ4dzJXuPmzCmDyLqfh4fYqeTV0V1B040+y5x6A/j5Se+hEFwQqJUsG/+oLkk9sKDI0+KKd8LuGwADKXjttMQSji6E75RTtJlt2B6LB1r5Pl4Ib8xwM0DFrCByYKqfPu74eyq9CKW7PFf0egbaoOiUBwWyoaaH2HFH9+msJpmEKYT6YZ0LYvAD2GUx2wbhiBvttpakQBiTcFVloo4w1I5CBKpP5zkle8TE3Y3B0gw="
+#addons:
+#  sonarcloud:
+#    organization: "emile-bergin"
+#    token:
+#      secure: "X0rZ9lBr9DLqDKZA74S6g/N4TYwvyeqgFFAKzc1wo1Ovm5+7WgBVioM5i+q+qpL3YlQn9tVrEFzVQmdpDcLRCtYiuxz3KSkxSi7OShxcDN2ZWYvm2Q7YAFUksxe10fgzju4ff6YNwfeKg8AggfNb44+bkeObMdSgAmLA8/5LeVdp8YA35o8/9AjpjjVaoYH5xbzrV0eWNrvAtDfgxm3sTBVMeMobwEUdbDcQtHfAQV1w67t0Q8/LxZZBPHYbIx+l5bMNAvrM5SQR+anJycO5sm+sR9fBlppvu2bI1dJS4/wIzXjf3rjmNgPzR032d48k8+La0ovCFKWuypIeFK+H1I+AuyqXCDUpJcUE4h4liY9McaGTFfnUJoQFGbRkqWoDKHb5JjU9kqLlGo6/1rNSq6cxSojxnwIQCYHsHA+sU6dGjY3hjKL2r1MfnvWBW89D4+PQ4dzJXuPmzCmDyLqfh4fYqeTV0V1B040+y5x6A/j5Se+hEFwQqJUsG/+oLkk9sKDI0+KKd8LuGwADKXjttMQSji6E75RTtJlt2B6LB1r5Pl4Ib8xwM0DFrCByYKqfPu74eyq9CKW7PFf0egbaoOiUBwWyoaaH2HFH9+msJpmEKYT6YZ0LYvAD2GUx2wbhiBvttpakQBiTcFVloo4w1I5CBKpP5zkle8TE3Y3B0gw="

From b4d61f22e289a1505070999fe0db19148ee37b6f Mon Sep 17 00:00:00 2001
From: Emile-Bergin <61179669+Emile-Bergin@users.noreply.github.com>
Date: Tue, 2 Feb 2021 18:03:59 +0100
Subject: [PATCH 18/19] Update .travis.yml

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index e8047482..eb247abe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,6 @@ stages:
 jobs:
   include:
     - stage: "Build and Test"
-      language: java
       jdk: oraclejdk11
       before_script:
         - cd sample-application-backend

From 5ecd218b34c180eb6b5bae56e8fd3ec8e107959b Mon Sep 17 00:00:00 2001
From: Emile-Bergin <61179669+Emile-Bergin@users.noreply.github.com>
Date: Tue, 2 Feb 2021 18:04:25 +0100
Subject: [PATCH 19/19] Update .travis.yml

---
 .travis.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index eb247abe..eefe4e6b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,7 +15,7 @@ jobs:
         - mvn clean install
         - echo "Run test coverage and Quality Gate"
         - mvn test
-        #- mvn clean verify sonar:sonar -Dsonar.projectKey=Emile-Bergin_sample-application-stud
+        - mvn clean verify sonar:sonar -Dsonar.projectKey=Emile-Bergin_sample-application-stud
     - stage: "Build and Test"
       language: node.js
       node_js: "12.20"
@@ -53,8 +53,8 @@ cache:
 services:
   - docker
 
-#addons:
-#  sonarcloud:
-#    organization: "emile-bergin"
-#    token:
-#      secure: "X0rZ9lBr9DLqDKZA74S6g/N4TYwvyeqgFFAKzc1wo1Ovm5+7WgBVioM5i+q+qpL3YlQn9tVrEFzVQmdpDcLRCtYiuxz3KSkxSi7OShxcDN2ZWYvm2Q7YAFUksxe10fgzju4ff6YNwfeKg8AggfNb44+bkeObMdSgAmLA8/5LeVdp8YA35o8/9AjpjjVaoYH5xbzrV0eWNrvAtDfgxm3sTBVMeMobwEUdbDcQtHfAQV1w67t0Q8/LxZZBPHYbIx+l5bMNAvrM5SQR+anJycO5sm+sR9fBlppvu2bI1dJS4/wIzXjf3rjmNgPzR032d48k8+La0ovCFKWuypIeFK+H1I+AuyqXCDUpJcUE4h4liY9McaGTFfnUJoQFGbRkqWoDKHb5JjU9kqLlGo6/1rNSq6cxSojxnwIQCYHsHA+sU6dGjY3hjKL2r1MfnvWBW89D4+PQ4dzJXuPmzCmDyLqfh4fYqeTV0V1B040+y5x6A/j5Se+hEFwQqJUsG/+oLkk9sKDI0+KKd8LuGwADKXjttMQSji6E75RTtJlt2B6LB1r5Pl4Ib8xwM0DFrCByYKqfPu74eyq9CKW7PFf0egbaoOiUBwWyoaaH2HFH9+msJpmEKYT6YZ0LYvAD2GUx2wbhiBvttpakQBiTcFVloo4w1I5CBKpP5zkle8TE3Y3B0gw="
+addons:
+  sonarcloud:
+    organization: "emile-bergin"
+    token:
+      secure: "X0rZ9lBr9DLqDKZA74S6g/N4TYwvyeqgFFAKzc1wo1Ovm5+7WgBVioM5i+q+qpL3YlQn9tVrEFzVQmdpDcLRCtYiuxz3KSkxSi7OShxcDN2ZWYvm2Q7YAFUksxe10fgzju4ff6YNwfeKg8AggfNb44+bkeObMdSgAmLA8/5LeVdp8YA35o8/9AjpjjVaoYH5xbzrV0eWNrvAtDfgxm3sTBVMeMobwEUdbDcQtHfAQV1w67t0Q8/LxZZBPHYbIx+l5bMNAvrM5SQR+anJycO5sm+sR9fBlppvu2bI1dJS4/wIzXjf3rjmNgPzR032d48k8+La0ovCFKWuypIeFK+H1I+AuyqXCDUpJcUE4h4liY9McaGTFfnUJoQFGbRkqWoDKHb5JjU9kqLlGo6/1rNSq6cxSojxnwIQCYHsHA+sU6dGjY3hjKL2r1MfnvWBW89D4+PQ4dzJXuPmzCmDyLqfh4fYqeTV0V1B040+y5x6A/j5Se+hEFwQqJUsG/+oLkk9sKDI0+KKd8LuGwADKXjttMQSji6E75RTtJlt2B6LB1r5Pl4Ib8xwM0DFrCByYKqfPu74eyq9CKW7PFf0egbaoOiUBwWyoaaH2HFH9+msJpmEKYT6YZ0LYvAD2GUx2wbhiBvttpakQBiTcFVloo4w1I5CBKpP5zkle8TE3Y3B0gw="