You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by pe...@apache.org on 2022/03/07 06:50:38 UTC
[incubator-linkis] 06/10: upgrade spring.boot.version from 2.2.13 to 2.3.12
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.1.0-datasource
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit 668dc49e5e69ca35dcc6c7dd67254d663c19a25b
Author: casionone <ca...@gmail.com>
AuthorDate: Sun Mar 6 22:59:38 2022 +0800
upgrade spring.boot.version from 2.2.13 to 2.3.12
---
linkis-commons/linkis-hadoop-common/pom.xml | 12 +++++++++++-
pom.xml | 7 ++++---
2 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/linkis-commons/linkis-hadoop-common/pom.xml b/linkis-commons/linkis-hadoop-common/pom.xml
index 6c6cf44..fec044a 100644
--- a/linkis-commons/linkis-hadoop-common/pom.xml
+++ b/linkis-commons/linkis-hadoop-common/pom.xml
@@ -38,6 +38,13 @@
<scope>provided</scope>
</dependency>
+ <!-- for upgrade hadoop-commom-->
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>${commons-beanutils.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
@@ -133,7 +140,10 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
</exclusion>
-
+ <exclusion>
+ <artifactId>commons-beanutils</artifactId>
+ <groupId>commons-beanutils</groupId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index 7f1f4fe..b1c2e77 100644
--- a/pom.xml
+++ b/pom.xml
@@ -101,7 +101,7 @@
<properties>
<linkis.version>1.1.0</linkis.version>
<hadoop.version>2.7.2</hadoop.version>
- <spring.boot.version>2.3.2.RELEASE</spring.boot.version>
+ <spring.boot.version>2.3.12.RELEASE</spring.boot.version>
<guava.version>30.0-jre</guava.version>
<gson.version>2.8.5</gson.version>
<fasterxml.jackson.version>2.11.3</fasterxml.jackson.version>
@@ -109,7 +109,7 @@
<jdk.compile.version>1.8</jdk.compile.version>
<plugin.scala.version>2.15.2</plugin.scala.version>
<scala.binary.version>2.11</scala.binary.version>
- <netty.version>4.1.60.Final</netty.version>
+ <netty.version>4.1.68.Final</netty.version>
<json4s.version>3.5.3</json4s.version>
<jersey.version>2.16</jersey.version>
<jersey.servlet.version>2.23.1</jersey.servlet.version>
@@ -129,6 +129,7 @@
<commons-lang.version>2.6</commons-lang.version>
<commons-lang3.version>3.9</commons-lang3.version>
<commons-io.version>2.11.0</commons-io.version>
+ <commons-beanutils.version>1.9.4</commons-beanutils.version>
<druid.version>1.1.22</druid.version>
<apache-rat-plugin.version>0.13</apache-rat-plugin.version>
<assembly.package.rootpath>${basedir}</assembly.package.rootpath>
@@ -251,7 +252,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies</artifactId>
- <version>Hoxton.SR10</version>
+ <version>Hoxton.SR12</version>
<type>pom</type>
<scope>import</scope>
</dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org