Pārlūkot izejas kodu

Remove javax.inject

Issue gh-10501
Rob Winch 3 gadi atpakaļ
vecāks
revīzija
4b590ce31f

+ 1 - 0
dependencies/spring-security-dependencies.gradle

@@ -28,6 +28,7 @@ dependencies {
 		api "io.mockk:mockk:1.12.1"
 		api "io.projectreactor.tools:blockhound:1.0.6.RELEASE"
 		api "javax.annotation:jsr250-api:1.0"
+		api "jakarta.inject:jakarta.inject-api:1.0.5"
 		api "javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:1.2.2"
 		api "javax.servlet.jsp:javax.servlet.jsp-api:2.3.3"
 		api "javax.servlet:javax.servlet-api:4.0.1"

+ 2 - 0
openid/spring-security-openid.gradle

@@ -10,6 +10,7 @@ dependencies {
 	api project(':spring-security-web')
 	api('com.google.inject:guice') {
 		exclude group: 'aopalliance', module: 'aopalliance'
+		exclude group: 'javax.inject', module: 'javax.inject'
 	}
 	// openid4java has a compile time dep on guice with a group
 	// name which is different from the maven central one.
@@ -31,6 +32,7 @@ dependencies {
 		exclude group: 'commons-logging', module: 'commons-logging'
 	}
 
+	testImplementation "jakarta.inject:jakarta.inject-api"
 	testImplementation "org.assertj:assertj-core"
 	testImplementation "org.junit.jupiter:junit-jupiter-api"
 	testImplementation "org.junit.jupiter:junit-jupiter-params"