From d02546e1cb6add93808f58b22f31f03e21fae4c7 Mon Sep 17 00:00:00 2001 From: Jay Palacio Date: Mon, 24 Apr 2023 15:19:53 -0400 Subject: [PATCH 1/7] bump jackson to 2.14.2 --- dropbox-sdk-java/dependencies/runtimeClasspath.txt | 3 ++- examples/android/dependencies/releaseRuntimeClasspath.txt | 3 ++- examples/java/dependencies/compileClasspath.txt | 3 ++- examples/java/dependencies/runtimeClasspath.txt | 3 ++- gradle.properties | 2 +- gradle/dropboxJavaSdkLibs.versions.toml | 2 +- 6 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dropbox-sdk-java/dependencies/runtimeClasspath.txt b/dropbox-sdk-java/dependencies/runtimeClasspath.txt index ef179b8dd..e08f982d9 100644 --- a/dropbox-sdk-java/dependencies/runtimeClasspath.txt +++ b/dropbox-sdk-java/dependencies/runtimeClasspath.txt @@ -1 +1,2 @@ -com.fasterxml.jackson.core:jackson-core:2.7.9 +com.fasterxml.jackson.core:jackson-core:2.14.2 +com.fasterxml.jackson:jackson-bom:2.14.2 diff --git a/examples/android/dependencies/releaseRuntimeClasspath.txt b/examples/android/dependencies/releaseRuntimeClasspath.txt index 6621d2bdd..6361408db 100644 --- a/examples/android/dependencies/releaseRuntimeClasspath.txt +++ b/examples/android/dependencies/releaseRuntimeClasspath.txt @@ -46,7 +46,8 @@ 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 +com.fasterxml.jackson.core:jackson-core:2.14.2 +com.fasterxml.jackson:jackson-bom:2.14.2 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/java/dependencies/compileClasspath.txt b/examples/java/dependencies/compileClasspath.txt index ef179b8dd..e08f982d9 100644 --- a/examples/java/dependencies/compileClasspath.txt +++ b/examples/java/dependencies/compileClasspath.txt @@ -1 +1,2 @@ -com.fasterxml.jackson.core:jackson-core:2.7.9 +com.fasterxml.jackson.core:jackson-core:2.14.2 +com.fasterxml.jackson:jackson-bom:2.14.2 diff --git a/examples/java/dependencies/runtimeClasspath.txt b/examples/java/dependencies/runtimeClasspath.txt index ef179b8dd..e08f982d9 100644 --- a/examples/java/dependencies/runtimeClasspath.txt +++ b/examples/java/dependencies/runtimeClasspath.txt @@ -1 +1,2 @@ -com.fasterxml.jackson.core:jackson-core:2.7.9 +com.fasterxml.jackson.core:jackson-core:2.14.2 +com.fasterxml.jackson:jackson-bom:2.14.2 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..07ad6289e 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.14.2' 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" } From 45a0ff3e803b045a1ded0a0f20371681d00213bc Mon Sep 17 00:00:00 2001 From: Jay Palacio Date: Tue, 25 Apr 2023 09:54:33 -0400 Subject: [PATCH 2/7] bump our examples too --- examples/examples/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/examples/build.gradle b/examples/examples/build.gradle index d004c5a8b..da71add48 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("com.fasterxml.jackson.core:jackson-core:2.14.2") + implementation("com.fasterxml.jackson.core:jackson-databind:2.14.2") implementation(dropboxJavaSdkLibs.okhttp3) implementation("org.json:json:20220320") From 5ac1b7cc7f56fa6499e3266fa6e1319a8fc0f8a2 Mon Sep 17 00:00:00 2001 From: Jay Palacio Date: Tue, 25 Apr 2023 12:22:53 -0400 Subject: [PATCH 3/7] bump to 2.8.6 --- dropbox-sdk-java/dependencies/runtimeClasspath.txt | 3 +-- examples/android/dependencies/releaseRuntimeClasspath.txt | 3 +-- examples/examples/build.gradle | 4 ++-- examples/java/dependencies/compileClasspath.txt | 3 +-- examples/java/dependencies/runtimeClasspath.txt | 3 +-- gradle/dropboxJavaSdkLibs.versions.toml | 2 +- 6 files changed, 7 insertions(+), 11 deletions(-) diff --git a/dropbox-sdk-java/dependencies/runtimeClasspath.txt b/dropbox-sdk-java/dependencies/runtimeClasspath.txt index e08f982d9..4a43d6587 100644 --- a/dropbox-sdk-java/dependencies/runtimeClasspath.txt +++ b/dropbox-sdk-java/dependencies/runtimeClasspath.txt @@ -1,2 +1 @@ -com.fasterxml.jackson.core:jackson-core:2.14.2 -com.fasterxml.jackson:jackson-bom:2.14.2 +com.fasterxml.jackson.core:jackson-core:2.8.6 diff --git a/examples/android/dependencies/releaseRuntimeClasspath.txt b/examples/android/dependencies/releaseRuntimeClasspath.txt index 6361408db..e66dd03ec 100644 --- a/examples/android/dependencies/releaseRuntimeClasspath.txt +++ b/examples/android/dependencies/releaseRuntimeClasspath.txt @@ -46,8 +46,7 @@ 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.14.2 -com.fasterxml.jackson:jackson-bom:2.14.2 +com.fasterxml.jackson.core:jackson-core:2.8.6 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 da71add48..2b2e7b8f7 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.14.2") - implementation("com.fasterxml.jackson.core:jackson-databind:2.14.2") + implementation("com.fasterxml.jackson.core:jackson-core:2.8.6") + implementation("com.fasterxml.jackson.core:jackson-databind:2.8.6") implementation(dropboxJavaSdkLibs.okhttp3) implementation("org.json:json:20220320") diff --git a/examples/java/dependencies/compileClasspath.txt b/examples/java/dependencies/compileClasspath.txt index e08f982d9..4a43d6587 100644 --- a/examples/java/dependencies/compileClasspath.txt +++ b/examples/java/dependencies/compileClasspath.txt @@ -1,2 +1 @@ -com.fasterxml.jackson.core:jackson-core:2.14.2 -com.fasterxml.jackson:jackson-bom:2.14.2 +com.fasterxml.jackson.core:jackson-core:2.8.6 diff --git a/examples/java/dependencies/runtimeClasspath.txt b/examples/java/dependencies/runtimeClasspath.txt index e08f982d9..4a43d6587 100644 --- a/examples/java/dependencies/runtimeClasspath.txt +++ b/examples/java/dependencies/runtimeClasspath.txt @@ -1,2 +1 @@ -com.fasterxml.jackson.core:jackson-core:2.14.2 -com.fasterxml.jackson:jackson-bom:2.14.2 +com.fasterxml.jackson.core:jackson-core:2.8.6 diff --git a/gradle/dropboxJavaSdkLibs.versions.toml b/gradle/dropboxJavaSdkLibs.versions.toml index 07ad6289e..55872ab63 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.14.2' +jackson-core = 'com.fasterxml.jackson.core:jackson-core:2.8.6' 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" } From 5c6887716e5dc15a17bfe330e84731e1a3f021fd Mon Sep 17 00:00:00 2001 From: Josh Feinberg <15068619+joshafeinberg@users.noreply.github.com> Date: Mon, 15 May 2023 10:38:30 -0500 Subject: [PATCH 4/7] Add stacktrace to error --- .github/workflows/check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 14bf0de63..ed89e1ae4 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -66,7 +66,7 @@ jobs: run: ./gradlew :examples:examples:test :examples:java:test -Pci=true --info - name: Run Integration Tests - OkHttpRequestor - run: ./gradlew -Pcom.dropbox.test.httpRequestor=OkHttpRequestor -Pcom.dropbox.test.authInfoFile=../auth_output integrationTest && + run: ./gradlew -Pcom.dropbox.test.httpRequestor=OkHttpRequestor -Pcom.dropbox.test.authInfoFile=../auth_output integrationTest --stacktrace && ./gradlew -Pcom.dropbox.test.httpRequestor=OkHttpRequestor -Pcom.dropbox.test.authInfoFile=../auth_output proguardTest - name: Run Integration Tests - OkHttp3Requestor From 962ad05bae9e5a96019602b91fd68589ecf94cd2 Mon Sep 17 00:00:00 2001 From: Josh Feinberg <15068619+joshafeinberg@users.noreply.github.com> Date: Mon, 15 May 2023 10:52:56 -0500 Subject: [PATCH 5/7] Remove stacktrace --- .github/workflows/check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index ed89e1ae4..14bf0de63 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -66,7 +66,7 @@ jobs: run: ./gradlew :examples:examples:test :examples:java:test -Pci=true --info - name: Run Integration Tests - OkHttpRequestor - run: ./gradlew -Pcom.dropbox.test.httpRequestor=OkHttpRequestor -Pcom.dropbox.test.authInfoFile=../auth_output integrationTest --stacktrace && + run: ./gradlew -Pcom.dropbox.test.httpRequestor=OkHttpRequestor -Pcom.dropbox.test.authInfoFile=../auth_output integrationTest && ./gradlew -Pcom.dropbox.test.httpRequestor=OkHttpRequestor -Pcom.dropbox.test.authInfoFile=../auth_output proguardTest - name: Run Integration Tests - OkHttp3Requestor From 87251c33dafc6de64dd600c91efab5f60a1eac04 Mon Sep 17 00:00:00 2001 From: Jay Palacio Date: Mon, 15 May 2023 12:14:21 -0400 Subject: [PATCH 6/7] bump to latest jackson --- dropbox-sdk-java/dependencies/runtimeClasspath.txt | 4 +++- examples/android/dependencies/releaseRuntimeClasspath.txt | 4 +++- examples/java/dependencies/compileClasspath.txt | 4 +++- examples/java/dependencies/runtimeClasspath.txt | 4 +++- gradle/dropboxJavaSdkLibs.versions.toml | 2 +- 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dropbox-sdk-java/dependencies/runtimeClasspath.txt b/dropbox-sdk-java/dependencies/runtimeClasspath.txt index 4a43d6587..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.8.6 +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 e66dd03ec..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.8.6 +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/java/dependencies/compileClasspath.txt b/examples/java/dependencies/compileClasspath.txt index 4a43d6587..9f215f930 100644 --- a/examples/java/dependencies/compileClasspath.txt +++ b/examples/java/dependencies/compileClasspath.txt @@ -1 +1,3 @@ -com.fasterxml.jackson.core:jackson-core:2.8.6 +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 4a43d6587..9f215f930 100644 --- a/examples/java/dependencies/runtimeClasspath.txt +++ b/examples/java/dependencies/runtimeClasspath.txt @@ -1 +1,3 @@ -com.fasterxml.jackson.core:jackson-core:2.8.6 +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/dropboxJavaSdkLibs.versions.toml b/gradle/dropboxJavaSdkLibs.versions.toml index 55872ab63..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.8.6' +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" } From d48916df08bdb51d3c0b1d7199400df2730e8df8 Mon Sep 17 00:00:00 2001 From: Jay Palacio Date: Mon, 15 May 2023 12:32:04 -0400 Subject: [PATCH 7/7] bump jackson in examples, changelog --- CHANGELOG.md | 3 +++ examples/examples/build.gradle | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) 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/examples/examples/build.gradle b/examples/examples/build.gradle index 2b2e7b8f7..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.8.6") - implementation("com.fasterxml.jackson.core:jackson-databind:2.8.6") + implementation(dropboxJavaSdkLibs.jackson.core) + implementation("com.fasterxml.jackson.core:jackson-databind:2.15.0") implementation(dropboxJavaSdkLibs.okhttp3) implementation("org.json:json:20220320")