Skip to content

Commit 65dfad7

Browse files
authored
Merge pull request #11 from rundeck-plugins/cve-updates
CVE Fixes
2 parents 2a9fcd8 + 00a224d commit 65dfad7

2 files changed

Lines changed: 27 additions & 1 deletion

File tree

build.gradle

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,16 @@ repositories {
2020
maven { url "https://repo.grails.org/grails/core" }
2121
}
2222

23+
configurations.all {
24+
resolutionStrategy {
25+
// Force secure versions to override vulnerable transitive dependencies
26+
force libs.commonsIo.get()
27+
force libs.commonsText.get()
28+
force libs.commonsLang3.get()
29+
force libs.junitOverride.get()
30+
}
31+
}
32+
2333
sourceCompatibility = 11
2434
targetCompatibility = 11
2535

@@ -133,7 +143,11 @@ project.pluginZip.dependsOn assetCompile
133143
project.pluginZip.mustRunAfter assetCompile
134144

135145
dependencies {
136-
implementation libs.sassAssetPipeline
146+
implementation(libs.sassAssetPipeline) {
147+
// Exclude problematic dependencies that cannot be safely upgraded
148+
exclude group: 'org.sharegov', module: 'mjson'
149+
exclude group: 'org.mozilla', module: 'rhino'
150+
}
137151
}
138152

139153
artifacts {

gradle/libs.versions.toml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,21 @@ asset-pipeline = "3.4.0"
33
sass-asset-pipeline = "3.4.0"
44
axion-release = "1.18.12"
55

6+
# Security override versions
7+
commons-io = "2.15.0"
8+
commons-text = "1.12.0"
9+
commons-lang3 = "3.18.0"
10+
junit = "4.13.2"
11+
612
[libraries]
713
assetPipeline = { module = "com.bertramlabs.plugins:asset-pipeline-gradle", version.ref = "asset-pipeline" }
814
sassAssetPipeline = { module = "com.bertramlabs.plugins:sass-asset-pipeline", version.ref = "sass-asset-pipeline" }
915

16+
# Security override libraries
17+
commonsIo = { module = "commons-io:commons-io", version.ref = "commons-io" }
18+
commonsText = { module = "org.apache.commons:commons-text", version.ref = "commons-text" }
19+
commonsLang3 = { module = "org.apache.commons:commons-lang3", version.ref = "commons-lang3" }
20+
junitOverride = { module = "junit:junit", version.ref = "junit" }
21+
1022
[plugins]
1123
axionRelease = { id = "pl.allegro.tech.build.axion-release", version.ref = "axion-release" }

0 commit comments

Comments
 (0)