Merge branch 'main' into MAN-36-display-rar-description

ministryofjustice · Feb 3, 2025 · 01c8c8d · 01c8c8d
2 parents 1ed6451 + 1ffd820
commit 01c8c8d
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/.github/workflows/access.yml b/.github/workflows/access.yml
@@ -115,7 +115,7 @@ jobs:
         with:
           files: projects/${{ matrix.project }}/deploy/database/access.yml
 
-      - uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # v2
+      - uses: aws-actions/configure-aws-credentials@4fc4975a852c8cd99761e2de1f4ba73402e44dd9 # v2
         if: ${{ steps.check_file.outputs.files_exists == 'true' }}
         with:
           aws-region: eu-west-2

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -23,7 +23,7 @@ plugins {
 val agentDeps: Configuration by configurations.creating
 
 dependencies {
-    agentDeps("com.microsoft.azure:applicationinsights-agent:3.6.2")
+    agentDeps("com.microsoft.azure:applicationinsights-agent:3.7.0")
 }
 
 val copyAgentTask = project.tasks.register<Copy>("copyAgent") {

diff --git a/...erson-search-index-from-delius/container/pipelines/contact/index/ingest-pipeline.tpl.json b/...erson-search-index-from-delius/container/pipelines/contact/index/ingest-pipeline.tpl.json
@@ -6,7 +6,9 @@
         "tag": "Remove any repeated non-alphanumeric strings. The pattern looks for 2 or more non-alphanumeric characters surrounded by whitespace.",
         "field": "notes",
         "pattern": "(^|\\s)[^\\w\\s]{2,}(\\s|$)",
-        "replacement": " "
+        "replacement": " ",
+        "ignore_missing": true,
+        "ignore_failure": true
       }
     },
     {

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -74,26 +74,26 @@ 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.6")
+            library("aws-query-protocol", "software.amazon.awssdk:aws-query-protocol:2.30.11")
             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.6")
-            library("azure-app-insights", "com.microsoft.azure:applicationinsights-web:3.6.2")
+            library("aws-sts", "software.amazon.awssdk:sts:2.30.11")
+            library("azure-app-insights", "com.microsoft.azure:applicationinsights-web:3.7.0")
             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.26.0")
+            library("microsoft-graph", "com.microsoft.graph:microsoft-graph:6.27.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")
             library(
                 "opentelemetry-annotations",
                 "io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations:2.12.0"
             )
-            library("sentry", "io.sentry:sentry-spring-boot-starter-jakarta:8.0.0")
+            library("sentry", "io.sentry:sentry-spring-boot-starter-jakarta:8.1.0")
             library("springdoc", "org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.2")
-            library("wiremock", "org.wiremock:wiremock-standalone:3.10.0")
+            library("wiremock", "org.wiremock:wiremock-standalone:3.11.0")
 
             bundle(
                 "aws-messaging",