Skip to content

Commit

Permalink
Merge branch 'main' into whitesource-remediate/org.apache.httpcompone…
Browse files Browse the repository at this point in the history
…nts.core5-httpcore5-5.x

Signed-off-by: Daniel Widdis <[email protected]>
  • Loading branch information
dbwiddis committed Jul 8, 2024
2 parents 36856a6 + 0c09e3b commit b974567
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ dependencies {
resolutionStrategy {
force("com.google.guava:guava:33.2.1-jre") // CVE for 31.1, keep to force transitive dependencies
force("org.eclipse.platform:org.eclipse.core.runtime:3.31.0") // CVE for < 3.29.0
force("com.fasterxml.jackson.core:jackson-core:2.17.1") // Dependency Jar Hell
force("com.fasterxml.jackson.core:jackson-core:2.17.2") // Dependency Jar Hell
force("org.apache.httpcomponents.core5:httpcore5:5.2.5") // Dependency Jar Hell
}
}
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=544c35d6bd849ae8a5ed0bcea39ba677dc40f49df7d1835561582da2009b961d
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
distributionSha256Sum=a4b4158601f8636cdeeab09bd76afb640030bb5b144aafe261a5e8af027dc612
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
Expand Down

0 comments on commit b974567

Please sign in to comment.