summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBogdan Drutu <lazy@splunk.com>2023-04-26 17:45:30 -0700
committerGitHub <noreply@github.com>2023-04-27 08:45:30 +0800
commit172ad9b5b02db726328623e9313c149e9c4fb356 (patch)
tree9cf6b2092db1b91c9dbc3c2e283b416f7e16e830
parent67de2f5542c45abf07519ea600414f86273c51f0 (diff)
downloadthrift-172ad9b5b02db726328623e9313c149e9c4fb356.tar.gz
Migration to JakartaEE 8 (#2777)
Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com> Co-authored-by: Jiayu Liu <Jimexist@users.noreply.github.com>
-rw-r--r--lib/java/gradle.properties4
-rw-r--r--lib/java/gradle/environment.gradle4
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/java/gradle.properties b/lib/java/gradle.properties
index 4256dbd47..bfd5c22cb 100644
--- a/lib/java/gradle.properties
+++ b/lib/java/gradle.properties
@@ -28,11 +28,11 @@ maven-repository-id=apache.releases.https
httpclient.version=4.5.13
httpcore.version=4.4.15
slf4j.version=1.7.36
-servlet.version=4.0.1
+servlet.version=4.0.3
tomcat.embed.version=9.0.43
junit.version=5.8.2
mockito.version=5.3.0
-javax.annotation.version=1.3.2
+javax.annotation.version=1.3.5
commons-lang3.version=3.12.0
org.gradle.jvmargs=--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
diff --git a/lib/java/gradle/environment.gradle b/lib/java/gradle/environment.gradle
index cb61c05fc..8c14a5209 100644
--- a/lib/java/gradle/environment.gradle
+++ b/lib/java/gradle/environment.gradle
@@ -63,8 +63,8 @@ dependencies {
implementation "org.slf4j:slf4j-api:${slf4jVersion}"
implementation "org.apache.httpcomponents:httpclient:${httpclientVersion}"
implementation "org.apache.httpcomponents:httpcore:${httpcoreVersion}"
- implementation "javax.servlet:javax.servlet-api:${servletVersion}"
- implementation "javax.annotation:javax.annotation-api:${javaxAnnotationVersion}"
+ implementation "jakarta.servlet:jakarta.servlet-api:${servletVersion}"
+ implementation "jakarta.annotation:jakarta.annotation-api:${javaxAnnotationVersion}"
implementation "org.apache.commons:commons-lang3:${commonsLang3Version}"
testImplementation "org.junit.jupiter:junit-jupiter:${junitVersion}"