Skip to content

Commit

Permalink
Update Spring Boot and explicit dependency versions. Fixes spring-clo…
Browse files Browse the repository at this point in the history
  • Loading branch information
Corneil du Plessis committed Oct 26, 2023
1 parent 7ece601 commit d337975
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion spring-cloud-dataflow-build/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<main.basedir>${basedir}</main.basedir>
<docs.main>${project.artifactId}</docs.main>
<!-- Keep spring boot version in sync between spring-cloud-dataflow-build and spring-boot-dependencies (parent and properties) -->
<spring-boot.version>2.7.16</spring-boot.version>
<spring-boot.version>2.7.17</spring-boot.version>
<dataflow.version>2.11.2-SNAPSHOT</dataflow.version>
<docs.resources.dir>${project.build.directory}/build-docs</docs.resources.dir>
<refdocs.build.directory>${project.build.directory}/refdocs/</refdocs.build.directory>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,23 +14,23 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<!-- Keep spring boot version in sync between spring-cloud-dataflow-build and spring-boot-dependencies (parent and properties) -->
<version>2.7.16</version>
<version>2.7.17</version>
<relativePath/>
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!-- Keep spring boot version in sync between spring-cloud-dataflow-build and spring-boot-dependencies (parent and properties) -->
<spring-boot.version>2.7.16</spring-boot.version>
<spring-boot.version>2.7.17</spring-boot.version>
<spring-cloud.version>2021.0.8</spring-cloud.version>
<spring-shell.version>2.1.12</spring-shell.version>
<spring-shell.version>2.1.13</spring-shell.version>
<commons-io.version>2.7</commons-io.version>
<commons-text.version>1.10.0</commons-text.version>
<testcontainers.version>1.17.6</testcontainers.version>
<!-- Specific version overrides to deal w/ CVEs -->
<snakeyaml.version>1.33</snakeyaml.version>
<json-smart.version>2.4.11</json-smart.version>
<nimbus-jose-jwt.version>9.31</nimbus-jose-jwt.version>
<snappy-java.version>1.1.10.4</snappy-java.version>
<nimbus-jose-jwt.version>9.37</nimbus-jose-jwt.version>
<snappy-java.version>1.1.10.5</snappy-java.version>
<commons-compress.version>1.24.0</commons-compress.version>
<postgresql.version>42.4.3</postgresql.version>
<prometheus-rsocket.version>1.5.2</prometheus-rsocket.version>
Expand Down
8 changes: 4 additions & 4 deletions spring-cloud-dataflow-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<java.version>1.8</java.version>
<javadoc.opts>-Xdoclint:none</javadoc.opts>
<maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
<spring-boot.version>2.7.16</spring-boot.version>
<spring-boot.version>2.7.17</spring-boot.version>
<spring.version>5.3.30</spring.version>
<spring-cloud-dataflow-ui.version>3.4.2-SNAPSHOT</spring-cloud-dataflow-ui.version>
<spring-cloud-dataflow-common.version>${dataflow.version}</spring-cloud-dataflow-common.version>
Expand All @@ -33,8 +33,8 @@
<!-- Specific version overrides to deal w/ CVEs -->
<snakeyaml.version>1.33</snakeyaml.version>
<json-smart.version>2.4.11</json-smart.version>
<nimbus-jose-jwt.version>9.31</nimbus-jose-jwt.version>
<snappy-java.version>1.1.10.4</snappy-java.version>
<nimbus-jose-jwt.version>9.37</nimbus-jose-jwt.version>
<snappy-java.version>1.1.10.5</snappy-java.version>
<commons-compress.version>1.24.0</commons-compress.version>

<json-unit.version>2.11.1</json-unit.version>
Expand All @@ -51,7 +51,7 @@
<!-- update to ensure it is same as spring-boot-dependencies property, which doesn't seem to be imported -->
<spring-security.version>5.7.11</spring-security.version>
<jackson-bom.version>2.13.5</jackson-bom.version>
<guava.version>32.1.1-jre</guava.version>
<guava.version>32.1.3-jre</guava.version>
</properties>
<dependencyManagement>
<dependencies>
Expand Down

0 comments on commit d337975

Please sign in to comment.