You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampark.apache.org by kr...@apache.org on 2023/04/16 03:31:02 UTC
[incubator-streampark] branch dev updated: [Improve] maven pom improvement (#2633)
This is an automated email from the ASF dual-hosted git repository.
kriszu pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
The following commit(s) were added to refs/heads/dev by this push:
new be8850ba5 [Improve] maven pom improvement (#2633)
be8850ba5 is described below
commit be8850ba53033723e2bf8c34655b88f77777d028
Author: benjobs <be...@apache.org>
AuthorDate: Sun Apr 16 11:30:55 2023 +0800
[Improve] maven pom improvement (#2633)
---
pom.xml | 29 ++++++++--------------
.../console/system/controller/MenuController.java | 2 --
.../console/system/controller/UserController.java | 4 ---
.../streampark-flink-kubernetes/pom.xml | 16 +++++++++++-
streampark-flink/streampark-flink-packer/pom.xml | 4 +++
5 files changed, 30 insertions(+), 25 deletions(-)
diff --git a/pom.xml b/pom.xml
index 741ed8950..207e1444a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -93,7 +93,7 @@
<scalatest.version>3.2.9</scalatest.version>
<scala.binary.flink.version>_${scala.binary.version}</scala.binary.flink.version>
- <flink.version>1.14.0</flink.version>
+ <flink.version>1.14.4</flink.version>
<flink.shaded.version>1.8.1</flink.shaded.version>
<streampark.shaded.version>1.0.0</streampark.shaded.version>
<streampark.flink.shims.version>1.14</streampark.flink.shims.version>
@@ -114,9 +114,9 @@
<caffeine.version>2.8.6</caffeine.version>
<mysql.version>8.0.27</mysql.version>
<hikariCP.version>3.4.5</hikariCP.version>
- <snakeyaml.version>1.32</snakeyaml.version>
+ <snakeyaml.version>2.0</snakeyaml.version>
<typesafe-conf.version>1.4.2</typesafe-conf.version>
- <json4s-jackson.version>3.7.0-M2</json4s-jackson.version>
+ <json4s-jackson.version>4.0.6</json4s-jackson.version>
<hbase-client.version>1.3.5</hbase-client.version>
<commons-cli.version>1.3.1</commons-cli.version>
<commons-lang3.version>3.8.1</commons-lang3.version>
@@ -201,11 +201,7 @@
<exclusions>
<exclusion>
<groupId>org.scala-lang</groupId>
- <artifactId>scala-library</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-reflect</artifactId>
+ <artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -259,7 +255,7 @@
<exclusions>
<exclusion>
<groupId>org.scala-lang</groupId>
- <artifactId>scala-reflect</artifactId>
+ <artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -283,15 +279,7 @@
<exclusions>
<exclusion>
<groupId>org.scala-lang</groupId>
- <artifactId>scala-reflect</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-compiler</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-library</artifactId>
+ <artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -408,6 +396,10 @@
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>io.netty</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -739,6 +731,7 @@
<scala>
<scalafmt>
<version>${spotless.scalafmt.version}</version>
+ <!--suppress UnresolvedMavenProperty -->
<file>${maven.multiModuleProjectDirectory}/.scalafmt.conf</file>
</scalafmt>
</scala>
diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/MenuController.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/MenuController.java
index 0e6218888..956a7c5ff 100644
--- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/MenuController.java
+++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/MenuController.java
@@ -27,7 +27,6 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
-
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
@@ -77,7 +76,6 @@ public class MenuController {
return RestResponse.success();
}
-
@PutMapping("update")
@RequiresPermissions("menu:update")
public RestResponse updateMenu(@Valid Menu menu) throws Exception {
diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/UserController.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/UserController.java
index 07da93547..202c513b7 100644
--- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/UserController.java
+++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/UserController.java
@@ -34,7 +34,6 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.StringPool;
-
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j;
@@ -44,7 +43,6 @@ import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.validation.Valid;
@@ -66,7 +64,6 @@ public class UserController {
@Autowired private CommonService commonService;
-
@Operation(summary = "List users")
@PostMapping("list")
@RequiresPermissions(
@@ -102,7 +99,6 @@ public class UserController {
return RestResponse.success();
}
-
@Operation(summary = "List without token users")
@PostMapping("getNoTokenUser")
public RestResponse getNoTokenUser() {
diff --git a/streampark-flink/streampark-flink-kubernetes/pom.xml b/streampark-flink/streampark-flink-kubernetes/pom.xml
index 11facb32a..17c1fd70c 100644
--- a/streampark-flink/streampark-flink-kubernetes/pom.xml
+++ b/streampark-flink/streampark-flink-kubernetes/pom.xml
@@ -29,7 +29,7 @@
<properties>
<apache.httpclient5.version>5.1</apache.httpclient5.version>
- <snakeyaml.version>1.32</snakeyaml.version>
+ <snakeyaml.version>2.0</snakeyaml.version>
<scalatest.skiptests>true</scalatest.skiptests>
</properties>
@@ -39,6 +39,20 @@
<groupId>org.apache.flink</groupId>
<artifactId>flink-clients${scala.binary.flink.version}</artifactId>
<version>${flink.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-shaded-*</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
diff --git a/streampark-flink/streampark-flink-packer/pom.xml b/streampark-flink/streampark-flink-packer/pom.xml
index e68e92c79..1e0afbe8b 100644
--- a/streampark-flink/streampark-flink-packer/pom.xml
+++ b/streampark-flink/streampark-flink-packer/pom.xml
@@ -62,6 +62,10 @@
<groupId>org.jdom</groupId>
<artifactId>jdom2</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.sonatype.aether</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
</exclusions>
</dependency>