Added the HMCTS Logging along with Lombok for the Fees Register App p…

api/src/functionalTest/resources/logback-test.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <include resource="org/springframework/boot/logging/logback/base.xml"/>
+    <logger name="org.springframework.context" level="WARN"/>
+    <logger name="org.springframework.web.context" level="WARN"/>
+    <logger name="uk.gov.hmcts.fees.register.functional" level="DEBUG"/>
+</configuration>

api/src/smokeTest/resources/logback-test.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <include resource="org/springframework/boot/logging/logback/base.xml"/>
+    <logger name="org.springframework.context" level="WARN"/>
+    <logger name="org.springframework.web.context" level="WARN"/>
+    <logger name="uk.gov.hmcts.fees.register.smoke" level="DEBUG"/>
+</configuration>

api/src/test/java/uk/gov/hmcts/fees2/register/api/controllers/FeeControllerTest.java

@@ -1,5 +1,6 @@
 package uk.gov.hmcts.fees2.register.api.controllers;
 
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.time.DateUtils;
 import org.junit.Rule;
 import org.junit.Test;
@@ -32,6 +33,7 @@
 /**
  * Created by tarun on 02/11/2017.
  */
+@Slf4j
 @Transactional
 public class FeeControllerTest extends BaseIntegrationTest {
 
@@ -54,6 +56,7 @@ public synchronized void readFeeTest() throws Exception {
             }));
 
         forceDeleteFee(arr[3]);
+        log.info("Read Fee Test Executed successfully....");
     }
 
     @Test

api/src/test/resources/logback-test.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <include resource="org/springframework/boot/logging/logback/base.xml"/>
+    <logger name="org.springframework.context" level="WARN"/>
+    <logger name="org.springframework.web.context" level="WARN"/>
+    <logger name="uk.gov.hmcts.fees2.register.api" level="DEBUG"/>
+    <logger name="uk.gov.hmcts.fees.register.api" level="DEBUG"/>
+</configuration>

build.gradle

@@ -8,7 +8,7 @@ plugins {
     id 'jacoco'
     id 'maven-publish'
     id 'com.jfrog.bintray' version '1.8.4'
-    id "au.com.dius.pact" version "4.1.7"
+    id "au.com.dius.pact" version "4.0.0"
 }
 
 def versions = [
@@ -109,6 +109,7 @@ subprojects {
         compileOnly group: 'com.google.code.findbugs', name: 'annotations', version: '3.0.1'
         compileOnly group: 'joda-time', name: 'joda-time', version: '2.9.9'
         implementation 'org.springframework.boot:spring-boot-starter-validation'
+        testImplementation group: 'uk.gov.hmcts.reform', name: 'logging', version: '5.1.1'
     }
 
     task sourcesJar(type: Jar, dependsOn: classes) {
@@ -224,7 +225,7 @@ subprojects {
                 protocol = 'http'
                 host = 'fees-register-api-aat.service.core-compute-aat.internal'
                 port = 80
-                if (pactBrokerUrl) hasPactsFromPactBroker(pactBrokerUrl)
+                if (pactBrokerUrl) hasPactsFromPactBrokerWithTag(pactBrokerUrl, 'master')
                 publish {
                     if (pactBrokerUrl) pactBrokerUrl = pactBrokerUrl
                     pactBrokerUrl = System.getProperty("PACT_BROKER_URL") ?: 'http://localhost:80'

charts/fees-register-api/Chart.yaml

@@ -3,11 +3,11 @@ appVersion: "2.0"
 description: Helm chart for the HMCTS fees-register api
 name: fees-register-api
 home: https://github.com/hmcts/ccfr-fees-register-app
-version: 0.3.4
+version: 0.3.5
 maintainers:
   - name: HMCTS Fees & Payments Dev Team
     email: [email protected]
 dependencies:
   - name: java
     version: 3.4.5
-    repository: '@hmctspublic'
+    repository: 'https://hmctspublic.azurecr.io/helm/v1/repo/'

cve-resolution-strategy.gradle

@@ -8,11 +8,11 @@ configurations.all {
             *  CVE-2020-17527, CVE-2020-8022, CVE-2020-9484
             * */
             if (det.requested.name == 'tomcat-embed-core') {
-                det.useVersion '9.0.43'
+                det.useVersion '9.0.50'
             }
 
             if (det.requested.name == 'tomcat-embed-websocket') {
-                det.useVersion '9.0.43'
+                det.useVersion '9.0.50'
             }
 
             /*