Skip to content

Commit

Permalink
Upgrade to spring boot 3.3.5 (#5674)
Browse files Browse the repository at this point in the history
* Upgrade to spring boot 3.3.5

* Fix for upgrade to auth-checker-lib

* Update jackson version

* Revert mockito upgrade

---------

Co-authored-by: prabhamuthu15 <78162288+prabhamuthu15@users.noreply.github.com>
  • Loading branch information
jamesrferguson1 and prabhamuthu15 authored Dec 4, 2024
1 parent 1304ebf commit 790af6a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
6 changes: 3 additions & 3 deletions service/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ plugins {
id 'checkstyle'
id 'jacoco'
id 'io.spring.dependency-management' version '1.1.6'
id 'org.springframework.boot' version '3.2.4'
id 'org.springframework.boot' version '3.3.5'
id 'com.github.ben-manes.versions' version '0.51.0'
id 'org.sonarqube' version '5.1.0.4882'
id 'project-report'
Expand Down Expand Up @@ -328,15 +328,15 @@ dependencies {
implementation group: 'com.github.hmcts', name: 'document-management-client', version: '7.0.1'
implementation group: 'com.github.hmcts', name: 'core-case-data-store-client', version: '4.7.6'
implementation group: 'com.github.hmcts', name: 'service-auth-provider-java-client', version: '4.1.2'
implementation group: 'com.github.hmcts', name: 'auth-checker-lib', version: '3.0.0'
implementation group: 'com.github.hmcts', name: 'auth-checker-lib', version: '3.0.4'
implementation group: 'com.github.hmcts', name: 'send-letter-client', version: '4.0.4'
implementation group: 'uk.gov.service.notify', name: 'notifications-java-client', version: '5.2.1-RELEASE'

implementation group: 'com.github.hmcts', name: 'ccd-case-document-am-client', version: '1.7.3'

implementation group: 'com.google.guava', name: 'guava', version: '33.3.1-jre'

implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-joda', version: '2.18.2'
implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-joda', version: versions.jackson

implementation group: 'com.github.hmcts.java-logging', name: 'logging', version: '6.1.7'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import org.apache.hc.core5.util.Timeout;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
import org.springframework.web.client.RestTemplate;

Expand All @@ -15,12 +16,13 @@ public class HttpClientConfiguration {
@Bean
public RestTemplate restTemplate() {
RestTemplate restTemplate = new RestTemplate();
restTemplate.setRequestFactory(new HttpComponentsClientHttpRequestFactory(userTokenParserHttpClient()));
restTemplate.setRequestFactory(new HttpComponentsClientHttpRequestFactory(getHttpClient()));
return restTemplate;
}

@Bean
public CloseableHttpClient userTokenParserHttpClient() {
@Primary
public CloseableHttpClient getHttpClient() {
RequestConfig config = RequestConfig.custom()
.setConnectTimeout(Timeout.ofMilliseconds(10000))
.setConnectionRequestTimeout(Timeout.ofMilliseconds(10000))
Expand Down

0 comments on commit 790af6a

Please sign in to comment.