Skip to content

Commit c6e4b34

Browse files
committed
CDPS-1096: Reverting to use Kotlin 2.0.21
1 parent 33bbc76 commit c6e4b34

5 files changed

+5
-9
lines changed

.github/workflows/security_owasp.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
jobs:
77
security-kotlin-owasp-check:
88
name: Kotlin security OWASP dependency check
9-
uses: ministryofjustice/hmpps-github-actions/.github/workflows/security_owasp.yml@v1 # WORKFLOW_VERSION
9+
uses: ministryofjustice/hmpps-github-actions/.github/workflows/security_owasp.yml@v2 # WORKFLOW_VERSION
1010
with:
1111
channel_id: ${{ vars.SECURITY_ALERTS_SLACK_CHANNEL_ID || 'NO_SLACK' }}
1212
secrets: inherit

.github/workflows/security_trivy.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
jobs:
77
security-kotlin-trivy-check:
88
name: Project security trivy dependency check
9-
uses: ministryofjustice/hmpps-github-actions/.github/workflows/security_trivy.yml@v1 # WORKFLOW_VERSION
9+
uses: ministryofjustice/hmpps-github-actions/.github/workflows/security_trivy.yml@v2 # WORKFLOW_VERSION
1010
with:
1111
channel_id: ${{ vars.SECURITY_ALERTS_SLACK_CHANNEL_ID || 'NO_SLACK' }}
1212
secrets: inherit

.github/workflows/security_veracode_pipeline_scan.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
jobs:
77
security-veracode-pipeline-scan:
88
name: Project security veracode pipeline scan
9-
uses: ministryofjustice/hmpps-github-actions/.github/workflows/security_veracode_pipeline_scan.yml@v1 # WORKFLOW_VERSION
9+
uses: ministryofjustice/hmpps-github-actions/.github/workflows/security_veracode_pipeline_scan.yml@v2 # WORKFLOW_VERSION
1010
with:
1111
channel_id: ${{ vars.SECURITY_ALERTS_SLACK_CHANNEL_ID || 'NO_SLACK' }}
1212
secrets: inherit

.github/workflows/security_veracode_policy_scan.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
jobs:
77
security-veracode-policy-check:
88
name: Project security veracode policy scan
9-
uses: ministryofjustice/hmpps-github-actions/.github/workflows/security_veracode_policy_scan.yml@v1 # WORKFLOW_VERSION
9+
uses: ministryofjustice/hmpps-github-actions/.github/workflows/security_veracode_policy_scan.yml@v2 # WORKFLOW_VERSION
1010
with:
1111
channel_id: ${{ vars.SECURITY_ALERTS_SLACK_CHANNEL_ID || 'NO_SLACK' }}
1212
secrets: inherit

build.gradle.kts

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
id("uk.gov.justice.hmpps.gradle-spring-boot") version "6.1.2"
3-
kotlin("plugin.spring") version "2.1.0"
3+
kotlin("plugin.spring") version "2.0.21"
44
}
55

66
configurations {
@@ -23,10 +23,6 @@ kotlin {
2323
jvmToolchain(21)
2424
}
2525

26-
ktlint {
27-
version.set("1.5.0")
28-
}
29-
3026
tasks {
3127
withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
3228
compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_21

0 commit comments

Comments
 (0)