FPET-1120 build issue fixes (#366)

Revert "FPET-1120 build issue fixes"

This reverts commit 1df7c93.

CI build issues

build.gradle

@@ -17,7 +17,7 @@ buildscript {
 plugins {
     id 'application'
     id 'checkstyle'
-    id 'com.github.ben-manes.versions' version '0.46.0'
+    id 'com.github.ben-manes.versions' version '0.51.0'
     id 'io.spring.dependency-management' version '1.0.11.RELEASE'
     id 'jacoco'
     id 'org.owasp.dependencycheck' version '9.0.4'
@@ -28,6 +28,7 @@ plugins {
 }
 
 apply plugin: 'net.serenity-bdd.aggregator'
+apply plugin: 'com.github.ben-manes.versions'
 
 group = 'uk.gov.hmcts.reform.prl'
 version = '3.0.0'
@@ -226,14 +227,14 @@ dependencies {
     integrationTestImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-test'
     integrationTestImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-web'
 
-    integrationTestImplementation (group: 'uk.gov.hmcts.reform', name:'service-auth-provider-client', version: versions.serviceTokenGenerator){
+    integrationTestImplementation (group: 'com.github.hmcts', name: 'service-auth-provider-java-client', version: versions.serviceTokenGenerator){
         exclude group: 'io.reactivex', module: 'io.reactivex'
         exclude group: 'io.reactivex', module: 'rxnetty'
         exclude group: 'io.reactivex', module: 'rxnetty-contexts'
         exclude group: 'io.reactivex', module: 'rxnetty-servo'
     }
 
-  functionalTestImplementation (group: 'uk.gov.hmcts.reform', name:'service-auth-provider-client', version: versions.serviceTokenGenerator){
+  functionalTestImplementation (group: 'com.github.hmcts', name: 'service-auth-provider-java-client', version: versions.serviceTokenGenerator){
     exclude group: 'io.reactivex', module: 'io.reactivex'
     exclude group: 'io.reactivex', module: 'rxnetty'
     exclude group: 'io.reactivex', module: 'rxnetty-contexts'
@@ -284,12 +285,10 @@ dependencies {
     implementation group: 'org.springframework.hateoas', name: 'spring-hateoas', version: versions.springHateoas
     implementation group: 'org.apache.commons', name: 'commons-lang3', version : versions.commonsLang3
 
-    implementation group: 'uk.gov.hmcts.reform', name: 'logging', version: versions.reformsJavaLogging
+    implementation 'com.github.hmcts.java-logging:logging:6.1.6'
+    implementation 'com.github.hmcts.java-logging:logging-appinsights:6.1.6'
     implementation group: 'org.springframework', name: 'spring-context-support', version: versions.springFramework
-  implementation group: 'uk.gov.hmcts.reform', name: 'logging-appinsights', version: versions.reformsJavaLogging
-    implementation group: 'uk.gov.hmcts.reform', name: 'logging-spring', version: versions.reformsJavaLogging
-    implementation group: 'uk.gov.hmcts.reform', name: 'logging-httpcomponents', version: versions.reformsJavaLogging
-    implementation (group: 'uk.gov.hmcts.reform', name:'service-auth-provider-client', version: versions.serviceTokenGenerator) {
+    implementation ( group: 'com.github.hmcts', name: 'service-auth-provider-java-client', version: versions.serviceTokenGenerator) {
         exclude group: 'io.reactivex', module: 'io.reactivex'
         exclude group: 'io.reactivex', module: 'rxnetty'
         exclude group: 'io.reactivex', module: 'rxnetty-contexts'
@@ -303,6 +302,7 @@ dependencies {
     implementation group:'org.codehaus.sonar-plugins', name:'sonar-pitest-plugin', version: versions.sonarPitest
     implementation group: 'org.apache.httpcomponents', name: 'httpclient', version: versions.httpComponents
     implementation (group: 'com.launchdarkly', name: 'launchdarkly-java-server-sdk', version: '7.4.0')
+    implementation group: 'net.logstash.logback', name: 'logstash-logback-encoder', version:'7.4'
 
 
   annotationProcessor("org.projectlombok:lombok:${versions.lombok}")

src/main/java/uk/gov/hmcts/reform/prl/documentgenerator/config/HttpConnectionConfiguration.java

@@ -21,7 +21,6 @@
 import org.springframework.http.converter.StringHttpMessageConverter;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.web.client.RestTemplate;
-import uk.gov.hmcts.reform.logging.httpcomponents.OutboundRequestIdSettingInterceptor;
 
 import java.nio.charset.Charset;
 
@@ -97,7 +96,6 @@ private RestTemplate getRestTemplate(
         CloseableHttpClient client = HttpClientBuilder
             .create()
             .useSystemProperties()
-            .addInterceptorFirst(new OutboundRequestIdSettingInterceptor())
             .setDefaultRequestConfig(config)
             .build();
 

src/test/java/uk/gov/hmcts/reform/prl/documentgenerator/config/TemplatesConfigurationTest.java

@@ -1,6 +1,6 @@
 package uk.gov.hmcts.reform.prl.documentgenerator.config;
 
-import com.microsoft.applicationinsights.boot.dependencies.google.common.collect.Sets;
+import com.google.common.collect.Sets;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.tuple.ImmutableTriple;
 import org.apache.commons.lang3.tuple.Triple;