From 58090c37eacc8d6816e18bcdbdfeba9750dc46f4 Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Wed, 19 Jan 2022 13:57:06 -0600 Subject: [PATCH] jsr250-api -> jakarta.annotation-api Issue gh-10501 --- config/spring-security-config.gradle | 4 ++-- core/spring-security-core.gradle | 2 +- dependencies/spring-security-dependencies.gradle | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/spring-security-config.gradle b/config/spring-security-config.gradle index c8de40593f..b6e1a5b007 100644 --- a/config/spring-security-config.gradle +++ b/config/spring-security-config.gradle @@ -37,7 +37,7 @@ dependencies { optional'org.springframework:spring-websocket' optional 'org.jetbrains.kotlin:kotlin-reflect' optional 'org.jetbrains.kotlin:kotlin-stdlib-jdk8' - optional 'javax.annotation:jsr250-api' + optional 'jakarta.annotation:jakarta.annotation-api' provided 'jakarta.servlet:jakarta.servlet-api' @@ -62,7 +62,7 @@ dependencies { testImplementation 'ch.qos.logback:logback-classic' testImplementation 'io.projectreactor.netty:reactor-netty' testImplementation 'io.rsocket:rsocket-transport-netty' - testImplementation 'javax.annotation:jsr250-api:1.0' + testImplementation 'jakarta.annotation:jakarta.annotation-api:1.0' testImplementation 'jakarta.xml.bind:jakarta.xml.bind-api' testImplementation 'ldapsdk:ldapsdk:4.1' testImplementation('net.sourceforge.htmlunit:htmlunit') { diff --git a/core/spring-security-core.gradle b/core/spring-security-core.gradle index 06b9700e14..3f135f759f 100644 --- a/core/spring-security-core.gradle +++ b/core/spring-security-core.gradle @@ -13,7 +13,7 @@ dependencies { optional 'com.fasterxml.jackson.core:jackson-databind' optional 'io.projectreactor:reactor-core' - optional 'javax.annotation:jsr250-api' + optional 'jakarta.annotation:jakarta.annotation-api' optional 'net.sf.ehcache:ehcache' optional 'org.aspectj:aspectjrt' optional 'org.springframework:spring-jdbc' diff --git a/dependencies/spring-security-dependencies.gradle b/dependencies/spring-security-dependencies.gradle index 319c244310..5d047e79f4 100644 --- a/dependencies/spring-security-dependencies.gradle +++ b/dependencies/spring-security-dependencies.gradle @@ -27,8 +27,8 @@ dependencies { api "commons-collections:commons-collections:3.2.2" 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 "jakarta.annotation:jakarta.annotation-api:1.3.5" api "jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api:1.2.7" api "jakarta.servlet.jsp:jakarta.servlet.jsp-api:2.3.6" api "jakarta.servlet:jakarta.servlet-api:4.0.4"