Skip to content

Commit 03eb2a4

Browse files
committed
Revert "Merge pull request spring-cloud#1922 from ryanjbaxter/fix-jackson-incompatibility"
This reverts commit 4d56210, reversing changes made to 798bdb6.
1 parent 4d56210 commit 03eb2a4

File tree

4 files changed

+0
-47
lines changed
  • spring-cloud-kubernetes-fabric8-config
  • spring-cloud-kubernetes-fabric8-discovery
  • spring-cloud-kubernetes-fabric8-loadbalancer

4 files changed

+0
-47
lines changed

pom.xml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -80,14 +80,6 @@
8080
</maven-checkstyle-plugin.failsOnViolation>
8181
<maven-checkstyle-plugin.includeTestSourceDirectory>true
8282
</maven-checkstyle-plugin.includeTestSourceDirectory>
83-
<!-- We are overriding the version of Jackson here because Fabric8 is
84-
is not compatible with Jackson 2.19.0 which used in Spring Boot 3.5.x
85-
We cannot use Jackson 2.19.0 until we can upgrade to Fabric8
86-
7.3.0.
87-
See https://github.com/fabric8io/kubernetes-client/issues/7036
88-
See https://github.com/spring-projects/spring-boot/commit/e1ff4fbaf99bfcfdf0828ed07664b208a3ca6157
89-
-->
90-
<jackson.version>2.18.4</jackson.version>
9183
</properties>
9284

9385
<modules>

spring-cloud-kubernetes-fabric8-config/pom.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,19 +76,16 @@
7676
<dependency>
7777
<groupId>com.fasterxml.jackson.core</groupId>
7878
<artifactId>jackson-databind</artifactId>
79-
<version>${jackson.version}</version>
8079
<scope>test</scope>
8180
</dependency>
8281
<dependency>
8382
<groupId>com.fasterxml.jackson.core</groupId>
8483
<artifactId>jackson-core</artifactId>
85-
<version>${jackson.version}</version>
8684
<scope>test</scope>
8785
</dependency>
8886
<dependency>
8987
<groupId>com.fasterxml.jackson.core</groupId>
9088
<artifactId>jackson-annotations</artifactId>
91-
<version>${jackson.version}</version>
9289
<scope>test</scope>
9390
</dependency>
9491
<dependency>

spring-cloud-kubernetes-fabric8-discovery/pom.xml

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -113,24 +113,6 @@
113113
<artifactId>spring-cloud-kubernetes-test-support</artifactId>
114114
<scope>test</scope>
115115
</dependency>
116-
<dependency>
117-
<groupId>com.fasterxml.jackson.core</groupId>
118-
<artifactId>jackson-databind</artifactId>
119-
<version>${jackson.version}</version>
120-
<scope>test</scope>
121-
</dependency>
122-
<dependency>
123-
<groupId>com.fasterxml.jackson.core</groupId>
124-
<artifactId>jackson-core</artifactId>
125-
<version>${jackson.version}</version>
126-
<scope>test</scope>
127-
</dependency>
128-
<dependency>
129-
<groupId>com.fasterxml.jackson.core</groupId>
130-
<artifactId>jackson-annotations</artifactId>
131-
<version>${jackson.version}</version>
132-
<scope>test</scope>
133-
</dependency>
134116
</dependencies>
135117

136118
</project>

spring-cloud-kubernetes-fabric8-loadbalancer/pom.xml

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -74,23 +74,5 @@
7474
<artifactId>spring-cloud-kubernetes-test-support</artifactId>
7575
<scope>test</scope>
7676
</dependency>
77-
<dependency>
78-
<groupId>com.fasterxml.jackson.core</groupId>
79-
<artifactId>jackson-databind</artifactId>
80-
<version>${jackson.version}</version>
81-
<scope>test</scope>
82-
</dependency>
83-
<dependency>
84-
<groupId>com.fasterxml.jackson.core</groupId>
85-
<artifactId>jackson-core</artifactId>
86-
<version>${jackson.version}</version>
87-
<scope>test</scope>
88-
</dependency>
89-
<dependency>
90-
<groupId>com.fasterxml.jackson.core</groupId>
91-
<artifactId>jackson-annotations</artifactId>
92-
<version>${jackson.version}</version>
93-
<scope>test</scope>
94-
</dependency>
9577
</dependencies>
9678
</project>

0 commit comments

Comments
 (0)