Skip to content

Bump jackson.version from 2.18.3 to 2.19.0 #461

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 1, 2025
Merged

Bump jackson.version from 2.18.3 to 2.19.0 #461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a117e1a
Bump jackson.version from 2.18.3 to 2.19.0
dependabot[bot] May 1, 2025
1cdd6d9
fix deprecations
BrandonArp May 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@
<hikari.version>6.3.0</hikari.version>
<fastutil.version>8.5.14</fastutil.version>
<h2.version>2.3.232</h2.version>
<jackson.version>2.18.3</jackson.version>
<jackson.version>2.19.0</jackson.version>
<javassist.version>3.30.2-GA</javassist.version>
<javassist.maven.core.version>0.2.9</javassist.maven.core.version>
<javax.persistence.version>1.0.2</javax.persistence.version>
Expand Down
6 changes: 1 addition & 5 deletions src/main/java/com/arpnetworking/configuration/jackson/JsonNodeMergingSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,7 @@
import com.google.common.collect.Lists;
import net.sf.oval.constraint.NotNull;

import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Optional;

/**
Expand Down Expand Up @@ -75,9 +73,7 @@ private static JsonNode merge(final JsonNode target, final JsonNode source) {
// the target node. Any unmatched fields from the source node are
// simply added to the target node; this requires a deep copy
// since subsequent merges may modify it.
final Iterator<Map.Entry<String, JsonNode>> iterator = source.fields();
while (iterator.hasNext()) {
final Map.Entry<String, JsonNode> sourceFieldEntry = iterator.next();
for (var sourceFieldEntry : source.properties()) {
final JsonNode targetFieldValue = target.get(sourceFieldEntry.getKey());
if (targetFieldValue != null) {
// Recursively merge the source field value into the target
Expand Down