From d6e37e73d489c1bc6d9b1803f6a7340402031cb2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 5 May 2024 03:25:55 +0000 Subject: [PATCH 1/3] Update dependency com.fasterxml.jackson.core:jackson-databind to v2.17.1 --- lib/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/build.gradle b/lib/build.gradle index 9a1e1ac3b9..aa9d047a8a 100644 --- a/lib/build.gradle +++ b/lib/build.gradle @@ -97,7 +97,7 @@ dependencies { // gson gsonCompileOnly 'com.google.code.gson:gson:2.10.1' // jackson - String VER_JACKSON='2.14.2' + String VER_JACKSON='2.17.1' jacksonCompileOnly "com.fasterxml.jackson.core:jackson-databind:$VER_JACKSON" jacksonCompileOnly "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:$VER_JACKSON" // ktfmt From 97a8a83f54da1c8c4355e62268f8ae0b93d21454 Mon Sep 17 00:00:00 2001 From: Ned Twigg Date: Thu, 23 May 2024 15:01:41 -0700 Subject: [PATCH 2/3] Bump changeslogs. --- CHANGES.md | 2 +- .../main/java/com/diffplug/spotless/json/JacksonJsonStep.java | 2 +- plugin-gradle/CHANGES.md | 1 + plugin-maven/CHANGES.md | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index a5f3697c97..c627a1f74f 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -19,6 +19,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format ( * Made ShadowCopy (`npmInstallCache`) more robust by re-creating the cache dir if it goes missing ([#1984](https://github.com/diffplug/spotless/issues/1984),[2096](https://github.com/diffplug/spotless/pull/2096)) * scalafmt.conf fileOverride section now works correctly ([#1854](https://github.com/diffplug/spotless/pull/1854)) ### Changes +* Bump default `jackson` version to latest `2.14.2` -> `2.17.1`. ([#1685](https://github.com/diffplug/spotless/pull/1685)) * Bump default `ktfmt` version to latest `0.46` -> `0.47`. ([#2045](https://github.com/diffplug/spotless/pull/2045)) * Bump default `sortpom` version to latest `3.2.1` -> `3.4.0`. ([#2049](https://github.com/diffplug/spotless/pull/2049)) * Bump default `shfmt` version to latest `3.7.0` -> `3.8.0`. ([#2050](https://github.com/diffplug/spotless/pull/2050)) @@ -26,7 +27,6 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format ( * Bump default `sortpom` version to latest `3.4.0` -> `3.4.1`. ([#2078](https://github.com/diffplug/spotless/pull/2078)) * Bump default `sortpom` version to latest `3.4.1` -> `4.0.0` and support versions back to `3.2.1`. ([#2115](https://github.com/diffplug/spotless/pull/2115)) * Bump default `zjsonpatch` version to latest `0.4.14` -> `0.4.16`. ([#1969](https://github.com/diffplug/spotless/pull/1969)) - ### Removed * **BREAKING** Remove `JarState.getMavenCoordinate(String prefix)`. ([#1945](https://github.com/diffplug/spotless/pull/1945)) * **BREAKING** Replace `PipeStepPair` with `FenceStep`. ([#1954](https://github.com/diffplug/spotless/pull/1954)) diff --git a/lib/src/main/java/com/diffplug/spotless/json/JacksonJsonStep.java b/lib/src/main/java/com/diffplug/spotless/json/JacksonJsonStep.java index ebc081a759..080bb735d5 100644 --- a/lib/src/main/java/com/diffplug/spotless/json/JacksonJsonStep.java +++ b/lib/src/main/java/com/diffplug/spotless/json/JacksonJsonStep.java @@ -32,7 +32,7 @@ public class JacksonJsonStep implements java.io.Serializable { private static final long serialVersionUID = 1L; private static final String MAVEN_COORDINATE = "com.fasterxml.jackson.core:jackson-databind:"; - private static final String DEFAULT_VERSION = "2.14.2"; + private static final String DEFAULT_VERSION = "2.17.1"; public static final String NAME = "jacksonJson"; private final JarState.Promised jarState; diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md index 0052074134..392706246e 100644 --- a/plugin-gradle/CHANGES.md +++ b/plugin-gradle/CHANGES.md @@ -14,6 +14,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format ( * Made ShadowCopy (`npmInstallCache`) more robust by re-creating the cache dir if it goes missing ([#1984](https://github.com/diffplug/spotless/issues/1984),[2096](https://github.com/diffplug/spotless/pull/2096)) * scalafmt.conf fileOverride section now works correctly ([#1854](https://github.com/diffplug/spotless/pull/1854)) ### Changes +* Bump default `jackson` version to latest `2.14.2` -> `2.17.1`. ([#1685](https://github.com/diffplug/spotless/pull/1685)) * Bump default `ktfmt` version to latest `0.46` -> `0.47`. ([#2045](https://github.com/diffplug/spotless/pull/2045)) * Bump default `sortpom` version to latest `3.2.1` -> `3.4.0`. ([#2049](https://github.com/diffplug/spotless/pull/2049)) * Bump default `shfmt` version to latest `3.7.0` -> `3.8.0`. ([#2050](https://github.com/diffplug/spotless/pull/2050)) diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md index 784aa1a1b6..025bab6387 100644 --- a/plugin-maven/CHANGES.md +++ b/plugin-maven/CHANGES.md @@ -12,6 +12,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format ( * Made ShadowCopy (`npmInstallCache`) more robust by re-creating the cache dir if it goes missing ([#1984](https://github.com/diffplug/spotless/issues/1984),[2096](https://github.com/diffplug/spotless/pull/2096)) * scalafmt.conf fileOverride section now works correctly ([#1854](https://github.com/diffplug/spotless/pull/1854)) ### Changes +* Bump default `jackson` version to latest `2.14.2` -> `2.17.1`. ([#1685](https://github.com/diffplug/spotless/pull/1685)) * Bump default `ktfmt` version to latest `0.46` -> `0.47`. ([#2045](https://github.com/diffplug/spotless/pull/2045)) * Bump default `sortpom` version to latest `3.2.1` -> `3.4.0`. ([#2049](https://github.com/diffplug/spotless/pull/2049)) * Bump default `shfmt` version to latest `3.7.0` -> `3.8.0`. ([#2050](https://github.com/diffplug/spotless/pull/2050)) From 81b1c94bb29e5c36f92c6426f3a4adc3960ff107 Mon Sep 17 00:00:00 2001 From: Ned Twigg Date: Thu, 23 May 2024 15:49:51 -0700 Subject: [PATCH 3/3] Fix new expected values in the new version of jackson. --- .../json/sortByKeysAfter_Jackson.json | 32 +++++++++---------- ...sAfter_Jackson_spaceAfterKeySeparator.json | 32 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/testlib/src/main/resources/json/sortByKeysAfter_Jackson.json b/testlib/src/main/resources/json/sortByKeysAfter_Jackson.json index 003b2ba66f..25ce5dd094 100644 --- a/testlib/src/main/resources/json/sortByKeysAfter_Jackson.json +++ b/testlib/src/main/resources/json/sortByKeysAfter_Jackson.json @@ -1,19 +1,19 @@ { - "A": 1, - "X": 2, - "_arraysNotSorted": [ 3, 2, 1 ], - "_objectsInArraysAreSorted": [ { - "a": 1, - "b": 2 + "A" : 1, + "X" : 2, + "_arraysNotSorted" : [ 3, 2, 1 ], + "_objectsInArraysAreSorted" : [ { + "a" : 1, + "b" : 2 } ], - "a": 3, - "c": 4, - "x": 5, - "z": { - "A": 1, - "X": 2, - "a": 3, - "c": 4, - "x": 5 + "a" : 3, + "c" : 4, + "x" : 5, + "z" : { + "A" : 1, + "X" : 2, + "a" : 3, + "c" : 4, + "x" : 5 } -} +} \ No newline at end of file diff --git a/testlib/src/main/resources/json/sortByKeysAfter_Jackson_spaceAfterKeySeparator.json b/testlib/src/main/resources/json/sortByKeysAfter_Jackson_spaceAfterKeySeparator.json index 003b2ba66f..25ce5dd094 100644 --- a/testlib/src/main/resources/json/sortByKeysAfter_Jackson_spaceAfterKeySeparator.json +++ b/testlib/src/main/resources/json/sortByKeysAfter_Jackson_spaceAfterKeySeparator.json @@ -1,19 +1,19 @@ { - "A": 1, - "X": 2, - "_arraysNotSorted": [ 3, 2, 1 ], - "_objectsInArraysAreSorted": [ { - "a": 1, - "b": 2 + "A" : 1, + "X" : 2, + "_arraysNotSorted" : [ 3, 2, 1 ], + "_objectsInArraysAreSorted" : [ { + "a" : 1, + "b" : 2 } ], - "a": 3, - "c": 4, - "x": 5, - "z": { - "A": 1, - "X": 2, - "a": 3, - "c": 4, - "x": 5 + "a" : 3, + "c" : 4, + "x" : 5, + "z" : { + "A" : 1, + "X" : 2, + "a" : 3, + "c" : 4, + "x" : 5 } -} +} \ No newline at end of file