Skip to content

Commit f670a51

Browse files
authored
Merge pull request #115 from hmcts/feat/amp-150-update-dependency
fix:amp-150 update dependency
2 parents ae20036 + cb6ee20 commit f670a51

File tree

6 files changed

+23
-31
lines changed

6 files changed

+23
-31
lines changed

.github/workflows/ci-build-publish.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
artefact_version: ${{ inputs.is_release && steps.artefact.outputs.release_version || steps.artefact.outputs.draft_version }}
3838
steps:
3939
- name: Checkout code
40-
uses: actions/checkout@v5
40+
uses: actions/checkout@v6
4141
with:
4242
fetch-depth: 0
4343

@@ -59,7 +59,7 @@ jobs:
5959
artefact_name: ${{ steps.repo_vars.outputs.artefact_name }}
6060
steps:
6161
- name: Checkout source code
62-
uses: actions/checkout@v5
62+
uses: actions/checkout@v6
6363

6464
- name: Set up JDK
6565
uses: actions/setup-java@v5
@@ -117,7 +117,7 @@ jobs:
117117
echo "artefact_name=${repo_name}-${{ needs.Artefact-Version.outputs.artefact_version }}" >> $GITHUB_OUTPUT
118118
119119
- name: Upload JAR Artefact
120-
uses: actions/upload-artifact@v4
120+
uses: actions/upload-artifact@v6
121121
with:
122122
name: app.jar
123123
path: build/libs/${{ steps.repo_vars.outputs.artefact_name }}.jar
@@ -130,10 +130,10 @@ jobs:
130130
name: ${{ inputs.environment }}
131131
steps:
132132
- name: Checkout Code
133-
uses: actions/checkout@v5
133+
uses: actions/checkout@v6
134134

135135
- name: Download JAR Artefact
136-
uses: actions/download-artifact@v5
136+
uses: actions/download-artifact@v6
137137
with:
138138
name: app.jar
139139
path: build/libs

.github/workflows/code-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
pmd-analysis:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v5
13+
- uses: actions/checkout@v6
1414
with:
1515
fetch-depth: 0
1616

.github/workflows/codeql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626

2727
steps:
2828
- name: Checkout repository
29-
uses: actions/checkout@v5
29+
uses: actions/checkout@v6
3030

3131
- name: Initialize CodeQL
3232
uses: github/codeql-action/init@v4
@@ -73,7 +73,7 @@ jobs:
7373
# - It's available to download and inspect from the GitHub Actions UI
7474
- name: Upload SBOM
7575
if: always()
76-
uses: actions/upload-artifact@v4
76+
uses: actions/upload-artifact@v6
7777
with:
7878
name: sbom
7979
path: build/resources/main/META-INF/sbom/application.cdx.json

.github/workflows/secret-scanning.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
scan:
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v5
15+
- uses: actions/checkout@v6
1616
with:
1717
fetch-depth: 0
1818

build.gradle

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@ plugins {
55
id 'org.springframework.boot' version '4.0.0'
66
id 'jacoco'
77
id 'maven-publish'
8-
id "com.github.ben-manes.versions" version "0.52.0"
9-
id "org.cyclonedx.bom" version "2.3.1"
10-
id 'com.gorylenko.gradle-git-properties' version '2.5.4'
8+
id "com.github.ben-manes.versions" version "0.53.0"
9+
id "org.cyclonedx.bom" version "3.1.0"
1110
}
1211

1312
group = 'uk.gov.hmcts.cp'
@@ -30,11 +29,14 @@ ext {
3029
logbackVersion = "1.5.18"
3130
lombokVersion = "1.18.38"
3231
}
33-
32+
cyclonedxBom {
33+
schemaVersion = org.cyclonedx.Version.VERSION_16
34+
componentVersion = project.version.toString()
35+
}
3436
dependencies {
3537
implementation "uk.gov.hmcts.cp:api-cp-caseadmin-case-urn-mapper:$apiCaseUrnMapperVersion"
3638
implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:3.0.0'
37-
implementation 'io.swagger.core.v3:swagger-core:2.2.36'
39+
implementation 'io.swagger.core.v3:swagger-core:2.2.41'
3840
implementation 'javax.xml.bind:jaxb-api:2.3.1'
3941
implementation 'org.springframework.boot:spring-boot-starter-cache'
4042

@@ -48,16 +50,13 @@ dependencies {
4850
implementation 'io.micrometer:micrometer-tracing'
4951
implementation 'io.micrometer:micrometer-tracing-bridge-otel'
5052
// Spring Boot 4 will auto-configure OpenTelemetry when management.tracing.enabled=true
51-
implementation 'io.micrometer:micrometer-registry-azure-monitor'
52-
implementation 'com.azure:azure-monitor-opentelemetry-autoconfigure:1.3.0'
53-
54-
implementation 'net.logstash.logback:logstash-logback-encoder:8.1'
55-
56-
implementation group: 'io.rest-assured', name: 'rest-assured', version: '5.5.6'
57-
implementation 'org.hibernate.validator:hibernate-validator:9.0.1.Final'
58-
implementation 'org.apache.commons:commons-text:1.14.0'
53+
implementation 'com.azure:azure-monitor-opentelemetry-autoconfigure:1.4.0'
54+
implementation 'net.logstash.logback:logstash-logback-encoder:9.0'
55+
implementation group: 'io.rest-assured', name: 'rest-assured', version: '6.0.0'
56+
implementation 'org.hibernate.validator:hibernate-validator:9.1.0.Final'
5957

60-
implementation 'com.fasterxml.jackson.core:jackson-databind:2.20.0'
58+
implementation 'org.apache.commons:commons-text:1.15.0'
59+
implementation 'com.fasterxml.jackson.core:jackson-databind:2.20.1'
6160
implementation("org.owasp.encoder:encoder:1.4.0")
6261
compileOnly group: 'org.projectlombok', name: 'lombok', version: lombokVersion
6362
annotationProcessor group: 'org.projectlombok', name: 'lombok', version: lombokVersion
@@ -66,7 +65,7 @@ dependencies {
6665
integrationTestCompileOnly group: 'org.projectlombok', name: 'lombok', version: lombokVersion
6766
integrationTestAnnotationProcessor group: 'org.projectlombok', name: 'lombok', version: lombokVersion
6867

69-
testImplementation(platform('org.junit:junit-bom:5.13.4'))
68+
testImplementation(platform('org.junit:junit-bom:6.0.1'))
7069
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
7170
testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: '4.0.0', {
7271
exclude group: 'junit', module: 'junit'

gradle/integration.gradle

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,3 @@ tasks.named('build') {
6565
dependsOn tasks.named('test')
6666
dependsOn tasks.named('integration')
6767
}
68-
cyclonedxBom {
69-
includeConfigs = ["runtimeClasspath"]
70-
skipConfigs = ["compileClasspath", "testImplementation"]
71-
schemaVersion = "1.6"
72-
componentVersion = providers.provider { project.version.toString() }
73-
destination = file("$buildDir/reports")
74-
}

0 commit comments

Comments
 (0)