Skip to content

Commit

Permalink
plugins & gradle upgrade
Browse files Browse the repository at this point in the history
transitive dependency substitution (mina-core)
  • Loading branch information
lumber1000 committed Sep 4, 2024
1 parent 2dc5e0d commit 73c160d
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM gradle:7.6-jdk11 AS build
FROM gradle:8.7-jdk11 AS build
COPY ./ .
RUN gradle --no-daemon clean dockerPrepare

Expand Down
16 changes: 11 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ import com.github.jk1.license.filter.LicenseBundleNormalizer
import com.github.jk1.license.render.JsonReportRenderer

plugins {
id 'com.palantir.docker' version '0.25.0' apply false
id 'org.owasp.dependencycheck' version '8.3.1'
id 'com.gorylenko.gradle-git-properties' version '2.4.1' apply false
id 'com.github.jk1.dependency-license-report' version '2.5' apply false
id 'de.undercouch.download' version '5.4.0' apply false
id 'com.palantir.docker' version '0.36.0' apply false
id 'org.owasp.dependencycheck' version '10.0.4'
id 'com.gorylenko.gradle-git-properties' version '2.4.2' apply false
id 'com.github.jk1.dependency-license-report' version '2.9' apply false
id 'de.undercouch.download' version '5.6.0' apply false
}

subprojects {
Expand Down Expand Up @@ -83,6 +83,12 @@ subprojects {
exclude module: 'sailfish-core'
exclude module: 'sailfish-common'
}

configureEach.resolutionStrategy.dependencySubstitution {
substitute(module('org.apache.mina:mina-core:2.0.21'))
.using(module('org.apache.mina:mina-core:2.0.25'))
.because("vulnerability in transitive dependency in transitive dependency of sailfish 3.3.241")
}
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#Tue Apr 14 11:21:33 MSK 2020
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
Expand Down

0 comments on commit 73c160d

Please sign in to comment.