You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by do...@apache.org on 2022/02/11 02:41:08 UTC
[incubator-inlong] branch master updated: [INLONG-2457] [TubeMQ] upgrade to spring 5.3.15 (#2460)
This is an automated email from the ASF dual-hosted git repository.
dockerzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-inlong.git
The following commit(s) were added to refs/heads/master by this push:
new 095b70b [INLONG-2457] [TubeMQ] upgrade to spring 5.3.15 (#2460)
095b70b is described below
commit 095b70bf46210967f10c929161d68da830af460b
Author: PJ Fanning <pj...@users.noreply.github.com>
AuthorDate: Fri Feb 11 03:41:02 2022 +0100
[INLONG-2457] [TubeMQ] upgrade to spring 5.3.15 (#2460)
---
inlong-audit/pom.xml | 4 ++--
inlong-tubemq/pom.xml | 10 +++++-----
inlong-tubemq/tubemq-manager/pom.xml | 13 +++++++------
licenses/inlong-tubemq/LICENSE-binary | 18 +++++++++---------
4 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/inlong-audit/pom.xml b/inlong-audit/pom.xml
index 1facc71..1af5704 100644
--- a/inlong-audit/pom.xml
+++ b/inlong-audit/pom.xml
@@ -56,7 +56,7 @@
<mybatis.starter.version>2.1.3</mybatis.starter.version>
<mysql.version>8.0.20</mysql.version>
<spring.boot.version>2.6.0</spring.boot.version>
- <spring.version>5.3.13</spring.version>
+ <spring.version>5.3.15</spring.version>
<lombok.verison>1.18.12</lombok.verison>
<druid.version>1.2.6</druid.version>
<elasticsearch.version>6.8.23</elasticsearch.version>
@@ -65,7 +65,7 @@
<jackson.version>2.12.3</jackson.version>
<junit.version>4.12</junit.version>
<autoconfigure.version>2.4.3</autoconfigure.version>
- <spring.plugin.version>2.3.3.RELEASE</spring.plugin.version>
+ <spring.plugin.version>2.6.3</spring.plugin.version>
</properties>
<dependencyManagement>
<dependencies>
diff --git a/inlong-tubemq/pom.xml b/inlong-tubemq/pom.xml
index 32520f7..be3e607 100644
--- a/inlong-tubemq/pom.xml
+++ b/inlong-tubemq/pom.xml
@@ -81,7 +81,7 @@
<protobuf.version>2.5.0</protobuf.version>
<je.version>7.3.7</je.version>
<gson.version>2.8.5</gson.version>
- <spring.boot.version>2.3.3.RELEASE</spring.boot.version>
+ <spring.boot.version>2.6.3</spring.boot.version>
<mysql.java.version>8.0.21</mysql.java.version>
</properties>
@@ -287,22 +287,22 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>5.2.8.RELEASE</version>
+ <version>5.3.15</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- <version>5.2.8.RELEASE</version>
+ <version>5.3.15</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
- <version>5.2.8.RELEASE</version>
+ <version>5.3.15</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId>
- <version>5.2.8.RELEASE</version>
+ <version>5.3.15</version>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
diff --git a/inlong-tubemq/tubemq-manager/pom.xml b/inlong-tubemq/tubemq-manager/pom.xml
index 343bf1b..f1c3559 100644
--- a/inlong-tubemq/tubemq-manager/pom.xml
+++ b/inlong-tubemq/tubemq-manager/pom.xml
@@ -35,7 +35,7 @@
<docker.image.prefix>springboot-docker</docker.image.prefix>
<swagger.version>3.0.0</swagger.version>
<swagger-annotations.version>1.6.2</swagger-annotations.version>
- <spring-boot.version>2.3.3.RELEASE</spring-boot.version>
+ <spring-boot.version>2.6.3</spring-boot.version>
</properties>
<dependencies>
@@ -45,11 +45,6 @@
<version>${spring-boot.version}</version>
</dependency>
<dependency>
- <groupId>org.springframework.data</groupId>
- <artifactId>spring-data-commons</artifactId>
- <version>${spring-boot.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</dependency>
@@ -153,6 +148,12 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-spring-web</artifactId>
<version>3.0.0</version>
diff --git a/licenses/inlong-tubemq/LICENSE-binary b/licenses/inlong-tubemq/LICENSE-binary
index 337cc54..ea4214a 100644
--- a/licenses/inlong-tubemq/LICENSE-binary
+++ b/licenses/inlong-tubemq/LICENSE-binary
@@ -246,15 +246,15 @@ Apache License Version 2.0:
* ini4j
- org.ini4j:ini4j:ini4j-0.5.1.jar
* Spring Framework
- - org.springframework:spring-core:spring-core-5.2.8.RELEASE.jar
- - org.springframework:spring-jcl:spring-jcl-5.2.8.RELEASE.jar
- - org.springframework:spring-context:spring-context-5.2.8.RELEASE.jar
- - org.springframework:spring-aop:spring-aop-5.2.8.RELEASE.jar
- - org.springframework:spring-beans:spring-beans-5.2.8.RELEASE.jar
- - org.springframework:spring-expression:spring-expression-5.2.8.RELEASE.jar
- - org.springframework:spring-jdbc:spring-jdbc-5.2.8.RELEASE.jar
- - org.springframework:spring-tx:spring-tx-5.2.8.RELEASE.jar
- - org.springframework:spring-orm:spring-orm-5.2.8.RELEASE.jar
+ - org.springframework:spring-core:spring-core-5.3.15.jar
+ - org.springframework:spring-jcl:spring-jcl-5.3.15.jar
+ - org.springframework:spring-context:spring-context-5.3.15.jar
+ - org.springframework:spring-aop:spring-aop-5.3.15.jar
+ - org.springframework:spring-beans:spring-beans-5.3.15.jar
+ - org.springframework:spring-expression:spring-expression-5.3.15.jar
+ - org.springframework:spring-jdbc:spring-jdbc-5.3.15.jar
+ - org.springframework:spring-tx:spring-tx-5.3.15.jar
+ - org.springframework:spring-orm:spring-orm-5.3.15.jar
* oro
- oro:oro:oro-2.0.8.jar
Apache License version 1.1