Skip to content

Commit

Permalink
FACT 1698 Renovate Dependency Updates (#3270)
Browse files Browse the repository at this point in the history
* Update dependency commons-io:commons-io to v2.16.1

* Update dependency org.apache.commons:commons-lang3 to v3.14.0

* Update plugin org.springframework.boot to v3.2.5

* Update dependency com.azure:azure-storage-blob to v12.25.4

* - manually updates chart java

* Bumping chart version/ fixing aliases

* - downgrade pact version

* - updates test to check for new latest azure storage version

* - updates functional tests test to check for new latest azure storage version

* - manually upgrade to flyway v10

* - manually upgrade gradle

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: hmcts-jenkins-a-to-c <62422075+hmcts-jenkins-a-to-c[bot]@users.noreply.github.com>
  • Loading branch information
3 people committed May 20, 2024
1 parent b46facb commit 77dc1e9
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 13 deletions.
16 changes: 9 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ plugins {
id 'pmd'
id 'jacoco'
id 'io.spring.dependency-management' version '1.1.4'
id 'org.flywaydb.flyway' version '9.22.3'
id 'org.springframework.boot' version '3.2.3'
id 'org.flywaydb.flyway' version '10.13.0'
id 'org.springframework.boot' version '3.2.5'
id 'org.owasp.dependencycheck' version '9.0.9'
id 'com.github.ben-manes.versions' version '0.50.0'
id 'org.sonarqube' version '4.4.1.3373'
id 'info.solidsoft.pitest' version '1.15.0'
id 'au.com.dius.pact' version '4.6.5'
id 'au.com.dius.pact' version '4.3.14'
}

group = 'uk.gov.hmcts.reform'
Expand Down Expand Up @@ -255,10 +255,12 @@ dependencies {
exclude group: 'javax.mail', module: 'mailapi'
}

runtimeOnly group: 'org.flywaydb', name: 'flyway-database-postgresql', version: '10.13.0'

implementation group: 'net.javacrumbs.shedlock', name: 'shedlock-spring', version: '5.10.2'
implementation group: 'net.javacrumbs.shedlock', name: 'shedlock-provider-jdbc', version: '5.10.2'

implementation group: 'com.azure', name: 'azure-storage-blob', version: '12.21.1'
implementation group: 'com.azure', name: 'azure-storage-blob', version: '12.25.4'

implementation group: 'com.azure', name: 'azure-messaging-servicebus', version: '7.14.7'

Expand All @@ -278,7 +280,7 @@ dependencies {

implementation group: 'com.github.java-json-tools', name: 'json-schema-validator', version: '2.2.14', withoutJavaxMailApi

implementation group: 'org.flywaydb', name: 'flyway-core', version: '9.22.3'
implementation group: 'org.flywaydb', name: 'flyway-core', version: '10.13.0'
implementation group: 'org.postgresql', name: 'postgresql', version: '42.7.3'
// review following dependency after integrating db structure
implementation group: 'io.hypersistence', name: 'hypersistence-utils-hibernate-63', version: '3.7.3'
Expand All @@ -302,8 +304,8 @@ dependencies {
implementation group: 'org.springframework.cloud', name: 'spring-cloud-starter-bootstrap', version: '3.1.8'


implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
implementation group: 'commons-io', name: 'commons-io', version: '2.13.0'
implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.14.0'
implementation group: 'commons-io', name: 'commons-io', version: '2.16.1'
// only used in uk.gov.hmcts.reform.bulkscanprocessor.validation.OcrValidator
// single import: io.vavr.control.Try
implementation group: 'io.vavr', name: 'vavr', version: '0.10.4'
Expand Down
4 changes: 2 additions & 2 deletions charts/bulk-scan-processor/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
name: bulk-scan-processor
apiVersion: v2
home: https://github.com/hmcts/bulk-scan-processor
version: 1.0.23
version: 1.0.24
description: HMCTS Bulk scan processor service
maintainers:
- name: HMCTS BSP Team
email: bspteam@hmcts.net
dependencies:
- name: java
version: 5.0.0
version: 5.2.0
repository: https://hmctspublic.azurecr.io/helm/v1/repo/
- name: servicebus
version: 1.0.4
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ private void verifySasTokenProperties(Response tokenResponse) throws java.io.IOE
Date tokenExpiry = DateUtil.parseDatetime(queryParams.get("se"));
assertThat(tokenExpiry).isNotNull();
assertThat(queryParams.get("sig")).isNotNull(); //this is a generated hash of the resource string
assertThat(queryParams.get("sv")).contains("2021-12-02"); //azure api version is latest
assertThat(queryParams.get("sv")).contains("2023-11-03"); //azure api version is latest
assertThat(queryParams.get("sp")).contains("wl"); //access permissions(write-w,list-l)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ private void verifySasTokenProperties(String tokenResponse) throws java.io.IOExc

assertThat(queryParams.get("sig")).isNotNull();//this is a generated hash of the resource string
assertThat(queryParams.get("se")).startsWith(currentDate);//the expiry date/time for the signature
assertThat(queryParams.get("sv")).contains("2021-12-02");//azure api version is latest
assertThat(queryParams.get("sv")).contains("2023-11-03");//azure api version is latest
assertThat(queryParams.get("sp")).contains("wl");//access permissions(write-w,list-l)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ void should_generate_sas_token_when_service_configuration_is_available() {

assertThat(queryParams.get("sig")).isNotNull();//this is a generated hash of the resource string
assertThat(queryParams.get("se")).startsWith(currentDate);//the expiry date/time for the signature
assertThat(queryParams.get("sv")).contains("2021-12-02");//azure api version is latest
assertThat(queryParams.get("sv")).contains("2023-11-03");//azure api version is latest
assertThat(queryParams.get("sp")).contains("rwl");//access permissions(write-w,list-l)
}

Expand Down

0 comments on commit 77dc1e9

Please sign in to comment.