From c6e42125083e6262ecd8448283f7a8ab461343d9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 12 Apr 2024 09:29:35 +0000 Subject: [PATCH 1/9] Update dependency org.postgresql:postgresql to v42.7.3 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 57e37f39..642c2607 100644 --- a/build.gradle +++ b/build.gradle @@ -185,7 +185,7 @@ ext.libraries = [ ] dependencies { - implementation group: 'org.postgresql', name: 'postgresql', version: '42.7.2' + implementation group: 'org.postgresql', name: 'postgresql', version: '42.7.3' implementation group: 'org.flywaydb', name: 'flyway-core', version: '9.22.3' implementation group: 'net.javacrumbs.shedlock', name: 'shedlock-spring', version: '5.10.2' From 80bb1c1c1d2a975c05fde020e5df35b21c20afc8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 12 Apr 2024 09:29:38 +0000 Subject: [PATCH 2/9] Update junit5 monorepo --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 57e37f39..96b5dd9a 100644 --- a/build.gradle +++ b/build.gradle @@ -167,8 +167,8 @@ repositories { } def versions = [ - junit : '5.10.1', - junitPlatform : '1.10.1', + junit : '5.10.2', + junitPlatform : '1.10.2', reformLogging : '6.1.4', apiguardian : '1.1.2' ] From 84fc2b90e3485d898bb5511550b3fb002aba9414 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 12 Apr 2024 09:29:42 +0000 Subject: [PATCH 3/9] Update Helm release java to v5.2.0 --- charts/reform-scan-notification-service/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/reform-scan-notification-service/Chart.yaml b/charts/reform-scan-notification-service/Chart.yaml index 80f97bb8..ef6b34ff 100644 --- a/charts/reform-scan-notification-service/Chart.yaml +++ b/charts/reform-scan-notification-service/Chart.yaml @@ -2,13 +2,13 @@ apiVersion: v2 description: A Helm chart for Reform Scan Notification Service name: reform-scan-notification-service home: https://github.com/hmcts/reform-scan-notification-service -version: 2.0.12 +version: 2.0.13 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 From 640b6b6e17282d4904e49b1ef81a71e16fbc16b6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 12 Apr 2024 09:29:45 +0000 Subject: [PATCH 4/9] Update dependency checkstyle to v10.15.0 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 57e37f39..a71865a3 100644 --- a/build.gradle +++ b/build.gradle @@ -95,7 +95,7 @@ task fortifyScan(type: JavaExec) { checkstyle { maxWarnings = 0 - toolVersion = '10.12.1' + toolVersion = '10.15.0' getConfigDirectory().set(new File(rootDir, 'config/checkstyle')) } From 535441d2b053e1cc478f8e29684393aab7b5dede Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 12 Apr 2024 09:29:50 +0000 Subject: [PATCH 5/9] Update actions/setup-java action to v4 --- .github/workflows/swagger.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/swagger.yml b/.github/workflows/swagger.yml index 18e17650..30d80ec4 100644 --- a/.github/workflows/swagger.yml +++ b/.github/workflows/swagger.yml @@ -17,7 +17,7 @@ jobs: key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }} restore-keys: ${{ runner.os }}-gradle- - name: Set up JDK 11 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: 11 distribution: 'adopt' From 7515ee7bb2eb4b76d1d4e8e8ee0de120680c6819 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 12 Apr 2024 09:29:53 +0000 Subject: [PATCH 6/9] Update feign monorepo to v13 --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 57e37f39..2f0d0cc5 100644 --- a/build.gradle +++ b/build.gradle @@ -217,8 +217,8 @@ dependencies { // region: feign clients implementation group: 'org.springframework.cloud', name: 'spring-cloud-starter-openfeign', version: '4.1.0' - implementation group: 'io.github.openfeign', name: 'feign-httpclient', version: '12.5' - implementation group: 'io.github.openfeign', name: 'feign-jackson', version: '12.5' + implementation group: 'io.github.openfeign', name: 'feign-httpclient', version: '13.2.1' + implementation group: 'io.github.openfeign', name: 'feign-jackson', version: '13.2.1' // end region implementation group: 'org.apache.qpid', name: 'qpid-jms-client', version: '1.11.0' From 3caabcf970b03f43da6b485b321535933b69282f Mon Sep 17 00:00:00 2001 From: Ruth Bovell Date: Wed, 1 May 2024 16:36:14 +0100 Subject: [PATCH 7/9] - manually updates to flyway V10 --- build.gradle | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index d0235101..5327418b 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ plugins { 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 'org.flywaydb.flyway' version '9.22.3' + id 'org.flywaydb.flyway' version '10.12.0' } group = 'uk.gov.hmcts.reform' @@ -185,8 +185,10 @@ ext.libraries = [ ] dependencies { + runtimeOnly group: 'org.flywaydb', name: 'flyway-database-postgresql', version: '10.12.0' + implementation group: 'org.postgresql', name: 'postgresql', version: '42.7.2' - implementation group: 'org.flywaydb', name: 'flyway-core', version: '9.22.3' + implementation group: 'org.flywaydb', name: 'flyway-core', version: '10.12.0' implementation group: 'net.javacrumbs.shedlock', name: 'shedlock-spring', version: '5.10.2' implementation group: 'net.javacrumbs.shedlock', name: 'shedlock-provider-jdbc-template', version: '5.10.2' From 57195cb977dd81d304154237e8ba4c647868bc5d Mon Sep 17 00:00:00 2001 From: Ruth Bovell Date: Wed, 1 May 2024 16:58:38 +0100 Subject: [PATCH 8/9] - manually updates gradle version --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 068cdb2d..3994438e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ 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 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 7bbefc027feb159a1a1e2c087c80e10682141f7d Mon Sep 17 00:00:00 2001 From: Ruth Bovell Date: Thu, 23 May 2024 12:37:25 +0100 Subject: [PATCH 9/9] - adds flyway and postgresql to buldscript block --- build.gradle | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 4ce5f35a..113c4d7a 100644 --- a/build.gradle +++ b/build.gradle @@ -1,3 +1,9 @@ +buildscript { + dependencies { + classpath("org.postgresql:postgresql:42.7.3") + classpath("org.flywaydb:flyway-database-postgresql:10.13.0") + } +} plugins { id 'application' id 'checkstyle' @@ -8,7 +14,7 @@ plugins { 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 'org.flywaydb.flyway' version '10.12.0' + id 'org.flywaydb.flyway' version '10.13.0' } group = 'uk.gov.hmcts.reform' @@ -185,10 +191,10 @@ ext.libraries = [ ] dependencies { - runtimeOnly group: 'org.flywaydb', name: 'flyway-database-postgresql', version: '10.12.0' + runtimeOnly group: 'org.flywaydb', name: 'flyway-database-postgresql', version: '10.13.0' implementation group: 'org.postgresql', name: 'postgresql', version: '42.7.3' - implementation group: 'org.flywaydb', name: 'flyway-core', version: '10.12.0' + implementation group: 'org.flywaydb', name: 'flyway-core', 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-template', version: '5.10.2'