This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new da28d2faee [deps](http)Upgrade springboot version to 2.7.8 (#16158)
da28d2faee is described below
commit da28d2faeedc5a68255c3d06a732c7e4f516ec75
Author: jiafeng.zhang <[email protected]>
AuthorDate: Sat Jan 28 20:13:50 2023 +0800
[deps](http)Upgrade springboot version to 2.7.8 (#16158)
* Upgrade springboot version to 2.7.8
* fix
---
dist/LICENSE-dist.txt | 46 +++++++++++++++++++++++-----------------------
fe/fe-core/pom.xml | 10 ++++------
fe/pom.xml | 1 +
3 files changed, 28 insertions(+), 29 deletions(-)
diff --git a/dist/LICENSE-dist.txt b/dist/LICENSE-dist.txt
index 1ea749cc56..25b6826b9b 100644
--- a/dist/LICENSE-dist.txt
+++ b/dist/LICENSE-dist.txt
@@ -1075,31 +1075,31 @@ The Apache Software License, Version 2.0
* Spark Project Unsafe:
- org.apache.spark:spark-unsafe_2.12:2.4.6 (http://spark.apache.org/)
* Spring AOP:
- - org.springframework:spring-aop:5.3.22
(https://github.com/spring-projects/spring-framework)
+ - org.springframework:spring-aop:5.3.25
(https://github.com/spring-projects/spring-framework)
* Spring Beans:
- - org.springframework:spring-beans:5.3.22
(https://github.com/spring-projects/spring-framework)
+ - org.springframework:spring-beans:5.3.25
(https://github.com/spring-projects/spring-framework)
* Spring Commons Logging Bridge:
- - org.springframework:spring-jcl:5.3.22
(https://github.com/spring-projects/spring-framework)
+ - org.springframework:spring-jcl:5.3.25
(https://github.com/spring-projects/spring-framework)
* Spring Context:
- - org.springframework:spring-context:5.3.22
(https://github.com/spring-projects/spring-framework)
+ - org.springframework:spring-context:5.3.25
(https://github.com/spring-projects/spring-framework)
* Spring Core:
- - org.springframework:spring-core:5.3.22
(https://github.com/spring-projects/spring-framework)
+ - org.springframework:spring-core:5.3.25
(https://github.com/spring-projects/spring-framework)
* Spring Data Core:
- - org.springframework.data:spring-data-commons:2.7.2
(https://www.spring.io/spring-data/spring-data-commons)
+ - org.springframework.data:spring-data-commons:2.7.7
(https://www.spring.io/spring-data/spring-data-commons)
* Spring Data LDAP:
- - org.springframework.data:spring-data-ldap:2.7.2
(https://github.com/spring-projects/spring-data-ldap)
+ - org.springframework.data:spring-data-ldap:2.7.7
(https://github.com/spring-projects/spring-data-ldap)
* Spring Expression Language (SpEL):
- - org.springframework:spring-expression:5.3.22
(https://github.com/spring-projects/spring-framework)
+ - org.springframework:spring-expression:5.3.25
(https://github.com/spring-projects/spring-framework)
* Spring JDBC:
- - org.springframework:spring-jdbc:5.3.22
(https://github.com/spring-projects/spring-framework)
+ - org.springframework:spring-jdbc:5.3.25
(https://github.com/spring-projects/spring-framework)
* Spring Object/Relational Mapping:
- - org.springframework:spring-orm:5.3.22
(https://github.com/spring-projects/spring-framework)
+ - org.springframework:spring-orm:5.3.25
(https://github.com/spring-projects/spring-framework)
* Spring Transaction:
- - org.springframework:spring-tx:5.3.22
(https://github.com/spring-projects/spring-framework)
+ - org.springframework:spring-tx:5.3.25
(https://github.com/spring-projects/spring-framework)
* Spring Web:
- - org.springframework:spring-web:5.3.22
(https://github.com/spring-projects/spring-framework)
+ - org.springframework:spring-web:5.3.25
(https://github.com/spring-projects/spring-framework)
* Spring Web MVC:
- - org.springframework:spring-webmvc:5.3.22
(https://github.com/spring-projects/spring-framework)
+ - org.springframework:spring-webmvc:5.3.25
(https://github.com/spring-projects/spring-framework)
* Springloaded:
- org.springframework:springloaded:1.2.6.RELEASE
(https://github.com/spring-projects/spring-loaded)
* StAX API:
@@ -1246,25 +1246,25 @@ The Apache Software License, Version 2.0
* spark-dpp:
- org.apache.doris:spark-dpp:0.15-SNAPSHOT
(https://doris.apache.org/spark-dpp/)
* spring-boot:
- - org.springframework.boot:spring-boot:2.7.3
(https://spring.io/projects/spring-boot)
+ - org.springframework.boot:spring-boot:2.7.8
(https://spring.io/projects/spring-boot)
* spring-boot-autoconfigure:
- - org.springframework.boot:spring-boot-autoconfigure:2.7.3
(https://spring.io/projects/spring-boot)
+ - org.springframework.boot:spring-boot-autoconfigure:2.7.8
(https://spring.io/projects/spring-boot)
* spring-boot-configuration-processor:
- - org.springframework.boot:spring-boot-configuration-processor:2.7.3
(https://spring.io/projects/spring-boot)
+ - org.springframework.boot:spring-boot-configuration-processor:2.7.8
(https://spring.io/projects/spring-boot)
* spring-boot-devtools:
- - org.springframework.boot:spring-boot-devtools:2.7.3
(https://spring.io/projects/spring-boot)
+ - org.springframework.boot:spring-boot-devtools:2.7.8
(https://spring.io/projects/spring-boot)
* spring-boot-starter:
- - org.springframework.boot:spring-boot-starter:2.7.3
(https://spring.io/projects/spring-boot)
+ - org.springframework.boot:spring-boot-starter:2.7.8
(https://spring.io/projects/spring-boot)
* spring-boot-starter-data-ldap:
- - org.springframework.boot:spring-boot-starter-data-ldap:2.7.3
(https://spring.io/projects/spring-boot)
+ - org.springframework.boot:spring-boot-starter-data-ldap:2.7.8
(https://spring.io/projects/spring-boot)
* spring-boot-starter-jetty:
- - org.springframework.boot:spring-boot-starter-jetty:2.7.3
(https://spring.io/projects/spring-boot)
+ - org.springframework.boot:spring-boot-starter-jetty:2.7.8
(https://spring.io/projects/spring-boot)
* spring-boot-starter-json:
- - org.springframework.boot:spring-boot-starter-json:2.6.6
(https://spring.io/projects/spring-boot)
+ - org.springframework.boot:spring-boot-starter-json:2.7.8
(https://spring.io/projects/spring-boot)
* spring-boot-starter-logging:
- - org.springframework.boot:spring-boot-starter-logging:2.7.3
(https://spring.io/projects/spring-boot)
+ - org.springframework.boot:spring-boot-starter-logging:2.7.8
(https://spring.io/projects/spring-boot)
* spring-boot-starter-web:
- - org.springframework.boot:spring-boot-starter-web:2.7.3
(https://spring.io/projects/spring-boot)
+ - org.springframework.boot:spring-boot-starter-web:2.7.8
(https://spring.io/projects/spring-boot)
* spring-ldap-core:
- org.springframework.ldap:spring-ldap-core:2.4.1.RELEASE
(https://www.springframework.org/ldap)
* stream-lib:
diff --git a/fe/fe-core/pom.xml b/fe/fe-core/pom.xml
index 7971d65af6..38a45969ac 100644
--- a/fe/fe-core/pom.xml
+++ b/fe/fe-core/pom.xml
@@ -77,7 +77,7 @@ under the License.
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
- <version>2.7.3</version>
+ <version>${spring.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -318,11 +318,7 @@ under the License.
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</dependency>
- <!--
https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind
-->
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </dependency>
+
<!--
https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-yaml
-->
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
@@ -496,6 +492,7 @@ under the License.
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-dynamodb</artifactId>
</dependency>
+
<!--
https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-web
-->
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -840,6 +837,7 @@ under the License.
<!--<outputDirectory>src/main/java</outputDirectory>-->
</configuration>
</plugin>
+
<!--jflex-->
<plugin>
<groupId>de.jflex</groupId>
diff --git a/fe/pom.xml b/fe/pom.xml
index d9ee2dad22..d6d57bae34 100644
--- a/fe/pom.xml
+++ b/fe/pom.xml
@@ -243,6 +243,7 @@ under the License.
<joda.version>2.8.1</joda.version>
<revision>1.2-SNAPSHOT</revision>
<project.scm.id>github</project.scm.id>
+ <spring.version>2.7.8</spring.version>
</properties>
<profiles>
<!-- for custom internal repository -->
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
