From 7080be58cf61a38fd11741d3601d470b0c26f7e3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 25 Feb 2024 09:11:23 +0000 Subject: [PATCH 1/2] Update dependency com.flipkart.zjsonpatch:zjsonpatch to v0.4.16 --- lib/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/build.gradle b/lib/build.gradle index 7b52442f92..be89c3002f 100644 --- a/lib/build.gradle +++ b/lib/build.gradle @@ -131,7 +131,7 @@ dependencies { sortPomCompileOnly 'com.github.ekryd.sortpom:sortpom-sorter:3.4.0' sortPomCompileOnly 'org.slf4j:slf4j-api:2.0.12' // zjsonPatch - zjsonPatchCompileOnly 'com.flipkart.zjsonpatch:zjsonpatch:0.4.14' + zjsonPatchCompileOnly 'com.flipkart.zjsonpatch:zjsonpatch:0.4.16' } // we'll hold the core lib to a high standard From 5a7f533e6f90e26999fc369bd3eab559e25e15c0 Mon Sep 17 00:00:00 2001 From: Ned Twigg Date: Thu, 23 May 2024 14:46:09 -0700 Subject: [PATCH 2/2] Bump zjsonpatch to latest. --- CHANGES.md | 2 ++ lib/src/main/java/com/diffplug/spotless/json/JsonPatchStep.java | 2 +- plugin-gradle/CHANGES.md | 1 + plugin-maven/CHANGES.md | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 5eb084f98b..a5f3697c97 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -25,6 +25,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format ( * Bump default `ktlint` version to latest `1.1.1` -> `1.2.1`. ([#2057](https://github.com/diffplug/spotless/pull/2057)) * 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/JsonPatchStep.java b/lib/src/main/java/com/diffplug/spotless/json/JsonPatchStep.java index 5082f07472..5050dbba10 100644 --- a/lib/src/main/java/com/diffplug/spotless/json/JsonPatchStep.java +++ b/lib/src/main/java/com/diffplug/spotless/json/JsonPatchStep.java @@ -32,7 +32,7 @@ public class JsonPatchStep implements java.io.Serializable { private static final long serialVersionUID = 1L; private static final String MAVEN_COORDINATE = "com.flipkart.zjsonpatch:zjsonpatch"; - private static final String DEFAULT_VERSION = "0.4.14"; + private static final String DEFAULT_VERSION = "0.4.16"; public static final String NAME = "apply-json-patch"; private final JarState.Promised jarState; diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md index acbe0231f9..0052074134 100644 --- a/plugin-gradle/CHANGES.md +++ b/plugin-gradle/CHANGES.md @@ -20,6 +20,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format ( * Bump default `ktlint` version to latest `1.1.1` -> `1.2.1`. ([#2057](https://github.com/diffplug/spotless/pull/2057)) * 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)) ## [6.25.0] - 2024-01-23 ### Added diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md index f71dda5b39..784aa1a1b6 100644 --- a/plugin-maven/CHANGES.md +++ b/plugin-maven/CHANGES.md @@ -18,6 +18,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format ( * Bump default `ktlint` version to latest `1.1.1` -> `1.2.1`. ([#2057](https://github.com/diffplug/spotless/pull/2057)) * 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)) ## [2.43.0] - 2024-01-23 ### Added