move servlet to version catalog and downgrade to 5.0 for java 8 compa…

…tibility
dropbox · Jul 18, 2023 · 3184ec8 · 3184ec8
1 parent e1ab494
commit 3184ec8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/dropbox-sdk-java/build.gradle b/dropbox-sdk-java/build.gradle
@@ -41,7 +41,7 @@ dependencies {
     // Android
     compileOnly 'com.google.android:android:4.1.1.4' // Until 6.x when we have an Android Artifact
     compileOnly(dropboxJavaSdkLibs.kotlin.stdlib) // Only used in Android Code
-    compileOnly("jakarta.servlet:jakarta.servlet-api:6.0.0")
+    compileOnly(dropboxJavaSdkLibs.jakarta.servlet.api)
     compileOnly(dropboxJavaSdkLibs.okhttp2)  // support both v2 and v3 to avoid
     compileOnly(dropboxJavaSdkLibs.okhttp3) // method count bloat
     compileOnly(dropboxJavaSdkLibs.appengine.api)

diff --git a/examples/examples/build.gradle b/examples/examples/build.gradle
@@ -13,7 +13,7 @@ java {
 dependencies {
     implementation(project(":dropbox-sdk-java"))
     implementation("org.eclipse.jetty:jetty-server:11.0.15")
-    implementation("jakarta.servlet:jakarta.servlet-api:6.0.0")
+    implementation(dropboxJavaSdkLibs.jakarta.servlet.api)
     implementation("org.apache.commons:commons-lang3:3.4")
     implementation(dropboxJavaSdkLibs.jackson.core)
     implementation("com.fasterxml.jackson.core:jackson-databind:2.15.0")

diff --git a/gradle/dropboxJavaSdkLibs.versions.toml b/gradle/dropboxJavaSdkLibs.versions.toml
@@ -22,6 +22,7 @@ androidx-recyclerview = 'androidx.recyclerview:recyclerview:1.2.1'
 appengine-api = 'com.google.appengine:appengine-api-1.0-sdk:1.9.38'
 glide = 'com.github.bumptech.glide:glide:4.12.0'
 jackson-core = 'com.fasterxml.jackson.core:jackson-core:2.15.0'
+jakarta-servlet-api = 'jakarta.servlet:jakarta.servlet-api:5.0.0'
 kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
 kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
 kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }