Merge branch 'main' into MAN-340-requirements-notes-truncated

ministryofjustice · Jan 27, 2025 · b95c426 · b95c426
2 parents 5bfe097 + fd0da87
commit b95c426
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git a/.github/actions/analyse/action.yml b/.github/actions/analyse/action.yml
@@ -26,7 +26,7 @@ runs:
       shell: bash
 
     - name: Publish test reports
-      uses: mikepenz/action-junit-report@62516aa379bff6370c95fd5894d5a27fb6619d9b # v5
+      uses: mikepenz/action-junit-report@ee6b445351cd81e2f73a16a0e52d598aeac2197f # v5
       if: always() && github.actor != 'dependabot[bot]'
       with:
         check_name: |-

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -37,7 +37,7 @@ jobs:
           java-version: '21'
           distribution: 'temurin'
 
-      - uses: gradle-update/update-gradle-wrapper-action@9268373d69bd0974b6318eb3b512b8e025060bbe # v2.0.0
+      - uses: gradle-update/update-gradle-wrapper-action@9cca748ef7cfd967bc3a5c39e15a7aa229ad1b3d # v2.0.1
         with:
           labels: dependencies
           repo-token: ${{ steps.app-token.outputs.token }}

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -8,9 +8,9 @@ import uk.gov.justice.digital.hmpps.plugins.ClassPathPlugin
 import uk.gov.justice.digital.hmpps.plugins.JibConfigPlugin
 
 plugins {
-    kotlin("jvm") version "2.1.0"
-    kotlin("plugin.spring") version "2.1.0" apply false
-    kotlin("plugin.jpa") version "2.1.0" apply false
+    kotlin("jvm") version "2.1.10"
+    kotlin("plugin.spring") version "2.1.10" apply false
+    kotlin("plugin.jpa") version "2.1.10" apply false
     id("org.springframework.boot") version "3.4.0" apply false
     id("io.spring.dependency-management") version "1.1.7" apply false
     id("com.gorylenko.gradle-git-properties") version "2.4.2" apply false

diff --git a/projects/feature-flags/container/Dockerfile b/projects/feature-flags/container/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/flipt-io/flipt:v1.54.1
+FROM ghcr.io/flipt-io/flipt:v1.54.2
 
 # Run any pending migrations on startup
 CMD ["sh", "-c", "./flipt migrate && ./flipt"]
diff --git a/projects/person-search-index-from-delius/container/Dockerfile b/projects/person-search-index-from-delius/container/Dockerfile
@@ -4,7 +4,7 @@ COPY --chown=yq /pipelines /pipelines
 RUN find /pipelines -type f -name "*.yml" -exec sh -c 'for f; do yq -o=json "$f" > "${f%.yml}.json"; done' sh {} +
 
 
-FROM logstash:8.17.0
+FROM logstash:8.17.1
 
 USER root
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]

diff --git a/projects/redrive-dead-letter-queues/container/Dockerfile b/projects/redrive-dead-letter-queues/container/Dockerfile
@@ -1,4 +1,4 @@
-FROM public.ecr.aws/aws-cli/aws-cli:2.23.2
+FROM public.ecr.aws/aws-cli/aws-cli:2.23.6
 
 USER root
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -74,16 +74,16 @@ dependencyResolutionManagement {
         create("libs") {
             library("asyncapi", "org.openfolder:kotlin-asyncapi-spring-web:3.0.4")
             library("aws-autoconfigure", "io.awspring.cloud:spring-cloud-aws-autoconfigure:3.3.0")
-            library("aws-query-protocol", "software.amazon.awssdk:aws-query-protocol:2.30.2")
+            library("aws-query-protocol", "software.amazon.awssdk:aws-query-protocol:2.30.6")
             library("aws-sns", "io.awspring.cloud:spring-cloud-aws-starter-sns:3.3.0")
             library("aws-sqs", "io.awspring.cloud:spring-cloud-aws-starter-sqs:3.3.0")
             library("aws-starter", "io.awspring.cloud:spring-cloud-aws-starter:3.3.0")
-            library("aws-sts", "software.amazon.awssdk:sts:2.30.2")
+            library("aws-sts", "software.amazon.awssdk:sts:2.30.6")
             library("azure-app-insights", "com.microsoft.azure:applicationinsights-web:3.6.2")
             library("azure-identity", "com.azure:azure-identity:1.15.0")
             library("flipt", "io.flipt:flipt-java:1.1.1")
             library("html2md", "com.vladsch.flexmark:flexmark-html2md-converter:0.64.8")
-            library("microsoft-graph", "com.microsoft.graph:microsoft-graph:6.25.1")
+            library("microsoft-graph", "com.microsoft.graph:microsoft-graph:6.26.0")
             library("mockito-inline", "org.mockito:mockito-inline:5.2.0")
             library("mockito-kotlin", "org.mockito.kotlin:mockito-kotlin:5.4.0")
             library("notify", "uk.gov.service.notify:notifications-java-client:5.2.1-RELEASE")
@@ -105,7 +105,7 @@ dependencyResolutionManagement {
     }
 }
 
-plugins { id("com.gradle.develocity") version "3.19" }
+plugins { id("com.gradle.develocity") version "3.19.1" }
 develocity {
     buildScan {
         publishing.onlyIf { !System.getenv("CI").isNullOrEmpty() }