Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into ab_PI-2889
Browse files Browse the repository at this point in the history
  • Loading branch information
anthony-britton-moj committed Mar 3, 2025
2 parents 929e911 + 53d6352 commit bb899cc
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ jobs:

- name: Push images
if: env.push == 'true'
uses: nick-fields/retry@c97818ca39074beaea45180dba704f92496a0082 # v3.0.1
uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3.0.2
with:
max_attempts: 3 # Pushing lots of new image versions at once can result in GitHub rate-limiting so we retry this step
timeout_minutes: 15
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
java-version: '21'
distribution: 'temurin'

- uses: gradle-update/update-gradle-wrapper-action@9cca748ef7cfd967bc3a5c39e15a7aa229ad1b3d # v2.0.1
- uses: gradle-update/update-gradle-wrapper-action@512b1875f3b6270828abfe77b247d5895a2da1e5 # v2.1.0
with:
labels: dependencies
repo-token: ${{ steps.app-token.outputs.token }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/readonly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ jobs:
run: kubectl scale deploy '${{ matrix.project }}' --replicas "${{ inputs.action == 'enable' && '0' || '2' }}"

- name: ${{ inputs.action == 'enable' && 'Block' || 'Unblock' }} ingresses
uses: nick-fields/retry@c97818ca39074beaea45180dba704f92496a0082 # v3.0.1
uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3.0.2
with:
max_attempts: 3 # Patching ingresses intermittently fails on MOJ Cloud Platform, so we retry this step
timeout_minutes: 15
Expand Down Expand Up @@ -152,7 +152,7 @@ jobs:

- name: Block updates
if: inputs.action == 'enable' && matrix.project != 'hmpps-auth-and-delius' && matrix.project != 'probation-search-and-delius' && matrix.project != 'feature-flags' # Note: hmpps-auth is excluded here to continue allowing 'POST /authenticate' requests, which are read-only
uses: nick-fields/retry@c97818ca39074beaea45180dba704f92496a0082 # v3.0.1
uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3.0.2
with:
max_attempts: 3 # Patching ingresses intermittently fails on MOJ Cloud Platform, so we retry this step
timeout_minutes: 15
Expand All @@ -174,7 +174,7 @@ jobs:
- name: Unblock updates
if: inputs.action == 'disable' && matrix.project != 'hmpps-auth-and-delius' && matrix.project != 'probation-search-and-delius' && matrix.project != 'feature-flags'
uses: nick-fields/retry@c97818ca39074beaea45180dba704f92496a0082 # v3.0.1
uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3.0.2
with:
max_attempts: 3 # Patching ingresses intermittently fails on MOJ Cloud Platform, so we retry this step
timeout_minutes: 15
Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ plugins {
val agentDeps: Configuration by configurations.creating

dependencies {
agentDeps("com.microsoft.azure:applicationinsights-agent:3.7.0")
agentDeps("com.microsoft.azure:applicationinsights-agent:3.7.1")
}

val copyAgentTask = project.tasks.register<Copy>("copyAgent") {
Expand Down
14 changes: 7 additions & 7 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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.26")
library("aws-query-protocol", "software.amazon.awssdk:aws-query-protocol:2.30.31")
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.26")
library("azure-app-insights", "com.microsoft.azure:applicationinsights-web:3.7.0")
library("aws-sts", "software.amazon.awssdk:sts:2.30.31")
library("azure-app-insights", "com.microsoft.azure:applicationinsights-web:3.7.1")
library("azure-identity", "com.azure:azure-identity:1.15.3")
library("flipt", "io.flipt:flipt-java:1.1.2")
library("html2md", "com.vladsch.flexmark:flexmark-html2md-converter:0.64.8")
library("microsoft-graph", "com.microsoft.graph:microsoft-graph:6.29.0")
library("microsoft-graph", "com.microsoft.graph:microsoft-graph:6.30.1")
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.13.1"
"io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations:2.13.3"
)
library("sentry", "io.sentry:sentry-spring-boot-starter-jakarta:8.2.0")
library("sentry", "io.sentry:sentry-spring-boot-starter-jakarta:8.3.0")
library("springdoc", "org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.5")
library("wiremock", "org.wiremock:wiremock-standalone:3.12.0")
library("wiremock", "org.wiremock:wiremock-standalone:3.12.1")

bundle(
"aws-messaging",
Expand Down

0 comments on commit bb899cc

Please sign in to comment.