Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
## 5.4.5 (TBD - Unreleased)
- Update jackson-core to 2.15.0 [#492](https://github.com/dropbox/dropbox-sdk-java/issues/476)

## 5.4.4 (2022-10-17)
---------------------------------------------
- [Downgrade target back down to Java 1.8 as requested by a user. #476](https://github.com/dropbox/dropbox-sdk-java/issues/476)
Expand Down
4 changes: 3 additions & 1 deletion dropbox-sdk-java/dependencies/runtimeClasspath.txt
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
com.fasterxml.jackson.core:jackson-core:2.7.9
ch.randelshofer:fastdoubleparser:0.8.0
com.fasterxml.jackson.core:jackson-core:2.15.0
com.fasterxml.jackson:jackson-bom:2.15.0
4 changes: 3 additions & 1 deletion examples/android/dependencies/releaseRuntimeClasspath.txt
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,9 @@ androidx.vectordrawable:vectordrawable:1.1.0
androidx.versionedparcelable:versionedparcelable:1.1.1
androidx.viewpager2:viewpager2:1.0.0
androidx.viewpager:viewpager:1.0.0
com.fasterxml.jackson.core:jackson-core:2.7.9
ch.randelshofer:fastdoubleparser:0.8.0
com.fasterxml.jackson.core:jackson-core:2.15.0
com.fasterxml.jackson:jackson-bom:2.15.0
com.github.bumptech.glide:annotations:4.12.0
com.github.bumptech.glide:disklrucache:4.12.0
com.github.bumptech.glide:gifdecoder:4.12.0
Expand Down
4 changes: 2 additions & 2 deletions examples/examples/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ dependencies {
implementation("org.eclipse.jetty.aggregate:jetty-server:8.1.18.v20150929")
implementation("javax.servlet:javax.servlet-api:3.1.0")
implementation("org.apache.commons:commons-lang3:3.4")
implementation("com.fasterxml.jackson.core:jackson-core:2.7.9")
implementation("com.fasterxml.jackson.core:jackson-databind:2.7.4")
implementation(dropboxJavaSdkLibs.jackson.core)
implementation("com.fasterxml.jackson.core:jackson-databind:2.15.0")
implementation(dropboxJavaSdkLibs.okhttp3)
implementation("org.json:json:20220320")

Expand Down
4 changes: 3 additions & 1 deletion examples/java/dependencies/compileClasspath.txt
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
com.fasterxml.jackson.core:jackson-core:2.7.9
ch.randelshofer:fastdoubleparser:0.8.0
com.fasterxml.jackson.core:jackson-core:2.15.0
com.fasterxml.jackson:jackson-bom:2.15.0
4 changes: 3 additions & 1 deletion examples/java/dependencies/runtimeClasspath.txt
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
com.fasterxml.jackson.core:jackson-core:2.7.9
ch.randelshofer:fastdoubleparser:0.8.0
com.fasterxml.jackson.core:jackson-core:2.15.0
com.fasterxml.jackson:jackson-bom:2.15.0
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ org.gradle.unsafe.configuration-cache=false
# Use AndroidX
android.useAndroidX=true

org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -Dfile.encoding=UTF-8
org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
2 changes: 1 addition & 1 deletion gradle/dropboxJavaSdkLibs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ androidx-lifecycle-runtime-ktx = "androidx.lifecycle:lifecycle-runtime-ktx:2.5.1
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.7.9'
jackson-core = 'com.fasterxml.jackson.core:jackson-core:2.15.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" }
Expand Down