Skip to content

Commit 0bfbd15

Browse files
author
Corneil du Plessis
authored
Update Spring Framework to 5.3.34 (#5788)
Update Spring Security to 5.7.12 Update Spring Shell to 2.1.15
1 parent fddafed commit 0bfbd15

File tree

6 files changed

+50
-30
lines changed

6 files changed

+50
-30
lines changed

‎pom.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,10 @@
5050
</developer>
5151
</developers>
5252
<modules>
53+
<module>spring-cloud-dataflow-parent</module>
5354
<module>spring-cloud-dataflow-build</module>
54-
5555
<module>spring-cloud-dataflow-common</module>
5656
<module>spring-cloud-common-security-config</module>
57-
<module>spring-cloud-dataflow-parent</module>
5857
<module>spring-cloud-dataflow-container-registry</module>
5958
<module>spring-cloud-dataflow-configuration-metadata</module>
6059
<module>spring-cloud-dataflow-core-dsl</module>

‎spring-cloud-common-security-config/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99

1010
<parent>
1111
<groupId>org.springframework.cloud</groupId>
12-
<artifactId>spring-cloud-dataflow-build</artifactId>
12+
<artifactId>spring-cloud-dataflow-parent</artifactId>
1313
<version>2.11.3-SNAPSHOT</version>
14-
<relativePath>../spring-cloud-dataflow-build</relativePath>
14+
<relativePath>../spring-cloud-dataflow-parent</relativePath>
1515
</parent>
1616

1717
<modules>

‎spring-cloud-dataflow-build/pom.xml

+4
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@
2222
<docs.main>${project.artifactId}</docs.main>
2323
<!-- Keep spring boot version in sync between spring-cloud-dataflow-build and spring-boot-dependencies (parent and properties) -->
2424
<spring-boot.version>2.7.18</spring-boot.version>
25+
<spring-framework.version>5.3.34</spring-framework.version>
26+
<spring-cloud.version>2021.0.9</spring-cloud.version>
27+
<spring-security.version>5.7.12</spring-security.version>
28+
<spring-shell.version>2.1.15</spring-shell.version>
2529
<dataflow.version>2.11.3-SNAPSHOT</dataflow.version>
2630
<docs.resources.dir>${project.build.directory}/build-docs</docs.resources.dir>
2731
<refdocs.build.directory>${project.build.directory}/refdocs/</refdocs.build.directory>

‎spring-cloud-dataflow-build/spring-cloud-dataflow-build-dependencies/pom.xml

+16-1
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,9 @@
2121
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2222
<!-- Keep spring boot version in sync between spring-cloud-dataflow-build and spring-boot-dependencies (parent and properties) -->
2323
<spring-boot.version>2.7.18</spring-boot.version>
24-
<spring-framework.version>5.3.32</spring-framework.version>
24+
<spring-framework.version>5.3.34</spring-framework.version>
2525
<spring-cloud.version>2021.0.9</spring-cloud.version>
26+
<spring-security.version>5.7.12</spring-security.version>
2627
<spring-shell.version>2.1.13</spring-shell.version>
2728
<commons-io.version>2.7</commons-io.version>
2829
<commons-text.version>1.10.0</commons-text.version>
@@ -90,6 +91,20 @@
9091
<type>pom</type>
9192
<scope>import</scope>
9293
</dependency>
94+
<dependency>
95+
<groupId>org.springframework</groupId>
96+
<artifactId>spring-framework-bom</artifactId>
97+
<version>${spring-framework.version}</version>
98+
<type>pom</type>
99+
<scope>import</scope>
100+
</dependency>
101+
<dependency>
102+
<groupId>org.springframework.security</groupId>
103+
<artifactId>spring-security-bom</artifactId>
104+
<version>${spring-security.version}</version>
105+
<type>pom</type>
106+
<scope>import</scope>
107+
</dependency>
93108
<dependency>
94109
<groupId>org.springframework.cloud</groupId>
95110
<artifactId>spring-cloud-dependencies</artifactId>

‎spring-cloud-dataflow-parent/pom.xml

+16-14
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
<javadoc.opts>-Xdoclint:none</javadoc.opts>
1919
<maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
2020
<spring-boot.version>2.7.18</spring-boot.version>
21-
<spring-framework.version>5.3.32</spring-framework.version>
21+
<spring-framework.version>5.3.34</spring-framework.version>
22+
<spring-security.version>5.7.12</spring-security.version>
2223
<spring-cloud-dataflow-ui.version>3.4.3-SNAPSHOT</spring-cloud-dataflow-ui.version>
2324
<spring-cloud-dataflow-common.version>${dataflow.version}</spring-cloud-dataflow-common.version>
2425
<spring-cloud-skipper.version>${dataflow.version}</spring-cloud-skipper.version>
@@ -50,7 +51,6 @@
5051
<spring-cloud-dataflow-apps-metadata-plugin.version>1.0.7</spring-cloud-dataflow-apps-metadata-plugin.version>
5152
<springdoc-openapi-ui.version>1.6.6</springdoc-openapi-ui.version>
5253
<!-- update to ensure it is same as spring-boot-dependencies property, which doesn't seem to be imported -->
53-
<spring-security.version>5.7.11</spring-security.version>
5454
<jackson-bom.version>2.13.5</jackson-bom.version>
5555
<guava.version>32.1.3-jre</guava.version>
5656
<logback.version>1.2.13</logback.version>
@@ -121,11 +121,6 @@
121121
<artifactId>jettison</artifactId>
122122
<version>${jettison.version}</version>
123123
</dependency>
124-
<dependency>
125-
<groupId>org.springframework.security</groupId>
126-
<artifactId>spring-security-oauth2-client</artifactId>
127-
<version>${spring-security.version}</version>
128-
</dependency>
129124
<!-- Override Logback provided by Spring Boot -->
130125
<dependency>
131126
<groupId>ch.qos.logback</groupId>
@@ -149,6 +144,20 @@
149144
<type>pom</type>
150145
<scope>import</scope>
151146
</dependency>
147+
<dependency>
148+
<groupId>org.springframework.security</groupId>
149+
<artifactId>spring-security-bom</artifactId>
150+
<version>${spring-security.version}</version>
151+
<type>pom</type>
152+
<scope>import</scope>
153+
</dependency>
154+
<dependency>
155+
<groupId>org.springframework.cloud</groupId>
156+
<artifactId>spring-cloud-task-dependencies</artifactId>
157+
<version>${spring-cloud-task.version}</version>
158+
<type>pom</type>
159+
<scope>import</scope>
160+
</dependency>
152161
<dependency>
153162
<groupId>org.springframework.boot</groupId>
154163
<artifactId>spring-boot-dependencies</artifactId>
@@ -185,13 +194,6 @@
185194
<artifactId>spring-cloud-starter-common-security-config-web</artifactId>
186195
<version>${dataflow.version}</version>
187196
</dependency>
188-
<dependency>
189-
<groupId>org.springframework.cloud</groupId>
190-
<artifactId>spring-cloud-task-dependencies</artifactId>
191-
<version>${spring-cloud-task.version}</version>
192-
<type>pom</type>
193-
<scope>import</scope>
194-
</dependency>
195197
<dependency>
196198
<groupId>org.springframework.cloud</groupId>
197199
<artifactId>spring-cloud-starter-single-step-batch-job</artifactId>

‎spring-cloud-skipper/pom.xml

+11-11
Original file line numberDiff line numberDiff line change
@@ -87,12 +87,12 @@
8787
<dependency>
8888
<groupId>org.springframework.cloud</groupId>
8989
<artifactId>spring-cloud-common-security-config-web</artifactId>
90-
<version>${dataflow.version}</version>
90+
<version>${project.version}</version>
9191
</dependency>
9292
<dependency>
9393
<groupId>org.springframework.cloud</groupId>
9494
<artifactId>spring-cloud-starter-common-security-config-web</artifactId>
95-
<version>${dataflow.version}</version>
95+
<version>${project.version}</version>
9696
</dependency>
9797
<dependency>
9898
<groupId>org.springframework.security.oauth.boot</groupId>
@@ -102,47 +102,47 @@
102102
<dependency>
103103
<groupId>org.springframework.cloud</groupId>
104104
<artifactId>spring-cloud-skipper-autoconfigure</artifactId>
105-
<version>${dataflow.version}</version>
105+
<version>${project.version}</version>
106106
</dependency>
107107
<dependency>
108108
<groupId>org.springframework.cloud</groupId>
109109
<artifactId>spring-cloud-skipper-client</artifactId>
110-
<version>${dataflow.version}</version>
110+
<version>${project.version}</version>
111111
</dependency>
112112
<dependency>
113113
<groupId>org.springframework.cloud</groupId>
114114
<artifactId>spring-cloud-skipper</artifactId>
115-
<version>${dataflow.version}</version>
115+
<version>${project.version}</version>
116116
</dependency>
117117
<dependency>
118118
<groupId>org.springframework.cloud</groupId>
119119
<artifactId>spring-cloud-skipper-server-core</artifactId>
120-
<version>${dataflow.version}</version>
120+
<version>${project.version}</version>
121121
</dependency>
122122
<dependency>
123123
<groupId>org.springframework.cloud</groupId>
124124
<artifactId>spring-cloud-skipper-server</artifactId>
125-
<version>${dataflow.version}</version>
125+
<version>${project.version}</version>
126126
</dependency>
127127
<dependency>
128128
<groupId>org.springframework.cloud</groupId>
129129
<artifactId>spring-cloud-skipper-shell</artifactId>
130-
<version>${dataflow.version}</version>
130+
<version>${project.version}</version>
131131
</dependency>
132132
<dependency>
133133
<groupId>org.springframework.cloud</groupId>
134134
<artifactId>spring-cloud-skipper-shell-commands</artifactId>
135-
<version>${dataflow.version}</version>
135+
<version>${project.version}</version>
136136
</dependency>
137137
<dependency>
138138
<groupId>org.springframework.cloud</groupId>
139139
<artifactId>spring-cloud-skipper-platform-cloudfoundry</artifactId>
140-
<version>${dataflow.version}</version>
140+
<version>${project.version}</version>
141141
</dependency>
142142
<dependency>
143143
<groupId>org.springframework.cloud</groupId>
144144
<artifactId>spring-cloud-skipper-platform-kubernetes</artifactId>
145-
<version>${dataflow.version}</version>
145+
<version>${project.version}</version>
146146
</dependency>
147147
<dependency>
148148
<groupId>org.springframework.cloud</groupId>

0 commit comments

Comments
 (0)