DTSCCI-844: remove jenter (#2984)

hmcts · Sep 5, 2024 · b746c09 · b746c09
1 parent 3afc01f
commit b746c09
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 16 deletions.
diff --git a/build.gradle b/build.gradle
@@ -146,7 +146,6 @@ allprojects {
     maven {
       url 'https://jitpack.io'
     }
-    jcenter()
   }
 
   dependencyManagement {
@@ -237,24 +236,25 @@ dependencies {
 
   implementation group: 'uk.gov.service.notify', name: 'notifications-java-client', version: '5.0.1-RELEASE'
 
-  implementation group: 'uk.gov.hmcts.reform', name: 'logging', version: '5.1.7'
-  implementation group: 'uk.gov.hmcts.reform', name: 'logging-appinsights', version: '5.1.7'
+  implementation group: 'com.github.hmcts.java-logging', name: 'logging', version: '5.1.7'
+  implementation group: 'com.github.hmcts.java-logging', name: 'logging-appinsights', version: '5.1.7'
   implementation group: 'com.microsoft.azure', name: 'applicationinsights-web', version: '2.6.4'
 
   implementation group: 'com.github.hmcts', name: 'java-logging', version: '6.1.4'
 
-  implementation('com.github.hmcts:cmc-pdf-service-client:7.0.0') {
-    exclude group: 'java-logging', module: ' java-logging'
+  implementation('com.github.hmcts:cmc-pdf-service-client:8.0.1') {
+    exclude group: 'java-logging', module: 'java-logging'
   }
-  implementation group: 'uk.gov.hmcts.reform', name: 'document-management-client', version: '7.0.0'
+  implementation group: 'com.github.hmcts', name: 'document-management-client', version: '7.0.0'
   implementation group: 'com.launchdarkly', name: 'launchdarkly-java-server-sdk', version: '6.3.0'
-  implementation group: 'uk.gov.hmcts.reform', name: 'core-case-data-store-client', version: '4.7.6'
+  implementation group: 'com.github.hmcts', name: 'core-case-data-store-client', version: '4.7.6'
   implementation group: 'com.github.hmcts', name: 'ccd-case-document-am-client', version: '1.7.1'
   implementation group: 'com.github.hmcts', name: 'doc-assembly-client', version: '1.2.2'
   implementation('com.github.hmcts:payments-java-client:0.0.7') {
-    exclude group: 'java-logging', module: ' java-logging'
+    exclude group: 'uk.gov.hmcts.reform', module: 'service-auth-provider-client'
+    exclude group: 'uk.gov.hmcts.reform', module: 'java-logging'
   }
-  implementation group: 'uk.gov.hmcts.reform', name: 'service-auth-provider-client', version: '4.0.0'
+  implementation group: 'com.github.hmcts', name: 'service-auth-provider-java-client', version: '4.1.2'
   implementation group: 'com.github.hmcts', name: 'send-letter-client', version: '3.0.16'
   implementation group: 'org.springframework.boot', name: 'spring-boot-starter-validation', version: versions.springBoot
 
@@ -311,7 +311,7 @@ dependencies {
   testImplementation group: 'org.powermock', name: 'powermock-api-mockito2', version: '2.0.2'
   testImplementation group: 'org.testcontainers', name: 'postgresql', version: '1.18.0'
 
-  testImplementation group: 'org.pdfbox', name: 'com.springsource.org.pdfbox', version: '0.7.3'
+  testImplementation group: 'org.apache.pdfbox', name: 'pdfbox', version: '2.0.29'
   testImplementation group: 'com.jayway.jsonpath', name: 'json-path-assert', version: '2.5.0'
   testImplementation group: 'net.jodah', name: 'failsafe', version: '2.4.0'
   testImplementation group: 'org.xmlunit', name: 'xmlunit-core', version: '2.8.2'

diff --git a/charts/cmc-claim-store/values.aat.template.yaml b/charts/cmc-claim-store/values.aat.template.yaml
@@ -7,4 +7,4 @@ java:
     CLAIM_STAYED_SCHEDULE: "0 0 16 ? * MON-FRI *"
     SCHEDULE_TRANSFER_CLAIMS: '0 0 12 1 * ?'
     OIDC_ISSUER: https://forgerock-am.service.core-compute-idam-aat2.internal:8443/openam/oauth2/realms/root/realms/hmcts
-
+    DUMMY_VAR: test
diff --git a/email-client/build.gradle b/email-client/build.gradle
@@ -20,8 +20,8 @@ dependencies {
   annotationProcessor group: 'org.projectlombok', name: 'lombok', version: '1.18.26'
   compileOnly group: 'org.projectlombok', name: 'lombok', version: '1.18.26'
 
-  implementation group: 'uk.gov.hmcts.reform', name: 'logging', version: '5.1.7'
-  implementation group: 'uk.gov.hmcts.reform', name: 'logging-appinsights', version: '5.1.7'
+  implementation group: 'com.github.hmcts.java-logging', name: 'logging', version: '6.1.4'
+  implementation group: 'com.github.hmcts.java-logging', name: 'logging-appinsights', version: '6.1.4'
 
   implementation (group: 'com.sendgrid', name: 'sendgrid-java', version: '4.10.1') {
     exclude group: 'org.bouncycastle', module: 'bcprov-jdk15on'

diff --git a/job-scheduler/build.gradle b/job-scheduler/build.gradle
@@ -19,7 +19,7 @@ dependencies {
 
   implementation group: 'ch.qos.logback', name: 'logback-classic', version: versions.logback
   implementation group: 'ch.qos.logback', name: 'logback-core', version: versions.logback
-  implementation group: 'uk.gov.hmcts.reform', name: 'java-logging', version: versions.reformJavaLogging
+  implementation group: 'com.github.hmcts.java-logging', name: 'logging', version: '6.1.4'
 
   testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-test'
   testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.25.3'

diff --git a/src/aat/java/uk/gov/hmcts/cmc/claimstore/tests/functional/BasePdfTest.java b/src/aat/java/uk/gov/hmcts/cmc/claimstore/tests/functional/BasePdfTest.java
@@ -1,8 +1,8 @@
 package uk.gov.hmcts.cmc.claimstore.tests.functional;
 
 import io.restassured.RestAssured;
-import org.pdfbox.pdmodel.PDDocument;
-import org.pdfbox.util.PDFTextStripper;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.text.PDFTextStripper;
 import org.springframework.http.HttpHeaders;
 import uk.gov.hmcts.cmc.claimstore.models.idam.User;
 import uk.gov.hmcts.cmc.claimstore.tests.BaseTest;