This is an automated email from the ASF dual-hosted git repository.
benjobs 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 69751a3e5 [Improve] spark app submit bug fixed. (#4092)
69751a3e5 is described below
commit 69751a3e5c0ad36d9bbecf33517184aeb5f7fb34
Author: benjobs <[email protected]>
AuthorDate: Thu Sep 26 15:06:07 2024 +0800
[Improve] spark app submit bug fixed. (#4092)
* [Improve] spark app submit bug fixed.
* [Improve] known-dependencies.txt updated
---
dist-material/release-docs/LICENSE | 8 ++++----
pom.xml | 3 +--
.../src/components/Drawer/src/BasicDrawer.vue | 1 -
.../src/views/flink/app/components/AppView/BuildDrawer.vue | 1 -
.../src/views/spark/app/components/BuildDrawer.vue | 1 -
streampark-spark/pom.xml | 4 ++--
tools/dependencies/known-dependencies.txt | 9 ++++-----
7 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/dist-material/release-docs/LICENSE
b/dist-material/release-docs/LICENSE
index 4009c51ae..8f672e8e1 100644
--- a/dist-material/release-docs/LICENSE
+++ b/dist-material/release-docs/LICENSE
@@ -464,10 +464,10 @@ The text of each license is the standard Apache 2.0
license. https://www.apache.
https://mvnrepository.com/artifact/org.jboss.logging/jboss-logging/3.4.3.Final
Apache-2.0
https://mvnrepository.com/artifact/org.jboss.threads/jboss-threads/3.1.0.Final
Apache-2.0
https://mvnrepository.com/artifact/org.jetbrains/annotations/13.0
Apache-2.0
- https://mvnrepository.com/artifact/org.json4s/json4s-ast_2.12/3.7.0-M2
Apache-2.0
- https://mvnrepository.com/artifact/org.json4s/json4s-core_2.12/3.7.0-M2
Apache-2.0
- https://mvnrepository.com/artifact/org.json4s/json4s-jackson_2.12/3.7.0-M2
Apache-2.0
- https://mvnrepository.com/artifact/org.json4s/json4s-scalap_2.12/3.7.0-M2
Apache-2.0
+ https://mvnrepository.com/artifact/org.json4s/json4s-ast_2.12/3.7.0-M11
Apache-2.0
+ https://mvnrepository.com/artifact/org.json4s/json4s-core_2.12/3.7.0-M11
Apache-2.0
+
https://mvnrepository.com/artifact/org.json4s/json4s-jackson_2.12/3.7.0-M11
Apache-2.0
+ https://mvnrepository.com/artifact/org.json4s/json4s-scalap_2.12/3.7.0-M11
Apache-2.0
https://mvnrepository.com/artifact/org.lz4/lz4-java/1.8.0 Apache-2.0
https://mvnrepository.com/artifact/org.lz4/lz4-java/1.7.1 Apache-2.0
https://mvnrepository.com/artifact/org.mapstruct/mapstruct/1.3.1.Final
Apache-2.0
diff --git a/pom.xml b/pom.xml
index 888f52430..d2e6bdc91 100644
--- a/pom.xml
+++ b/pom.xml
@@ -115,13 +115,12 @@
<hikariCP.version>3.4.5</hikariCP.version>
<snakeyaml.version>2.0</snakeyaml.version>
<typesafe-conf.version>1.4.2</typesafe-conf.version>
- <json4s-jackson.version>4.0.6</json4s-jackson.version>
+ <json4s-jackson.version>3.7.0-M11</json4s-jackson.version>
<commons-cli.version>1.5.0</commons-cli.version>
<commons-net.version>3.9.0</commons-net.version>
<commons-lang3.version>3.12.0</commons-lang3.version>
<enumeratum.version>1.6.1</enumeratum.version>
<assertj.version>3.23.1</assertj.version>
- <pprint.version>0.8.1</pprint.version>
<maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
<maven-shade-plugin.version>3.2.4</maven-shade-plugin.version>
diff --git
a/streampark-console/streampark-console-webapp/src/components/Drawer/src/BasicDrawer.vue
b/streampark-console/streampark-console-webapp/src/components/Drawer/src/BasicDrawer.vue
index e98493e3b..e47d4b2d1 100644
---
a/streampark-console/streampark-console-webapp/src/components/Drawer/src/BasicDrawer.vue
+++
b/streampark-console/streampark-console-webapp/src/components/Drawer/src/BasicDrawer.vue
@@ -210,7 +210,6 @@
.ant-drawer-body {
height: calc(100% - @header-height);
- padding: 0;
background-color: @component-background;
.scrollbar__wrap {
diff --git
a/streampark-console/streampark-console-webapp/src/views/flink/app/components/AppView/BuildDrawer.vue
b/streampark-console/streampark-console-webapp/src/views/flink/app/components/AppView/BuildDrawer.vue
index 044b1e88b..b9cbadd6f 100644
---
a/streampark-console/streampark-console-webapp/src/views/flink/app/components/AppView/BuildDrawer.vue
+++
b/streampark-console/streampark-console-webapp/src/views/flink/app/components/AppView/BuildDrawer.vue
@@ -220,7 +220,6 @@
>
<a-button type="primary" @click="openErrorDrawer(true)">
<Icon icon="ant-design:warning-outlined" />
- Error Log
{{ t('flink.app.view.errorLog') }}
</a-button>
</div>
diff --git
a/streampark-console/streampark-console-webapp/src/views/spark/app/components/BuildDrawer.vue
b/streampark-console/streampark-console-webapp/src/views/spark/app/components/BuildDrawer.vue
index 3023a24c6..ea86d947f 100644
---
a/streampark-console/streampark-console-webapp/src/views/spark/app/components/BuildDrawer.vue
+++
b/streampark-console/streampark-console-webapp/src/views/spark/app/components/BuildDrawer.vue
@@ -214,7 +214,6 @@
>
<a-button type="primary" @click="openErrorDrawer(true)">
<Icon icon="ant-design:warning-outlined" />
- Error Log
{{ t('spark.app.view.errorLog') }}
</a-button>
</div>
diff --git a/streampark-spark/pom.xml b/streampark-spark/pom.xml
index a7fb8d762..309d60ec8 100644
--- a/streampark-spark/pom.xml
+++ b/streampark-spark/pom.xml
@@ -77,14 +77,14 @@
<dependency>
<groupId>org.json4s</groupId>
<artifactId>json4s-ast_2.12</artifactId>
- <version>3.7.0-M5</version>
+ <version>${json4s-jackson.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.json4s</groupId>
<artifactId>json4s-core_2.12</artifactId>
- <version>3.7.0-M5</version>
+ <version>${json4s-jackson.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/tools/dependencies/known-dependencies.txt
b/tools/dependencies/known-dependencies.txt
index 5d038d032..7513f898d 100644
--- a/tools/dependencies/known-dependencies.txt
+++ b/tools/dependencies/known-dependencies.txt
@@ -169,11 +169,10 @@ jna-5.10.0.jar
jna-platform-5.10.0.jar
jsch-0.2.11.jar
json-smart-2.4.10.jar
-json4s-ast_2.12-4.0.6.jar
-json4s-core_2.12-4.0.6.jar
-json4s-jackson-core_2.12-4.0.6.jar
-json4s-jackson_2.12-4.0.6.jar
-json4s-scalap_2.12-4.0.6.jar
+json4s-ast_2.12-3.7.0-M11.jar
+json4s-core_2.12-3.7.0-M11.jar
+json4s-jackson_2.12-3.7.0-M11.jar
+json4s-scalap_2.12-3.7.0-M11.jar
jsp-api-2.1.jar
jsqlparser-4.4.jar
jsr305-3.0.2.jar
