Skip to content

Commit 93fbd2c

Browse files
authored
Fixing dependencies (#102)
* Ignore duplicate dependency * Upgrade to Spring Boot 2.5.12 * Remove tests for issues fixed by dependency upgrade * Update jackson-databind to 2.12.6.1 to fix CVE
1 parent 210786f commit 93fbd2c

File tree

6 files changed

+12
-93
lines changed

6 files changed

+12
-93
lines changed

applications/rest-service/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
<dependency>
7575
<groupId>com.fasterxml.jackson.core</groupId>
7676
<artifactId>jackson-databind</artifactId>
77-
<version>${jackson.version}</version>
77+
<version>${jackson-databind.version}</version>
7878
</dependency>
7979
<dependency>
8080
<groupId>com.fasterxml.jackson.core</groupId>

applications/spring-shell/pom.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,12 @@
105105
<artifactId>mq-jms-spring-boot-starter</artifactId>
106106
<version>2.6.4</version>
107107
<scope>test</scope>
108+
<exclusions>
109+
<exclusion>
110+
<groupId>org.json</groupId>
111+
<artifactId>json</artifactId>
112+
</exclusion>
113+
</exclusions>
108114
</dependency>
109115

110116
<!-- Override Jackson coming from spring boot -->
@@ -116,7 +122,7 @@
116122
<dependency>
117123
<groupId>com.fasterxml.jackson.core</groupId>
118124
<artifactId>jackson-databind</artifactId>
119-
<version>${jackson.version}</version>
125+
<version>${jackson-databind.version}</version>
120126
</dependency>
121127
<dependency>
122128
<groupId>com.fasterxml.jackson.core</groupId>

components/openrewrite-spring-recipes/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
<dependency>
8282
<groupId>com.fasterxml.jackson.core</groupId>
8383
<artifactId>jackson-databind</artifactId>
84-
<version>${jackson.version}</version>
84+
<version>${jackson-databind.version}</version>
8585
</dependency>
8686
<dependency>
8787
<groupId>com.fasterxml.jackson.core</groupId>

components/sbm-openrewrite/src/test/java/org/springframework/sbm/openrewrite/MavenParserTest.java

Lines changed: 0 additions & 45 deletions
This file was deleted.

components/sbm-openrewrite/src/test/java/org/springframework/sbm/support/openrewrite/api/MavenDependencyDownloadTest.java

Lines changed: 0 additions & 43 deletions
This file was deleted.

pom.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<maven.compiler.source>11</maven.compiler.source>
3131
<openrewrite.version>7.16.3</openrewrite.version>
3232
<openrewrite.spring.version>4.14.1</openrewrite.spring.version>
33-
<spring-boot.version>2.4.4</spring-boot.version>
33+
<spring-boot.version>2.5.12</spring-boot.version>
3434
<progressbar.version>0.9.0</progressbar.version>
3535
<testcontainers.version>1.16.3</testcontainers.version>
3636
<maven-invoker.version>3.0.1</maven-invoker.version>
@@ -39,7 +39,8 @@
3939
<lombok.version>1.18.20</lombok.version>
4040
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4141
<project.csvParser.outputEncoding>UTF-8</project.csvParser.outputEncoding>
42-
<jackson.version>2.12.2</jackson.version>
42+
<jackson.version>2.12.6</jackson.version>
43+
<jackson-databind.version>2.12.6.1</jackson-databind.version>
4344
<generated-sources.dir>src/generated/java</generated-sources.dir>
4445
</properties>
4546

0 commit comments

Comments
 (0)