commit 172ad9b5b02db726328623e9313c149e9c4fb356
author Bogdan Drutu <lazy@splunk.com> Wed Apr 26 17:45:30 2023 -0700
committer GitHub <noreply@github.com> Thu Apr 27 08:45:30 2023 +0800
tree 9cf6b2092db1b91c9dbc3c2e283b416f7e16e830
parent 67de2f5542c45abf07519ea600414f86273c51f0

Migration to JakartaEE 8 (#2777)

Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com>
Co-authored-by: Jiayu Liu <Jimexist@users.noreply.github.com>

lib/java/gradle.properties

diff --git a/lib/java/gradle.properties b/lib/java/gradle.properties
index 4256dbd..bfd5c22 100644
--- a/lib/java/gradle.properties
+++ b/lib/java/gradle.properties
@@ -28,11 +28,11 @@
 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 \

lib/java/gradle/environment.gradle

diff --git a/lib/java/gradle/environment.gradle b/lib/java/gradle/environment.gradle
index cb61c05..8c14a52 100644
--- a/lib/java/gradle/environment.gradle
+++ b/lib/java/gradle/environment.gradle
@@ -63,8 +63,8 @@
     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}"