diff --git a/CHANGELOG.md b/CHANGELOG.md index 1a792602f..176f5ecde 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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) diff --git a/dropbox-sdk-java/dependencies/runtimeClasspath.txt b/dropbox-sdk-java/dependencies/runtimeClasspath.txt index ef179b8dd..9f215f930 100644 --- a/dropbox-sdk-java/dependencies/runtimeClasspath.txt +++ b/dropbox-sdk-java/dependencies/runtimeClasspath.txt @@ -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 diff --git a/examples/android/dependencies/releaseRuntimeClasspath.txt b/examples/android/dependencies/releaseRuntimeClasspath.txt index 6621d2bdd..1a1032fa0 100644 --- a/examples/android/dependencies/releaseRuntimeClasspath.txt +++ b/examples/android/dependencies/releaseRuntimeClasspath.txt @@ -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 diff --git a/examples/examples/build.gradle b/examples/examples/build.gradle index d004c5a8b..fa18f1fd3 100644 --- a/examples/examples/build.gradle +++ b/examples/examples/build.gradle @@ -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") diff --git a/examples/java/dependencies/compileClasspath.txt b/examples/java/dependencies/compileClasspath.txt index ef179b8dd..9f215f930 100644 --- a/examples/java/dependencies/compileClasspath.txt +++ b/examples/java/dependencies/compileClasspath.txt @@ -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 diff --git a/examples/java/dependencies/runtimeClasspath.txt b/examples/java/dependencies/runtimeClasspath.txt index ef179b8dd..9f215f930 100644 --- a/examples/java/dependencies/runtimeClasspath.txt +++ b/examples/java/dependencies/runtimeClasspath.txt @@ -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 diff --git a/gradle.properties b/gradle.properties index 17b44c8f3..4fcce8b62 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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 diff --git a/gradle/dropboxJavaSdkLibs.versions.toml b/gradle/dropboxJavaSdkLibs.versions.toml index 274436a83..676044c7c 100644 --- a/gradle/dropboxJavaSdkLibs.versions.toml +++ b/gradle/dropboxJavaSdkLibs.versions.toml @@ -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" }