Skip to content

Commit 88d5448

Browse files
Bump jackson.version from 2.18.3 to 2.19.0 (#534)
* Bump jackson.version from 2.18.3 to 2.19.0 Bumps `jackson.version` from 2.18.3 to 2.19.0. Updates `com.fasterxml.jackson.core:jackson-annotations` from 2.18.3 to 2.19.0 - [Commits](https://github.com/FasterXML/jackson/commits) Updates `com.fasterxml.jackson.core:jackson-core` from 2.18.3 to 2.19.0 - [Commits](FasterXML/jackson-core@jackson-core-2.18.3...jackson-core-2.19.0) Updates `com.fasterxml.jackson.core:jackson-databind` from 2.18.3 to 2.19.0 - [Commits](https://github.com/FasterXML/jackson/commits) Updates `com.fasterxml.jackson.datatype:jackson-datatype-guava` from 2.18.3 to 2.19.0 - [Commits](FasterXML/jackson-datatypes-collections@jackson-datatypes-collections-2.18.3...jackson-datatypes-collections-2.19.0) Updates `com.fasterxml.jackson.module:jackson-module-guice7` from 2.18.3 to 2.19.0 - [Commits](FasterXML/jackson-modules-base@jackson-modules-base-2.18.3...jackson-modules-base-2.19.0) Updates `com.fasterxml.jackson.datatype:jackson-datatype-jdk8` from 2.18.3 to 2.19.0 Updates `com.fasterxml.jackson.datatype:jackson-datatype-jsr310` from 2.18.3 to 2.19.0 Updates `com.fasterxml.jackson.module:jackson-module-afterburner` from 2.18.3 to 2.19.0 - [Commits](FasterXML/jackson-modules-base@jackson-modules-base-2.18.3...jackson-modules-base-2.19.0) --- updated-dependencies: - dependency-name: com.fasterxml.jackson.core:jackson-annotations dependency-version: 2.19.0 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.fasterxml.jackson.core:jackson-core dependency-version: 2.19.0 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.fasterxml.jackson.core:jackson-databind dependency-version: 2.19.0 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.fasterxml.jackson.datatype:jackson-datatype-guava dependency-version: 2.19.0 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.fasterxml.jackson.module:jackson-module-guice7 dependency-version: 2.19.0 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.fasterxml.jackson.datatype:jackson-datatype-jdk8 dependency-version: 2.19.0 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.fasterxml.jackson.datatype:jackson-datatype-jsr310 dependency-version: 2.19.0 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.fasterxml.jackson.module:jackson-module-afterburner dependency-version: 2.19.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * use properties instead of fields --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Brandon Arp <[email protected]>
1 parent 29c9d3c commit 88d5448

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
<fastutil.version>8.5.15</fastutil.version>
8282
<guava.version>33.4.8-jre</guava.version>
8383
<guice.version>7.0.0</guice.version>
84-
<jackson.version>2.18.3</jackson.version>
84+
<jackson.version>2.19.0</jackson.version>
8585
<javassist.version>3.30.2-GA</javassist.version>
8686
<javassist.maven.core.version>0.2.9</javassist.maven.core.version>
8787
<jsr305.version>3.0.2</jsr305.version>

src/main/java/com/arpnetworking/configuration/jackson/JsonNodeMergingSource.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import com.google.common.collect.Lists;
2525
import net.sf.oval.constraint.NotNull;
2626

27-
import java.util.Iterator;
2827
import java.util.List;
2928
import java.util.Map;
3029
import java.util.Optional;
@@ -75,9 +74,7 @@ private static JsonNode merge(final JsonNode target, final JsonNode source) {
7574
// the target node. Any unmatched fields from the source node are
7675
// simply added to the target node; this requires a deep copy
7776
// since subsequent merges may modify it.
78-
final Iterator<Map.Entry<String, JsonNode>> iterator = source.fields();
79-
while (iterator.hasNext()) {
80-
final Map.Entry<String, JsonNode> sourceFieldEntry = iterator.next();
77+
for (final Map.Entry<String, JsonNode> sourceFieldEntry : source.properties()) {
8178
final JsonNode targetFieldValue = target.get(sourceFieldEntry.getKey());
8279
if (targetFieldValue != null) {
8380
// Recursively merge the source field value into the target

0 commit comments

Comments
 (0)