Skip to content

Commit 5c7cb62

Browse files
chore(deps): bump jackson-bom from 2.19.2 to 2.20.0, fix overrides and handle jackson-annotations v2.20 (7266)
chore(deps): bump com.fasterxml.jackson:jackson-bom Bumps [com.fasterxml.jackson:jackson-bom](https://github.com/FasterXML/jackson-bom) from 2.19.2 to 2.20.0. - [Commits](FasterXML/jackson-bom@jackson-bom-2.19.2...jackson-bom-2.20.0) --- updated-dependencies: - dependency-name: com.fasterxml.jackson:jackson-bom dependency-version: 2.20.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> --- chore(deps): override isMerging method introduced in jackson 2.20.0 --- chore(deps): fix for jackson-annotations 2.20 --- chore(deps): udpate comment and changelog Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Ashish Thakur <[email protected]> Co-authored-by: Ashish Thakur <[email protected]> Co-authored-by: Ashish Thakur <[email protected]>
1 parent 2924fd8 commit 5c7cb62

File tree

4 files changed

+14
-2
lines changed

4 files changed

+14
-2
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,12 @@
77
#### Improvements
88

99
#### Dependency Upgrade
10+
#7266: bump jackson-bom from 2.19.2 to 2.20.0, fix overrides and handle jackson-annotations v2.20
1011

1112
#### New Features
1213

1314
#### _**Note**_: Breaking changes
15+
#7266: bump jackson-bom from 2.19.2 to 2.20.0, fix overrides and handle jackson-annotations v2.20
1416

1517
### 7.4.0 (2025-09-08)
1618

kubernetes-model-generator/kubernetes-model-common/src/main/java/io/fabric8/kubernetes/model/jackson/SettableBeanPropertyDelegating.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,14 @@ public void markAsIgnorable() {
6767
delegate.markAsIgnorable();
6868
}
6969

70+
/**
71+
* {@inheritDoc}
72+
*/
73+
@Override
74+
public boolean isMerging() {
75+
return delegate.isMerging();
76+
}
77+
7078
/**
7179
* {@inheritDoc}
7280
*/

platforms/karaf/features/src/main/resources/feature.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<feature>scr</feature>
2424
<bundle dependency='true'>mvn:com.google.code.findbugs/jsr305/${jsr305.version}</bundle>
2525
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson.bundle.version}</bundle>
26-
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson.bundle.version}</bundle>
26+
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson.bundle.version.annotations}</bundle>
2727
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson.bundle.version}</bundle>
2828
<bundle dependency='true'>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/${jackson.bundle.version}</bundle>
2929
<bundle dependency='true'>mvn:com.fasterxml.jackson.datatype/jackson-datatype-jsr310/${jackson.bundle.version}</bundle>

pom.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,10 @@
9292
<!-- Core versions -->
9393
<sundrio.version>0.230.1</sundrio.version>
9494
<okhttp.version>4.12.0</okhttp.version>
95-
<jackson.version>2.19.2</jackson.version>
95+
<jackson.version>2.20.0</jackson.version>
9696
<jackson.bundle.version>${jackson.version}</jackson.bundle.version>
97+
<!-- fix as jackson-annotations version 2.20 was released, Refer: https://github.com/FasterXML/jackson-bom/blob/54f854ba1ce69c5827f8acf6d08ba2d7ce36233c/pom.xml#L53-L62 -->
98+
<jackson.bundle.version.annotations>2.20</jackson.bundle.version.annotations>
9799
<jetty.version>11.0.26</jetty.version>
98100
<maven-core.version>3.9.11</maven-core.version>
99101
<maven-plugin-annotations.version>3.15.1</maven-plugin-annotations.version>

0 commit comments

Comments
 (0)