mirror of
https://gitee.com/dolphinscheduler/DolphinScheduler.git
synced 2024-11-29 18:58:05 +08:00
Remove duplicate Spring version management (#11899)
This commit is contained in:
kezhenxu94
GitHub
parent
cc5f710147
commit
147e0ae8d7
@ -177,8 +177,8 @@
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>spring-ldap</artifactId>
|
||||
<groupId>org.springframework.ldap</groupId>
|
||||
<artifactId>spring-ldap-core</artifactId>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
|
||||
@ -38,7 +38,7 @@ import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.ldap.support.filter.EqualsFilter;
|
||||
import org.springframework.ldap.filter.EqualsFilter;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
@Component
|
||||
|
||||
@ -30,7 +30,7 @@
|
||||
<properties>
|
||||
<netty.version>4.1.53.Final</netty.version>
|
||||
<spring-boot.version>2.7.3</spring-boot.version>
|
||||
<spring.version>5.3.19</spring.version>
|
||||
<spring-ldap.version>2.4.1</spring-ldap.version>
|
||||
<java-websocket.version>1.5.1</java-websocket.version>
|
||||
<mybatis-plus.version>3.5.2</mybatis-plus.version>
|
||||
<quartz.version>2.3.2</quartz.version>
|
||||
@ -84,7 +84,7 @@
|
||||
<commons-math3.version>3.1.1</commons-math3.version>
|
||||
<error_prone_annotations.version>2.5.1</error_prone_annotations.version>
|
||||
<hibernate-validator.version>6.2.2.Final</hibernate-validator.version>
|
||||
<aws-sdk.version>1.12.160</aws-sdk.version>
|
||||
<aws-sdk.version>1.12.300</aws-sdk.version>
|
||||
<joda-time.version>2.10.13</joda-time.version>
|
||||
<okhttp.version>3.14.9</okhttp.version>
|
||||
<json-path.version>2.7.0</json-path.version>
|
||||
@ -121,35 +121,9 @@
|
||||
<type>pom</type>
|
||||
<scope>import</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>spring-core</artifactId>
|
||||
<version>${spring.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>spring-context</artifactId>
|
||||
<version>${spring.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>spring-beans</artifactId>
|
||||
<version>${spring.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>spring-tx</artifactId>
|
||||
<version>${spring.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>spring-jdbc</artifactId>
|
||||
<version>${spring.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>spring-test</artifactId>
|
||||
<version>${spring.version}</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
|
||||
@ -641,17 +615,22 @@
|
||||
<artifactId>aws-java-sdk-emr</artifactId>
|
||||
<version>${aws-sdk.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>joda-time</groupId>
|
||||
<artifactId>joda-time</artifactId>
|
||||
<version>${joda-time.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>com.amazonaws</groupId>
|
||||
<artifactId>aws-java-sdk-s3</artifactId>
|
||||
<version>${aws-sdk.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.amazonaws</groupId>
|
||||
<artifactId>aws-java-sdk-sagemaker</artifactId>
|
||||
<version>${aws-sdk.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>joda-time</groupId>
|
||||
<artifactId>joda-time</artifactId>
|
||||
<version>${joda-time.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>com.jayway.jsonpath</groupId>
|
||||
@ -682,9 +661,9 @@
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>spring-ldap</artifactId>
|
||||
<version>1.1.2</version>
|
||||
<groupId>org.springframework.ldap</groupId>
|
||||
<artifactId>spring-ldap-core</artifactId>
|
||||
<version>${spring-ldap.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
|
||||
@ -357,7 +357,7 @@ The text of each license is also included at licenses/LICENSE-[project].txt.
|
||||
snappy-java 1.1.8.4: https://github.com/xerial/snappy-java, Apache 2.0
|
||||
SparseBitSet 1.2: https://mvnrepository.com/artifact/com.zaxxer/SparseBitSet/1.2, Apache 2.0
|
||||
spring-aop 5.3.13: https://mvnrepository.com/artifact/org.springframework/spring-aop/5.3.13, Apache 2.0
|
||||
spring-beans 5.3.19: https://mvnrepository.com/artifact/org.springframework/spring-beans/5.3.19, Apache 2.0
|
||||
spring-beans 5.3.22: https://mvnrepository.com/artifact/org.springframework/spring-beans/5.3.22, Apache 2.0
|
||||
spring-boot 2.7.3: https://mvnrepository.com/artifact/org.springframework.boot/spring-boot/2.7.3, Apache 2.0
|
||||
spring-boot-actuator 2.7.3: https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-actuator/2.7.3, Apache 2.0
|
||||
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.
|
||||
spring-boot-starter-quartz 2.7.3: https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-quartz/2.7.3, Apache 2.0
|
||||
spring-boot-starter-web 2.7.3: https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-web/2.7.3, Apache 2.0
|
||||
spring-boot-starter-cache 2.7.3: https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-cache/2.7.3, Apache 2.0
|
||||
spring-context 5.3.19: https://mvnrepository.com/artifact/org.springframework/spring-context/5.3.19, Apache 2.0
|
||||
spring-context 5.3.22: https://mvnrepository.com/artifact/org.springframework/spring-context/5.3.22, Apache 2.0
|
||||
spring-context-support 5.3.13: https://mvnrepository.com/artifact/org.springframework/spring-context-support/5.3.13, Apache 2.0
|
||||
spring-core 5.3.19: https://mvnrepository.com/artifact/org.springframework/spring-core/5.3.19, Apache 2.0
|
||||
spring-core 5.3.22: https://mvnrepository.com/artifact/org.springframework/spring-core/5.3.22, Apache 2.0
|
||||
spring-expression 5.3.13: https://mvnrepository.com/artifact/org.springframework/spring-expression/5.3.13, Apache 2.0
|
||||
springfox-core 3.0.0: https://mvnrepository.com/artifact/io.springfox/springfox-core/3.0.0, Apache 2.0
|
||||
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.
|
||||
springfox-swagger-common 3.0.0: https://mvnrepository.com/artifact/io.springfox/springfox-swagger-common/3.0.0, Apache 2.0
|
||||
springfox-swagger-ui 3.0.0: https://mvnrepository.com/artifact/io.springfox/springfox-swagger-ui/3.0.0, Apache 2.0
|
||||
spring-jcl 5.3.13: https://mvnrepository.com/artifact/org.springframework/spring-jcl/5.3.13, Apache 2.0
|
||||
spring-jdbc 5.3.19: https://mvnrepository.com/artifact/org.springframework/spring-jdbc/5.3.19, Apache 2.0
|
||||
spring-jdbc 5.3.22: https://mvnrepository.com/artifact/org.springframework/spring-jdbc/5.3.22, Apache 2.0
|
||||
spring-plugin-core 2.0.0.RELEASE: https://mvnrepository.com/artifact/org.springframework.plugin/spring-plugin-core/2.0.0.RELEASE, Apache 2.0
|
||||
spring-plugin-metadata 2.0.0.RELEASE: https://mvnrepository.com/artifact/org.springframework.plugin/spring-plugin-metadata/2.0.0.RELEASE, Apache 2.0
|
||||
spring-tx 5.3.19: https://mvnrepository.com/artifact/org.springframework/spring-tx/5.3.19, Apache 2.0
|
||||
spring-tx 5.3.22: https://mvnrepository.com/artifact/org.springframework/spring-tx/5.3.22, Apache 2.0
|
||||
spring-web 5.3.13: https://mvnrepository.com/artifact/org.springframework/spring-web/5.3.13, Apache 2.0
|
||||
spring-webmvc 5.3.13: https://mvnrepository.com/artifact/org.springframework/spring-webmvc/5.3.13, Apache 2.0
|
||||
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.
|
||||
jakarta.validation-api 2.0.2 https://mvnrepository.com/artifact/jakarta.validation/jakarta.validation-api/2.0.2, Apache 2.0
|
||||
jboss-logging:jar 3.4.3.Final https://mvnrepository.com/artifact/org.jboss.logging/jboss-logging/3.4.3.Final, Apache 2.0
|
||||
ion-java 1.0.2 https://mvnrepository.com/artifact/software.amazon.ion/ion-java/1.0.2 Apache 2.0
|
||||
jmespath-java 1.12.160 https://mvnrepository.com/artifact/com.amazonaws/jmespath-java/1.12.160 Apache 2.0
|
||||
jmespath-java 1.12.300 https://mvnrepository.com/artifact/com.amazonaws/jmespath-java/1.12.300 Apache 2.0
|
||||
jackson-dataformat-cbor 2.13.0 https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-cbor/2.13.0 Apache 2.0
|
||||
aws-java-sdk-emr 1.12.160 https://mvnrepository.com/artifact/com.amazonaws/aws-java-sdk-emr/1.12.160 Apache 2.0
|
||||
aws-java-sdk-core 1.12.160 https://mvnrepository.com/artifact/com.amazonaws/aws-java-sdk-core/1.12.160 Apache 2.0
|
||||
aws-java-sdk-s3 1.12.160 https://mvnrepository.com/artifact/com.amazonaws/aws-java-sdk-s3/1.12.160 Apache 2.0
|
||||
aws-java-sdk-core-1.12.160 https://mvnrepository.com/artifact/com.amazonaws/aws-java-sdk-core/1.12.160 Apache 2.0
|
||||
aws-java-sdk-kms-1.12.160 https://mvnrepository.com/artifact/com.amazonaws/aws-java-sdk-kms/1.12.160 Apache 2.0
|
||||
aws-java-sdk-sagemaker-1.12.160 https://mvnrepository.com/artifact/com.amazonaws/aws-java-sdk-sagemaker/1.12.160 Apache 2.0
|
||||
aws-java-sdk-emr 1.12.300 https://mvnrepository.com/artifact/com.amazonaws/aws-java-sdk-emr/1.12.300 Apache 2.0
|
||||
aws-java-sdk-core 1.12.300 https://mvnrepository.com/artifact/com.amazonaws/aws-java-sdk-core/1.12.300 Apache 2.0
|
||||
aws-java-sdk-s3 1.12.300 https://mvnrepository.com/artifact/com.amazonaws/aws-java-sdk-s3/1.12.300 Apache 2.0
|
||||
aws-java-sdk-core-1.12.300 https://mvnrepository.com/artifact/com.amazonaws/aws-java-sdk-core/1.12.300 Apache 2.0
|
||||
aws-java-sdk-kms-1.12.300 https://mvnrepository.com/artifact/com.amazonaws/aws-java-sdk-kms/1.12.300 Apache 2.0
|
||||
aws-java-sdk-sagemaker-1.12.300 https://mvnrepository.com/artifact/com.amazonaws/aws-java-sdk-sagemaker/1.12.300 Apache 2.0
|
||||
commons-text 1.8: https://mvnrepository.com/artifact/org.apache.commons/commons-text/1.8, Apache 2.0
|
||||
httpasyncclient 4.1.5: https://mvnrepository.com/artifact/org.apache.httpcomponents/httpasyncclient/4.1.4, Apache 2.0
|
||||
httpcore-nio 4.4.15: https://mvnrepository.com/artifact/org.apache.httpcomponents/httpcore-nio/4.4.15, Apache 2.0
|
||||
|
||||
@ -362,7 +362,7 @@ This product contains the Maven wrapper scripts from 'Maven Wrapper', that provi
|
||||
Spring Framework NOTICE
|
||||
|
||||
========================================================================
|
||||
Spring Framework 5.3.19
|
||||
Spring Framework 5.3.22
|
||||
Copyright (c) 2002-2022 Pivotal, Inc.
|
||||
|
||||
This product is licensed to you under the Apache License, Version 2.0
|
||||
|
||||
@ -15,15 +15,14 @@
|
||||
~ See the License for the specific language governing permissions and
|
||||
~ limitations under the License.
|
||||
-->
|
||||
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<artifactId>dolphinscheduler-task-plugin</artifactId>
|
||||
<groupId>org.apache.dolphinscheduler</groupId>
|
||||
<artifactId>dolphinscheduler-task-plugin</artifactId>
|
||||
<version>dev-SNAPSHOT</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<artifactId>dolphinscheduler-task-sagemaker</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
@ -47,7 +46,6 @@
|
||||
<dependency>
|
||||
<groupId>com.amazonaws</groupId>
|
||||
<artifactId>aws-java-sdk-sagemaker</artifactId>
|
||||
<version>1.12.160</version>
|
||||
</dependency>
|
||||
|
||||
</dependencies>
|
||||
|
||||
@ -12,11 +12,11 @@ aspectjweaver-1.9.7.jar
|
||||
audience-annotations-0.12.0.jar
|
||||
automaton-1.11-8.jar
|
||||
avro-1.7.7.jar
|
||||
aws-java-sdk-core-1.12.160.jar
|
||||
aws-java-sdk-emr-1.12.160.jar
|
||||
aws-java-sdk-kms-1.12.160.jar
|
||||
aws-java-sdk-s3-1.12.160.jar
|
||||
aws-java-sdk-sagemaker-1.12.160.jar
|
||||
aws-java-sdk-core-1.12.300.jar
|
||||
aws-java-sdk-emr-1.12.300.jar
|
||||
aws-java-sdk-kms-1.12.300.jar
|
||||
aws-java-sdk-s3-1.12.300.jar
|
||||
aws-java-sdk-sagemaker-1.12.300.jar
|
||||
bcpkix-jdk15on-1.68.jar
|
||||
bcprov-jdk15on-1.68.jar
|
||||
bonecp-0.8.0.RELEASE.jar
|
||||
@ -142,7 +142,7 @@ jetty-util-ajax-9.4.48.v20220622.jar
|
||||
jetty-webapp-9.4.48.v20220622.jar
|
||||
jetty-xml-9.4.48.v20220622.jar
|
||||
jline-2.12.jar
|
||||
jmespath-java-1.12.160.jar
|
||||
jmespath-java-1.12.300.jar
|
||||
jna-5.10.0.jar
|
||||
jna-platform-5.10.0.jar
|
||||
joda-time-2.10.13.jar
|
||||
@ -258,7 +258,7 @@ slf4j-api-1.7.36.jar
|
||||
snakeyaml-1.31.jar
|
||||
snappy-java-1.1.8.4.jar
|
||||
spring-aop-5.3.22.jar
|
||||
spring-beans-5.3.19.jar
|
||||
spring-beans-5.3.22.jar
|
||||
spring-boot-2.7.3.jar
|
||||
spring-boot-actuator-2.7.3.jar
|
||||
spring-boot-actuator-autoconfigure-2.7.3.jar
|
||||
@ -282,19 +282,19 @@ spring-cloud-kubernetes-fabric8-config-2.1.3.jar
|
||||
spring-cloud-starter-3.1.3.jar
|
||||
spring-cloud-starter-bootstrap-3.1.3.jar
|
||||
spring-cloud-starter-kubernetes-fabric8-config-2.1.3.jar
|
||||
spring-context-5.3.19.jar
|
||||
spring-context-5.3.22.jar
|
||||
spring-context-support-5.3.22.jar
|
||||
spring-core-5.3.19.jar
|
||||
spring-core-5.3.22.jar
|
||||
spring-expression-5.3.22.jar
|
||||
spring-jcl-5.3.22.jar
|
||||
spring-jdbc-5.3.19.jar
|
||||
spring-ldap-1.1.2.jar
|
||||
spring-jdbc-5.3.22.jar
|
||||
spring-ldap-core-2.4.1.jar
|
||||
spring-plugin-core-2.0.0.RELEASE.jar
|
||||
spring-plugin-metadata-2.0.0.RELEASE.jar
|
||||
spring-retry-1.3.3.jar
|
||||
spring-security-crypto-5.7.3.jar
|
||||
spring-security-rsa-1.0.10.RELEASE.jar
|
||||
spring-tx-5.3.19.jar
|
||||
spring-tx-5.3.22.jar
|
||||
spring-web-5.3.22.jar
|
||||
spring-webmvc-5.3.22.jar
|
||||
springfox-bean-validators-3.0.0.jar
|
||||
|
||||
Loading…
Reference in New Issue
Block a user