feat(zjsonpatch): move io.fabric8:zjsonpatch as a module in Fabric8 kubernetes Client #6276
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
oscerd
approved these changes
Aug 14, 2024
rohanKanojia
force-pushed
the
pr/issue5480
branch
5 times, most recently
from
9272d1d to
23f3ea0
Compare
|
After migrating to the upstream Adding back the |
rohanKanojia
force-pushed
the
pr/issue5480
branch
4 times, most recently
from
3e03b82 to
ef75950
Compare
rohanKanojia
force-pushed
the
pr/issue5480
branch
from
ef75950 to
24acd0e
Compare
rohanKanojia
commented
Aug 26, 2024
| } | ||
|
|
||
| public static JsonNode asJson(final JsonNode source, final JsonNode target) { | ||
| return com.flipkart.zjsonpatch.JsonDiff.asJson(source, target); |
There was a problem hiding this comment.
I had to reintroduce this class due to #6276 (comment)
rohanKanojia
force-pushed
the
pr/issue5480
branch
from
24acd0e to
5ea368e
Compare
rohanKanojia
requested review from
andreaTP,
shawkins and
manusa
as code owners
shawkins
approved these changes
Aug 26, 2024
|
Let's discuss this tomorrow. I'm not sure about the current approach and how does this might converge with users relying on commons-collections on their projects. |
rohanKanojia
force-pushed
the
pr/issue5480
branch
from
5ea368e to
c4e71e8
Compare
manusa
reviewed
Aug 30, 2024
zjsonpatch/src/main/java/io/fabric8/zjsonpatch/internal/collections4/ListUtils.java
Show resolved
Hide resolved
rohanKanojia
force-pushed
the
pr/issue5480
branch
2 times, most recently
from
848e90f to
a3ac63b
Compare
rohanKanojia
changed the title
io.fabric8:zjsonpatch as a module in Fabric8 kubernetes Client
rohanKanojia
force-pushed
the
pr/issue5480
branch
2 times, most recently
from
614e77b to
c86a4bf
Compare
…d of fabric8io fork + Add a new module zjsonpatch that would directly include `com.flipkart.zjsonpatch:zjsonpatch` dependency excluding `org.apache.commons:commons-collections4`. + Port required method `ListUtils.longestCommonSubsequence` and related classes inside zjsonpatch module Signed-off-by: Rohan Kumar <[email protected]>
manusa
changed the title
io.fabric8:zjsonpatch as a module in Fabric8 kubernetes ClientSince we're already copying most of the codebase, let's just remove the dependency. Signed-off-by: Marc Nuri <[email protected]>
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Fix #5480
Fix #3489
Supersedes closes #4700
Currently, we rely on outdated
io.fabric8:zjsonpatchdependency instead of the upstreamcom.flipkart.zjsonpatch:zjsonpatchdependency. The main issue is that the upstream repository depends onorg.apache.commons:commons-collections4.zjsonpatchthat would directly includecom.flipkart.zjsonpatch:zjsonpatchdependency excludingorg.apache.commons:commons-collections4.ListUtils.longestCommonSubsequenceand relatedclasses inside zjsonpatch module
Type of change
test, version modification, documentation, etc.)
Checklist