Skip to content

Commit

Permalink
remove: unused dependencies
Browse files Browse the repository at this point in the history
- these deps are for MFA feature (which
has been removed)
- also: before, the code was using org.apache.httpcomponents:httpclient
but getting it indirectly via the MFA-related
deps (which this commit aims to remove);
hence, now need to directly declare org.apache.httpcomponents:httpclient
as a dependency.

[#186854489]
  • Loading branch information
peterhaochen47 committed Feb 8, 2024
1 parent c592473 commit 60640e8
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 7 deletions.
3 changes: 1 addition & 2 deletions dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ libraries.dumbster = "dumbster:dumbster:1.6"
libraries.eclipseJgit = "org.eclipse.jgit:org.eclipse.jgit:6.8.0.202311291450-r"
libraries.flywayCore = "org.flywaydb:flyway-core"
libraries.greenmail = "com.icegreen:greenmail:1.6.15"
libraries.googleAuth = "com.warrenstrange:googleauth:1.5.0"
libraries.guava = "com.google.guava:guava:${versions.guavaVersion}"
libraries.guavaTestLib = "com.google.guava:guava-testlib:${versions.guavaVersion}"
libraries.hamcrest = "org.hamcrest:hamcrest:${versions.hamcrestVersion}"
Expand Down Expand Up @@ -126,13 +125,13 @@ libraries.unboundIdLdapSdk = "com.unboundid:unboundid-ldapsdk"
libraries.unboundIdScimSdk = "com.unboundid.product.scim:scim-sdk:1.8.26"
libraries.velocity = "org.apache.velocity:velocity-engine-core:2.3"
libraries.xerces = "xerces:xercesImpl:2.12.2"
libraries.zxing = "com.google.zxing:javase:3.5.3"
libraries.nimbusJwt = "com.nimbusds:nimbus-jose-jwt:9.37.3"
libraries.xmlSecurity = "org.apache.santuario:xmlsec:4.0.1"
libraries.orgJson = "org.json:json:20240205"
libraries.owaspEsapi = "org.owasp.esapi:esapi:2.5.3.1"
libraries.jodaTime = "joda-time:joda-time:2.12.7"
libraries.commonsHttpClient = "commons-httpclient:commons-httpclient:3.1"
libraries.apacheHttpClient = "org.apache.httpcomponents:httpclient:4.5.14"

// gradle plugins
libraries.testRetryPlugin = "org.gradle:test-retry-gradle-plugin:1.5.8"
Expand Down
5 changes: 2 additions & 3 deletions server/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ dependencies {
implementation(libraries.jsonPath) {
exclude(module: "json-smart")
}
implementation(libraries.zxing)
implementation(libraries.springBeans)
implementation(libraries.springContext)
implementation(libraries.springContextSupport)
Expand Down Expand Up @@ -90,8 +89,6 @@ dependencies {
implementation(libraries.velocity)
implementation(libraries.xerces)

implementation(libraries.googleAuth)

implementation(libraries.slf4jImpl)
implementation(libraries.log4jCore)

Expand All @@ -101,6 +98,8 @@ dependencies {
implementation(libraries.nimbusJwt)
implementation(libraries.orgJson)

implementation(libraries.apacheHttpClient)

testImplementation(project(":cloudfoundry-identity-model").sourceSets.test.output)

testImplementation(libraries.springTest)
Expand Down
3 changes: 1 addition & 2 deletions uaa/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ dependencies {
exclude(module: "slf4j-api")
}
testImplementation(libraries.flywayCore)
testImplementation(libraries.googleAuth)
testImplementation(libraries.hibernateValidator)
testImplementation(libraries.junit)
testImplementation(libraries.selenium)
Expand All @@ -74,7 +73,6 @@ dependencies {
exclude(module: "mail")
exclude(module: "activation")
}
testImplementation(libraries.zxing)
testImplementation(libraries.jsonAssert)
testImplementation(libraries.jsonPathAssert)
testImplementation(libraries.unboundIdScimSdk) {
Expand All @@ -99,6 +97,7 @@ dependencies {
testImplementation(libraries.commonsIo)
testImplementation(libraries.commonsHttpClient)
testImplementation(libraries.owaspEsapi)
testImplementation(libraries.apacheHttpClient)
}

ext {
Expand Down

0 comments on commit 60640e8

Please sign in to comment.