Skip to content

Commit 147e0ae

Browse files
kezhenxu94kezhenxu94
authored
Remove duplicate Spring version management (#11899)
1 parent cc5f710 commit 147e0ae

7 files changed

Lines changed: 46 additions & 69 deletions

File tree

‎dolphinscheduler-api/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,8 +177,8 @@
177177
</dependency>
178178

179179
<dependency>
180-
<groupId>org.springframework</groupId>
181-
<artifactId>spring-ldap</artifactId>
180+
<groupId>org.springframework.ldap</groupId>
181+
<artifactId>spring-ldap-core</artifactId>
182182
</dependency>
183183

184184
<dependency>

‎dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/security/impl/ldap/LdapService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
import org.slf4j.LoggerFactory;
3939
import org.springframework.beans.factory.annotation.Value;
4040
import org.springframework.context.annotation.Configuration;
41-
import org.springframework.ldap.support.filter.EqualsFilter;
41+
import org.springframework.ldap.filter.EqualsFilter;
4242
import org.springframework.stereotype.Component;
4343

4444
@Component

‎dolphinscheduler-bom/pom.xml‎

Lines changed: 15 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<properties>
3131
<netty.version>4.1.53.Final</netty.version>
3232
<spring-boot.version>2.7.3</spring-boot.version>
33-
<spring.version>5.3.19</spring.version>
33+
<spring-ldap.version>2.4.1</spring-ldap.version>
3434
<java-websocket.version>1.5.1</java-websocket.version>
3535
<mybatis-plus.version>3.5.2</mybatis-plus.version>
3636
<quartz.version>2.3.2</quartz.version>
@@ -84,7 +84,7 @@
8484
<commons-math3.version>3.1.1</commons-math3.version>
8585
<error_prone_annotations.version>2.5.1</error_prone_annotations.version>
8686
<hibernate-validator.version>6.2.2.Final</hibernate-validator.version>
87-
<aws-sdk.version>1.12.160</aws-sdk.version>
87+
<aws-sdk.version>1.12.300</aws-sdk.version>
8888
<joda-time.version>2.10.13</joda-time.version>
8989
<okhttp.version>3.14.9</okhttp.version>
9090
<json-path.version>2.7.0</json-path.version>
@@ -121,35 +121,9 @@
121121
<type>pom</type>
122122
<scope>import</scope>
123123
</dependency>
124-
<dependency>
125-
<groupId>org.springframework</groupId>
126-
<artifactId>spring-core</artifactId>
127-
<version>${spring.version}</version>
128-
</dependency>
129-
<dependency>
130-
<groupId>org.springframework</groupId>
131-
<artifactId>spring-context</artifactId>
132-
<version>${spring.version}</version>
133-
</dependency>
134-
<dependency>
135-
<groupId>org.springframework</groupId>
136-
<artifactId>spring-beans</artifactId>
137-
<version>${spring.version}</version>
138-
</dependency>
139-
<dependency>
140-
<groupId>org.springframework</groupId>
141-
<artifactId>spring-tx</artifactId>
142-
<version>${spring.version}</version>
143-
</dependency>
144-
<dependency>
145-
<groupId>org.springframework</groupId>
146-
<artifactId>spring-jdbc</artifactId>
147-
<version>${spring.version}</version>
148-
</dependency>
149124
<dependency>
150125
<groupId>org.springframework</groupId>
151126
<artifactId>spring-test</artifactId>
152-
<version>${spring.version}</version>
153127
<scope>test</scope>
154128
</dependency>
155129

@@ -642,17 +616,22 @@
642616
<version>${aws-sdk.version}</version>
643617
</dependency>
644618
<dependency>
645-
<groupId>joda-time</groupId>
646-
<artifactId>joda-time</artifactId>
647-
<version>${joda-time.version}</version>
619+
<groupId>com.amazonaws</groupId>
620+
<artifactId>aws-java-sdk-s3</artifactId>
621+
<version>${aws-sdk.version}</version>
648622
</dependency>
649-
650623
<dependency>
651624
<groupId>com.amazonaws</groupId>
652-
<artifactId>aws-java-sdk-s3</artifactId>
625+
<artifactId>aws-java-sdk-sagemaker</artifactId>
653626
<version>${aws-sdk.version}</version>
654627
</dependency>
655628

629+
<dependency>
630+
<groupId>joda-time</groupId>
631+
<artifactId>joda-time</artifactId>
632+
<version>${joda-time.version}</version>
633+
</dependency>
634+
656635
<dependency>
657636
<groupId>com.jayway.jsonpath</groupId>
658637
<artifactId>json-path</artifactId>
@@ -682,9 +661,9 @@
682661
</dependency>
683662

684663
<dependency>
685-
<groupId>org.springframework</groupId>
686-
<artifactId>spring-ldap</artifactId>
687-
<version>1.1.2</version>
664+
<groupId>org.springframework.ldap</groupId>
665+
<artifactId>spring-ldap-core</artifactId>
666+
<version>${spring-ldap.version}</version>
688667
</dependency>
689668

690669
<dependency>

‎dolphinscheduler-dist/release-docs/LICENSE‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ The text of each license is also included at licenses/LICENSE-[project].txt.
357357
snappy-java 1.1.8.4: https://github.com/xerial/snappy-java, Apache 2.0
358358
SparseBitSet 1.2: https://mvnrepository.com/artifact/com.zaxxer/SparseBitSet/1.2, Apache 2.0
359359
spring-aop 5.3.13: https://mvnrepository.com/artifact/org.springframework/spring-aop/5.3.13, Apache 2.0
360-
spring-beans 5.3.19: https://mvnrepository.com/artifact/org.springframework/spring-beans/5.3.19, Apache 2.0
360+
spring-beans 5.3.22: https://mvnrepository.com/artifact/org.springframework/spring-beans/5.3.22, Apache 2.0
361361
spring-boot 2.7.3: https://mvnrepository.com/artifact/org.springframework.boot/spring-boot/2.7.3, Apache 2.0
362362
spring-boot-actuator 2.7.3: https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-actuator/2.7.3, Apache 2.0
363363
spring-boot-actuator-autoconfigure 2.7.3: https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-actuator-autoconfigure/2.7.3, Apache 2.0
@@ -373,9 +373,9 @@ The text of each license is also included at licenses/LICENSE-[project].txt.
373373
spring-boot-starter-quartz 2.7.3: https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-quartz/2.7.3, Apache 2.0
374374
spring-boot-starter-web 2.7.3: https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-web/2.7.3, Apache 2.0
375375
spring-boot-starter-cache 2.7.3: https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-cache/2.7.3, Apache 2.0
376-
spring-context 5.3.19: https://mvnrepository.com/artifact/org.springframework/spring-context/5.3.19, Apache 2.0
376+
spring-context 5.3.22: https://mvnrepository.com/artifact/org.springframework/spring-context/5.3.22, Apache 2.0
377377
spring-context-support 5.3.13: https://mvnrepository.com/artifact/org.springframework/spring-context-support/5.3.13, Apache 2.0
378-
spring-core 5.3.19: https://mvnrepository.com/artifact/org.springframework/spring-core/5.3.19, Apache 2.0
378+
spring-core 5.3.22: https://mvnrepository.com/artifact/org.springframework/spring-core/5.3.22, Apache 2.0
379379
spring-expression 5.3.13: https://mvnrepository.com/artifact/org.springframework/spring-expression/5.3.13, Apache 2.0
380380
springfox-core 3.0.0: https://mvnrepository.com/artifact/io.springfox/springfox-core/3.0.0, Apache 2.0
381381
springfox-schema 3.0.0: https://mvnrepository.com/artifact/io.springfox/springfox-schema/3.0.0, Apache 2.0
@@ -385,10 +385,10 @@ The text of each license is also included at licenses/LICENSE-[project].txt.
385385
springfox-swagger-common 3.0.0: https://mvnrepository.com/artifact/io.springfox/springfox-swagger-common/3.0.0, Apache 2.0
386386
springfox-swagger-ui 3.0.0: https://mvnrepository.com/artifact/io.springfox/springfox-swagger-ui/3.0.0, Apache 2.0
387387
spring-jcl 5.3.13: https://mvnrepository.com/artifact/org.springframework/spring-jcl/5.3.13, Apache 2.0
388-
spring-jdbc 5.3.19: https://mvnrepository.com/artifact/org.springframework/spring-jdbc/5.3.19, Apache 2.0
388+
spring-jdbc 5.3.22: https://mvnrepository.com/artifact/org.springframework/spring-jdbc/5.3.22, Apache 2.0
389389
spring-plugin-core 2.0.0.RELEASE: https://mvnrepository.com/artifact/org.springframework.plugin/spring-plugin-core/2.0.0.RELEASE, Apache 2.0
390390
spring-plugin-metadata 2.0.0.RELEASE: https://mvnrepository.com/artifact/org.springframework.plugin/spring-plugin-metadata/2.0.0.RELEASE, Apache 2.0
391-
spring-tx 5.3.19: https://mvnrepository.com/artifact/org.springframework/spring-tx/5.3.19, Apache 2.0
391+
spring-tx 5.3.22: https://mvnrepository.com/artifact/org.springframework/spring-tx/5.3.22, Apache 2.0
392392
spring-web 5.3.13: https://mvnrepository.com/artifact/org.springframework/spring-web/5.3.13, Apache 2.0
393393
spring-webmvc 5.3.13: https://mvnrepository.com/artifact/org.springframework/spring-webmvc/5.3.13, Apache 2.0
394394
swagger-annotations 1.5.20: https://mvnrepository.com/artifact/io.swagger/swagger-annotations/1.5.20, Apache 2.0
@@ -437,14 +437,14 @@ The text of each license is also included at licenses/LICENSE-[project].txt.
437437
jakarta.validation-api 2.0.2 https://mvnrepository.com/artifact/jakarta.validation/jakarta.validation-api/2.0.2, Apache 2.0
438438
jboss-logging:jar 3.4.3.Final https://mvnrepository.com/artifact/org.jboss.logging/jboss-logging/3.4.3.Final, Apache 2.0
439439
ion-java 1.0.2 https://mvnrepository.com/artifact/software.amazon.ion/ion-java/1.0.2 Apache 2.0
440-
jmespath-java 1.12.160 https://mvnrepository.com/artifact/com.amazonaws/jmespath-java/1.12.160 Apache 2.0
440+
jmespath-java 1.12.300 https://mvnrepository.com/artifact/com.amazonaws/jmespath-java/1.12.300 Apache 2.0
441441
jackson-dataformat-cbor 2.13.0 https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-cbor/2.13.0 Apache 2.0
442-
aws-java-sdk-emr 1.12.160 https://mvnrepository.com/artifact/com.amazonaws/aws-java-sdk-emr/1.12.160 Apache 2.0
443-
aws-java-sdk-core 1.12.160 https://mvnrepository.com/artifact/com.amazonaws/aws-java-sdk-core/1.12.160 Apache 2.0
444-
aws-java-sdk-s3 1.12.160 https://mvnrepository.com/artifact/com.amazonaws/aws-java-sdk-s3/1.12.160 Apache 2.0
445-
aws-java-sdk-core-1.12.160 https://mvnrepository.com/artifact/com.amazonaws/aws-java-sdk-core/1.12.160 Apache 2.0
446-
aws-java-sdk-kms-1.12.160 https://mvnrepository.com/artifact/com.amazonaws/aws-java-sdk-kms/1.12.160 Apache 2.0
447-
aws-java-sdk-sagemaker-1.12.160 https://mvnrepository.com/artifact/com.amazonaws/aws-java-sdk-sagemaker/1.12.160 Apache 2.0
442+
aws-java-sdk-emr 1.12.300 https://mvnrepository.com/artifact/com.amazonaws/aws-java-sdk-emr/1.12.300 Apache 2.0
443+
aws-java-sdk-core 1.12.300 https://mvnrepository.com/artifact/com.amazonaws/aws-java-sdk-core/1.12.300 Apache 2.0
444+
aws-java-sdk-s3 1.12.300 https://mvnrepository.com/artifact/com.amazonaws/aws-java-sdk-s3/1.12.300 Apache 2.0
445+
aws-java-sdk-core-1.12.300 https://mvnrepository.com/artifact/com.amazonaws/aws-java-sdk-core/1.12.300 Apache 2.0
446+
aws-java-sdk-kms-1.12.300 https://mvnrepository.com/artifact/com.amazonaws/aws-java-sdk-kms/1.12.300 Apache 2.0
447+
aws-java-sdk-sagemaker-1.12.300 https://mvnrepository.com/artifact/com.amazonaws/aws-java-sdk-sagemaker/1.12.300 Apache 2.0
448448
commons-text 1.8: https://mvnrepository.com/artifact/org.apache.commons/commons-text/1.8, Apache 2.0
449449
httpasyncclient 4.1.5: https://mvnrepository.com/artifact/org.apache.httpcomponents/httpasyncclient/4.1.4, Apache 2.0
450450
httpcore-nio 4.4.15: https://mvnrepository.com/artifact/org.apache.httpcomponents/httpcore-nio/4.4.15, Apache 2.0

‎dolphinscheduler-dist/release-docs/NOTICE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ This product contains the Maven wrapper scripts from 'Maven Wrapper', that provi
362362
Spring Framework NOTICE
363363

364364
========================================================================
365-
Spring Framework 5.3.19
365+
Spring Framework 5.3.22
366366
Copyright (c) 2002-2022 Pivotal, Inc.
367367

368368
This product is licensed to you under the Apache License, Version 2.0

‎dolphinscheduler-task-plugin/dolphinscheduler-task-sagemaker/pom.xml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,14 @@
1515
~ See the License for the specific language governing permissions and
1616
~ limitations under the License.
1717
-->
18-
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
19-
xmlns="http://maven.apache.org/POM/4.0.0"
18+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2019
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
20+
<modelVersion>4.0.0</modelVersion>
2121
<parent>
22-
<artifactId>dolphinscheduler-task-plugin</artifactId>
2322
<groupId>org.apache.dolphinscheduler</groupId>
23+
<artifactId>dolphinscheduler-task-plugin</artifactId>
2424
<version>dev-SNAPSHOT</version>
2525
</parent>
26-
<modelVersion>4.0.0</modelVersion>
2726

2827
<artifactId>dolphinscheduler-task-sagemaker</artifactId>
2928
<packaging>jar</packaging>
@@ -47,7 +46,6 @@
4746
<dependency>
4847
<groupId>com.amazonaws</groupId>
4948
<artifactId>aws-java-sdk-sagemaker</artifactId>
50-
<version>1.12.160</version>
5149
</dependency>
5250

5351
</dependencies>

‎tools/dependencies/known-dependencies.txt‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ aspectjweaver-1.9.7.jar
1212
audience-annotations-0.12.0.jar
1313
automaton-1.11-8.jar
1414
avro-1.7.7.jar
15-
aws-java-sdk-core-1.12.160.jar
16-
aws-java-sdk-emr-1.12.160.jar
17-
aws-java-sdk-kms-1.12.160.jar
18-
aws-java-sdk-s3-1.12.160.jar
19-
aws-java-sdk-sagemaker-1.12.160.jar
15+
aws-java-sdk-core-1.12.300.jar
16+
aws-java-sdk-emr-1.12.300.jar
17+
aws-java-sdk-kms-1.12.300.jar
18+
aws-java-sdk-s3-1.12.300.jar
19+
aws-java-sdk-sagemaker-1.12.300.jar
2020
bcpkix-jdk15on-1.68.jar
2121
bcprov-jdk15on-1.68.jar
2222
bonecp-0.8.0.RELEASE.jar
@@ -142,7 +142,7 @@ jetty-util-ajax-9.4.48.v20220622.jar
142142
jetty-webapp-9.4.48.v20220622.jar
143143
jetty-xml-9.4.48.v20220622.jar
144144
jline-2.12.jar
145-
jmespath-java-1.12.160.jar
145+
jmespath-java-1.12.300.jar
146146
jna-5.10.0.jar
147147
jna-platform-5.10.0.jar
148148
joda-time-2.10.13.jar
@@ -258,7 +258,7 @@ slf4j-api-1.7.36.jar
258258
snakeyaml-1.31.jar
259259
snappy-java-1.1.8.4.jar
260260
spring-aop-5.3.22.jar
261-
spring-beans-5.3.19.jar
261+
spring-beans-5.3.22.jar
262262
spring-boot-2.7.3.jar
263263
spring-boot-actuator-2.7.3.jar
264264
spring-boot-actuator-autoconfigure-2.7.3.jar
@@ -282,19 +282,19 @@ spring-cloud-kubernetes-fabric8-config-2.1.3.jar
282282
spring-cloud-starter-3.1.3.jar
283283
spring-cloud-starter-bootstrap-3.1.3.jar
284284
spring-cloud-starter-kubernetes-fabric8-config-2.1.3.jar
285-
spring-context-5.3.19.jar
285+
spring-context-5.3.22.jar
286286
spring-context-support-5.3.22.jar
287-
spring-core-5.3.19.jar
287+
spring-core-5.3.22.jar
288288
spring-expression-5.3.22.jar
289289
spring-jcl-5.3.22.jar
290-
spring-jdbc-5.3.19.jar
291-
spring-ldap-1.1.2.jar
290+
spring-jdbc-5.3.22.jar
291+
spring-ldap-core-2.4.1.jar
292292
spring-plugin-core-2.0.0.RELEASE.jar
293293
spring-plugin-metadata-2.0.0.RELEASE.jar
294294
spring-retry-1.3.3.jar
295295
spring-security-crypto-5.7.3.jar
296296
spring-security-rsa-1.0.10.RELEASE.jar
297-
spring-tx-5.3.19.jar
297+
spring-tx-5.3.22.jar
298298
spring-web-5.3.22.jar
299299
spring-webmvc-5.3.22.jar
300300
springfox-bean-validators-3.0.0.jar

0 commit comments

Comments
 (0)