diff --git a/dolphinscheduler-api/pom.xml b/dolphinscheduler-api/pom.xml index 1ded902ced..6b8fc764f0 100644 --- a/dolphinscheduler-api/pom.xml +++ b/dolphinscheduler-api/pom.xml @@ -177,8 +177,8 @@ - org.springframework - spring-ldap + org.springframework.ldap + spring-ldap-core diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/security/impl/ldap/LdapService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/security/impl/ldap/LdapService.java index 1cca542aab..236b5fe45e 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/security/impl/ldap/LdapService.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/security/impl/ldap/LdapService.java @@ -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 diff --git a/dolphinscheduler-bom/pom.xml b/dolphinscheduler-bom/pom.xml index 4ce1938b3d..7fce8bb4a2 100644 --- a/dolphinscheduler-bom/pom.xml +++ b/dolphinscheduler-bom/pom.xml @@ -30,7 +30,7 @@ 4.1.53.Final 2.7.3 - 5.3.19 + 2.4.1 1.5.1 3.5.2 2.3.2 @@ -84,7 +84,7 @@ 3.1.1 2.5.1 6.2.2.Final - 1.12.160 + 1.12.300 2.10.13 3.14.9 2.7.0 @@ -121,35 +121,9 @@ pom import - - org.springframework - spring-core - ${spring.version} - - - org.springframework - spring-context - ${spring.version} - - - org.springframework - spring-beans - ${spring.version} - - - org.springframework - spring-tx - ${spring.version} - - - org.springframework - spring-jdbc - ${spring.version} - org.springframework spring-test - ${spring.version} test @@ -642,17 +616,22 @@ ${aws-sdk.version} - joda-time - joda-time - ${joda-time.version} + com.amazonaws + aws-java-sdk-s3 + ${aws-sdk.version} - com.amazonaws - aws-java-sdk-s3 + aws-java-sdk-sagemaker ${aws-sdk.version} + + joda-time + joda-time + ${joda-time.version} + + com.jayway.jsonpath json-path @@ -682,9 +661,9 @@ - org.springframework - spring-ldap - 1.1.2 + org.springframework.ldap + spring-ldap-core + ${spring-ldap.version} diff --git a/dolphinscheduler-dist/release-docs/LICENSE b/dolphinscheduler-dist/release-docs/LICENSE index bfb41a08fe..88dc8871d0 100644 --- a/dolphinscheduler-dist/release-docs/LICENSE +++ b/dolphinscheduler-dist/release-docs/LICENSE @@ -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 diff --git a/dolphinscheduler-dist/release-docs/NOTICE b/dolphinscheduler-dist/release-docs/NOTICE index 18a684fb87..904f9098df 100644 --- a/dolphinscheduler-dist/release-docs/NOTICE +++ b/dolphinscheduler-dist/release-docs/NOTICE @@ -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 diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-sagemaker/pom.xml b/dolphinscheduler-task-plugin/dolphinscheduler-task-sagemaker/pom.xml index 66f761d825..dfb769a46c 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-sagemaker/pom.xml +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-sagemaker/pom.xml @@ -15,15 +15,14 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 - dolphinscheduler-task-plugin org.apache.dolphinscheduler + dolphinscheduler-task-plugin dev-SNAPSHOT - 4.0.0 dolphinscheduler-task-sagemaker jar @@ -47,7 +46,6 @@ com.amazonaws aws-java-sdk-sagemaker - 1.12.160 diff --git a/tools/dependencies/known-dependencies.txt b/tools/dependencies/known-dependencies.txt index 00b2d66abe..ef92dc43a0 100644 --- a/tools/dependencies/known-dependencies.txt +++ b/tools/dependencies/known-dependencies.txt @@ -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