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 71e088a96 [Improve] FE dependencies version update (#2747)
71e088a96 is described below
commit 71e088a9623d2ec32afe57ceb3e42db345140c84
Author: benjobs <[email protected]>
AuthorDate: Sat May 13 21:35:40 2023 +0800
[Improve] FE dependencies version update (#2747)
* [Improve] FE dependencies version update
* packageManager update to 8.5.0
* vite version improvement
* rollup version update
---
.github/workflows/codeql-analysis.yml | 2 +-
.github/workflows/docker-push.yml | 2 +-
.github/workflows/maven.yml | 13 +-
build.sh | 134 +---------
pom.xml | 22 +-
.../streampark-console-service/pom.xml | 280 +++++++--------------
.../src/main/resources/md/repl.md | 25 --
.../streampark-console-webapp/package.json | 82 +++---
.../streampark-flink-connector/pom.xml | 10 -
streampark-flink/streampark-flink-shims/pom.xml | 15 +-
10 files changed, 160 insertions(+), 425 deletions(-)
diff --git a/.github/workflows/codeql-analysis.yml
b/.github/workflows/codeql-analysis.yml
index b8a807437..105b5a25c 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -70,7 +70,7 @@ jobs:
# - run: |
# echo "Run, Build Application using script"
# ./location_of_script_within_repo/buildscript.sh
- - run: ./mvnw -q -Dmaven.test.skip=true -Pscala-2.12 clean install ||
./mvnw -q -Dmaven.test.skip=true clean install
+ - run: ./mvnw -q -Dmaven.test.skip=true clean install || ./mvnw -q
-Dmaven.test.skip=true clean install
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
diff --git a/.github/workflows/docker-push.yml
b/.github/workflows/docker-push.yml
index 1c261be80..352886032 100644
--- a/.github/workflows/docker-push.yml
+++ b/.github/workflows/docker-push.yml
@@ -58,7 +58,7 @@ jobs:
- name: Build project release package
run: |
- ./mvnw clean install -DskipTests -Pscala-2.12,shaded,dist,webapp
+ ./mvnw clean install -DskipTests -Pshaded,dist,webapp
- name: Log in to Docker Hub
uses: docker/login-action@v2
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 4a56e05f4..23b6cfce5 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -57,10 +57,8 @@ jobs:
- uses: actions/checkout@v3
with:
submodules: true
- - name: Check codestyle for scala 2.11
- run: ./mvnw -B -q -nsu -Pscala-2.11 checkstyle:check spotless:check
- - name: Check codestyle for scala 2.12
- run: ./mvnw -B -q -nsu -Pscala-2.12 checkstyle:check spotless:check
+ - name: Check codestyle
+ run: ./mvnw -B -q -nsu checkstyle:check spotless:check
dead-link:
if: github.repository == 'apache/incubator-streampark'
name: Dead links
@@ -74,12 +72,11 @@ jobs:
markdown-link-check -c .dlc.json -q "$file"
done
build:
- name: "maven-compile ( ${{ matrix.scala }}, java-${{ matrix.java }})"
+ name: "maven-compile (java-${{ matrix.java }})"
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
- scala: [ scala-2.11, scala-2.12 ]
java: [ 8 , 11 ]
steps:
- name: Checkout
@@ -91,7 +88,7 @@ jobs:
distribution: "adopt"
cache: "maven"
- name: Build with Maven
- run: ./mvnw -B clean install -P${{ matrix.scala }},shaded -DskipTests
+ run: ./mvnw -B clean install -Pshaded -DskipTests
- name: Test with Maven
- run: ./mvnw -B test -P${{ matrix.scala }}
+ run: ./mvnw -B test
diff --git a/build.sh b/build.sh
index e94232bb0..fbdf66e8b 100755
--- a/build.sh
+++ b/build.sh
@@ -65,20 +65,6 @@ echo_g () {
printf "[%sStreamPark%s] %s$1%s\n" $BLUE $RESET $GREEN $RESET
}
-echo_y () {
- # Color yellow: Warning
- [[ $# -ne 1 ]] && return 1
- # shellcheck disable=SC2059
- printf "[%sStreamPark%s] %s$1%s\n" $BLUE $RESET $YELLOW $RESET
-}
-
-echo_w () {
- # Color yellow: White
- [[ $# -ne 1 ]] && return 1
- # shellcheck disable=SC2059
- printf "[%sStreamPark%s] %s$1%s\n" $BLUE $RESET $WHITE $RESET
-}
-
# OS specific support. $var _must_ be set to either true or false.
cygwin=false
os400=false
@@ -122,122 +108,24 @@ print_logo() {
printf ' %s ──────── Apache StreamPark, Make stream processing easier
ô~ô!%s\n\n' $PRIMARY $RESET
}
-checkPerm() {
+build() {
if [ -x "$PRG_DIR/mvnw" ]; then
- return 0
+ echo_g "Apache StreamPark, building..."
+ "$PRG_DIR/mvnw" -Pshaded,webapp,dist -DskipTests clean install
+ if [ $? -eq 0 ]; then
+ printf '\n'
+ echo_g """StreamPark project build successful!
+ dist: $(cd "$PRG_DIR" &>/dev/null && pwd)/dist\n"""
+ fi
else
- return 1
- fi
-}
-
-selectScala() {
- echo_w 'StreamPark supports Scala 2.11 and 2.12. Which version do you need ?'
- select scala in "2.11" "2.12"
- do
- case $scala in
- "2.11")
- return 1
- ;;
- "2.12")
- return 2
- ;;
- *)
- echo_r "invalid selected, exit.."
- exit 1
- ;;
- esac
- done
-}
-
-selectMode() {
- echo_w 'StreamPark supports front-end and server-side mixed / detached
packaging mode, Which mode do you need ?'
- select scala in "mixed mode" "detached mode"
- do
- case $scala in
- "mixed mode")
- echo_g "mixed mode selected (mixed build project of front-end and
back-ends)"
- return 1
- ;;
- "detached mode")
- echo_g "detached mode selected (Only build the back-end project, the
front-end build need by yourself)"
- return 2
- ;;
- *)
- echo_r "invalid selected, exit.."
- exit 1
- ;;
- esac
- done
-}
-
-
-mixedPackage() {
- scala="scala-2.11"
- if [ "$1" == 2 ]; then
- scala="scala-2.12"
- fi
-
- echo_g "build info: package mode @ mixed, $scala, now build starting..."
-
- "$PRG_DIR/mvnw" -P$scala,shaded,webapp,dist -DskipTests clean install
-
- if [ $? -eq 0 ]; then
- printf '\n'
- echo_g """StreamPark project build successful!
- info: package mode @ mixed, $scala
- dist: $(cd "$PRG_DIR" &>/dev/null && pwd)/dist\n"""
- fi
-}
-
-detachedPackage () {
- scala="scala-2.11"
- if [ "$1" == 2 ]; then
- scala="scala-2.12"
- fi
-
- echo_g "build info: package mode @ detached, $scala, now build starting..."
-
- "$PRG_DIR"/mvnw -P$scala,shaded,dist -DskipTests clean install
-
- if [ $? -eq 0 ]; then
- printf '\n'
- echo_g """StreamPark project build successful!
- info: package mode @ detached, $scala
- dist: $(cd "$PRG_DIR" &>/dev/null && pwd)/dist
-
- Next, you need to build front-end by yourself.
-
- 1) cd $(cd "$PRG_DIR" &>/dev/null &&
pwd)/streampark-console/streampark-console-webapp
- 2) pnpm install && pnpm build
-
- please visit: https://streampark.apache.org/docs/user-guide/deployment for
more detail. \n"""
+ echo_r "permission denied: $PRG_DIR/mvnw, please check."
+ exit 1
fi
}
main() {
print_logo
- checkPerm
- if [ $? -eq 1 ]; then
- # shellcheck disable=SC2006
- echo_r "permission denied: $PRG_DIR/mvnw, please check."
- exit 1
- fi
- selectMode
- if [ $? -eq 1 ]; then
- selectScala
- if [ $? -eq 1 ]; then
- mixedPackage 1
- else
- mixedPackage 2
- fi
- else
- selectScala
- if [ $? -eq 1 ]; then
- detachedPackage 1
- else
- detachedPackage 2
- fi
- fi
+ build
}
main "$@"
diff --git a/pom.xml b/pom.xml
index 4fa03bd2b..abd9e91cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,6 +78,7 @@
<modules>
<module>streampark-common</module>
<module>streampark-flink</module>
+ <module>streampark-spark</module>
<module>streampark-storage</module>
<module>streampark-console</module>
</modules>
@@ -734,7 +735,7 @@
</plugin>
<plugin>
- <!-- run via "mvn -Pscala-2.12 -DskipDependencyCheck=false
org.owasp:dependency-check-maven:aggregate" -->
+ <!-- run via "mvn -DskipDependencyCheck=false
org.owasp:dependency-check-maven:aggregate" -->
<groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId>
<version>${owasp-dependency-check-maven.version}</version>
@@ -790,25 +791,6 @@
</build>
<profiles>
- <profile>
- <id>scala-2.11</id>
- <properties>
- <scala.version>2.11.12</scala.version>
- <scala.binary.version>2.11</scala.binary.version>
- </properties>
- </profile>
-
- <profile>
- <id>scala-2.12</id>
- <modules>
- <module>streampark-spark</module>
- </modules>
- <properties>
- <scala.version>2.12.8</scala.version>
- <scala.binary.version>2.12</scala.binary.version>
- </properties>
- </profile>
-
<profile>
<id>shaded</id>
<modules>
diff --git a/streampark-console/streampark-console-service/pom.xml
b/streampark-console/streampark-console-service/pom.xml
index c440606da..c8a587042 100644
--- a/streampark-console/streampark-console-service/pom.xml
+++ b/streampark-console/streampark-console-service/pom.xml
@@ -439,6 +439,100 @@
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>3.0.2</version>
+ <configuration>
+ <excludeTransitive>false</excludeTransitive>
+ <stripVersion>false</stripVersion>
+ <artifactItems>
+ <!-- flink 1.12 support-->
+ <dependency>
+ <groupId>org.apache.streampark</groupId>
+
<artifactId>streampark-flink-shims_flink-1.12_${scala.binary.version}</artifactId>
+ <version>${project.version}</version>
+
<outputDirectory>${project.build.directory}/shims</outputDirectory>
+ </dependency>
+ <!-- flink 1.13 support-->
+ <dependency>
+ <groupId>org.apache.streampark</groupId>
+
<artifactId>streampark-flink-shims_flink-1.13_${scala.binary.version}</artifactId>
+ <version>${project.version}</version>
+
<outputDirectory>${project.build.directory}/shims</outputDirectory>
+ </dependency>
+ <!-- flink 1.14 support-->
+ <dependency>
+ <groupId>org.apache.streampark</groupId>
+
<artifactId>streampark-flink-shims_flink-1.14_${scala.binary.version}</artifactId>
+ <version>${project.version}</version>
+
<outputDirectory>${project.build.directory}/shims</outputDirectory>
+ </dependency>
+ <!-- flink 1.15 support-->
+ <dependency>
+ <groupId>org.apache.streampark</groupId>
+
<artifactId>streampark-flink-shims_flink-1.15_${scala.binary.version}</artifactId>
+ <version>${project.version}</version>
+
<outputDirectory>${project.build.directory}/shims</outputDirectory>
+ </dependency>
+ <!-- flink 1.16 support-->
+ <dependency>
+ <groupId>org.apache.streampark</groupId>
+
<artifactId>streampark-flink-shims_flink-1.16_${scala.binary.version}</artifactId>
+ <version>${project.version}</version>
+
<outputDirectory>${project.build.directory}/shims</outputDirectory>
+ </dependency>
+ <!-- flink 1.17 support-->
+ <dependency>
+ <groupId>org.apache.streampark</groupId>
+
<artifactId>streampark-flink-shims_flink-1.17_${scala.binary.version}</artifactId>
+ <version>${project.version}</version>
+
<outputDirectory>${project.build.directory}/shims</outputDirectory>
+ </dependency>
+ <!-- flink-submit-core -->
+ <dependency>
+ <groupId>org.apache.streampark</groupId>
+
<artifactId>streampark-flink-client-core_${scala.binary.version}</artifactId>
+ <version>${project.version}</version>
+
<outputDirectory>${project.build.directory}/lib</outputDirectory>
+ </dependency>
+ </artifactItems>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>3.1.1</version>
+ <executions>
+ <execution>
+ <id>dist</id>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ <appendAssemblyId>false</appendAssemblyId>
+ <skipAssembly>false</skipAssembly>
+ <attach>false</attach>
+
<finalName>apache-streampark-${project.version}-incubating-bin</finalName>
+ <descriptors>
+
<descriptor>${basedir}/src/main/assembly/assembly.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
</plugins>
</build>
@@ -466,7 +560,7 @@
</goals>
<configuration>
<nodeVersion>v16.16.0</nodeVersion>
- <pnpmVersion>7.3.0</pnpmVersion>
+ <pnpmVersion>8.5.0</pnpmVersion>
</configuration>
</execution>
<execution>
@@ -517,188 +611,6 @@
</build>
</profile>
- <profile>
- <id>scala-2.12</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>3.0.2</version>
- <configuration>
- <excludeTransitive>false</excludeTransitive>
- <stripVersion>false</stripVersion>
- <artifactItems>
- <!-- flink 1.12 support-->
- <dependency>
- <groupId>org.apache.streampark</groupId>
-
<artifactId>streampark-flink-shims_flink-1.12_${scala.binary.version}</artifactId>
- <version>${project.version}</version>
-
<outputDirectory>${project.build.directory}/shims</outputDirectory>
- </dependency>
- <!-- flink 1.13 support-->
- <dependency>
- <groupId>org.apache.streampark</groupId>
-
<artifactId>streampark-flink-shims_flink-1.13_${scala.binary.version}</artifactId>
- <version>${project.version}</version>
-
<outputDirectory>${project.build.directory}/shims</outputDirectory>
- </dependency>
- <!-- flink 1.14 support-->
- <dependency>
- <groupId>org.apache.streampark</groupId>
-
<artifactId>streampark-flink-shims_flink-1.14_${scala.binary.version}</artifactId>
- <version>${project.version}</version>
-
<outputDirectory>${project.build.directory}/shims</outputDirectory>
- </dependency>
- <!-- flink 1.15 support-->
- <dependency>
- <groupId>org.apache.streampark</groupId>
-
<artifactId>streampark-flink-shims_flink-1.15_${scala.binary.version}</artifactId>
- <version>${project.version}</version>
-
<outputDirectory>${project.build.directory}/shims</outputDirectory>
- </dependency>
- <!-- flink 1.16 support-->
- <dependency>
- <groupId>org.apache.streampark</groupId>
-
<artifactId>streampark-flink-shims_flink-1.16_${scala.binary.version}</artifactId>
- <version>${project.version}</version>
-
<outputDirectory>${project.build.directory}/shims</outputDirectory>
- </dependency>
- <!-- flink 1.17 support-->
- <dependency>
- <groupId>org.apache.streampark</groupId>
-
<artifactId>streampark-flink-shims_flink-1.17_${scala.binary.version}</artifactId>
- <version>${project.version}</version>
-
<outputDirectory>${project.build.directory}/shims</outputDirectory>
- </dependency>
- <!-- flink-submit-core -->
- <dependency>
- <groupId>org.apache.streampark</groupId>
-
<artifactId>streampark-flink-client-core_${scala.binary.version}</artifactId>
- <version>${project.version}</version>
-
<outputDirectory>${project.build.directory}/lib</outputDirectory>
- </dependency>
- </artifactItems>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>copy</goal>
- </goals>
- <phase>package</phase>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>3.1.1</version>
- <executions>
- <execution>
- <id>dist</id>
- <goals>
- <goal>single</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <tarLongFileMode>gnu</tarLongFileMode>
- <appendAssemblyId>false</appendAssemblyId>
- <skipAssembly>false</skipAssembly>
- <attach>false</attach>
-
<finalName>apache-streampark_${scala.binary.version}-${project.version}-incubating-bin</finalName>
- <descriptors>
-
<descriptor>${basedir}/src/main/assembly/assembly.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <profile>
- <id>scala-2.11</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>3.0.2</version>
- <configuration>
- <excludeTransitive>false</excludeTransitive>
- <stripVersion>false</stripVersion>
- <artifactItems>
- <!-- flink 1.12 support-->
- <dependency>
- <groupId>org.apache.streampark</groupId>
-
<artifactId>streampark-flink-shims_flink-1.12_${scala.binary.version}</artifactId>
- <version>${project.version}</version>
-
<outputDirectory>${project.build.directory}/shims</outputDirectory>
- </dependency>
- <!-- flink 1.13 support-->
- <dependency>
- <groupId>org.apache.streampark</groupId>
-
<artifactId>streampark-flink-shims_flink-1.13_${scala.binary.version}</artifactId>
- <version>${project.version}</version>
-
<outputDirectory>${project.build.directory}/shims</outputDirectory>
- </dependency>
- <!-- flink 1.14 support-->
- <dependency>
- <groupId>org.apache.streampark</groupId>
-
<artifactId>streampark-flink-shims_flink-1.14_${scala.binary.version}</artifactId>
- <version>${project.version}</version>
-
<outputDirectory>${project.build.directory}/shims</outputDirectory>
- </dependency>
- <!-- flink-submit-core -->
- <dependency>
- <groupId>org.apache.streampark</groupId>
-
<artifactId>streampark-flink-client-core_${scala.binary.version}</artifactId>
- <version>${project.version}</version>
-
<outputDirectory>${project.build.directory}/lib</outputDirectory>
- </dependency>
- </artifactItems>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>copy</goal>
- </goals>
- <phase>package</phase>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>3.1.1</version>
- <executions>
- <execution>
- <id>dist</id>
- <goals>
- <goal>single</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <tarLongFileMode>gnu</tarLongFileMode>
- <appendAssemblyId>false</appendAssemblyId>
- <skipAssembly>false</skipAssembly>
- <attach>false</attach>
-
<finalName>apache-streampark_${scala.binary.version}-${project.version}-incubating-bin</finalName>
- <descriptors>
-
<descriptor>${basedir}/src/main/assembly/assembly.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
- </build>
- </profile>
-
<profile>
<id>dist</id>
<build>
@@ -714,7 +626,7 @@
<phase>package</phase>
<configuration>
<target>
- <copy
file="${project.build.directory}/apache-streampark_${scala.binary.version}-${project.version}-incubating-bin.tar.gz"
overwrite="true"
tofile="${project.basedir}/../../dist/apache-streampark_${scala.binary.version}-${project.version}-incubating-bin.tar.gz"
/>
+ <copy
file="${project.build.directory}/apache-streampark-${project.version}-incubating-bin.tar.gz"
overwrite="true"
tofile="${project.basedir}/../../dist/apache-streampark-${project.version}-incubating-bin.tar.gz"
/>
</target>
</configuration>
</execution>
diff --git
a/streampark-console/streampark-console-service/src/main/resources/md/repl.md
b/streampark-console/streampark-console-service/src/main/resources/md/repl.md
deleted file mode 100644
index dc0050f14..000000000
---
a/streampark-console/streampark-console-service/src/main/resources/md/repl.md
+++ /dev/null
@@ -1,25 +0,0 @@
-### Introduction
-
-[Apache Flink](https://flink.apache.org/) is a framework and distributed
processing engine for stateful computations
-over unbounded and bounded data streams. This is Flink tutorial for running
classical wordcount in both batch and
-streaming mode.
-
-There're 3 things you need to do before using flink in StreamPark Notebook.
-
-* Download [Flink 1.11](https://flink.apache.org/downloads.html) for scala
2.11 (Only scala-2.11 is supported,
- scala-2.12 is not supported yet in StreamPark Notebook), unpack it and set
`FLINK_HOME` in flink interpreter setting to
- this location.
-* Copy flink-python_2.11–1.11.1.jar from flink opt folder to flink lib folder
(it is used by pyflink which is supported)
-* If you want to run yarn mode, you need to set `HADOOP_CONF_DIR` in flink
interpreter setting. And make sure `hadoop`
- is in your `PATH`, because internally flink will call command `hadoop
classpath` and put all the hadoop related jars
- in the classpath of flink interpreter process.
-
-There're 6 sub interpreters in flink interpreter, each is used for different
purpose. However they are in the the JVM
-and share the same
ExecutionEnviroment/StremaExecutionEnvironment/BatchTableEnvironment/StreamTableEnvironment.
-
-* `flink` - Creates
ExecutionEnvironment/StreamExecutionEnvironment/BatchTableEnvironment/StreamTableEnvironment
and
- provides a Scala environment
-* `pyflink` - Provides a python environment
-* `ipyflink` - Provides an ipython environment
-* `ssql` - Provides a stream sql environment
-* `bsql` - Provides a batch sql environment
diff --git a/streampark-console/streampark-console-webapp/package.json
b/streampark-console/streampark-console-webapp/package.json
index dd93928f1..4ebf1e163 100644
--- a/streampark-console/streampark-console-webapp/package.json
+++ b/streampark-console/streampark-console-webapp/package.json
@@ -5,7 +5,7 @@
"name": "streampark",
"url": "https://streampark.apache.org";
},
- "packageManager": "[email protected]",
+ "packageManager": "[email protected]",
"repository": {
"type": "git",
"url": "git+https://github.com/apache/incubator-streampark.git";
@@ -40,71 +40,71 @@
"gen:icon": "esno ./build/generate/icon/index.ts"
},
"dependencies": {
- "@ant-design/colors": "^6.0.0",
+ "@ant-design/colors": "^7.0.0",
"@ant-design/icons-vue": "^6.1.0",
- "@iconify/iconify": "^3.0.1",
- "@vue/runtime-core": "^3.2.45",
- "@vue/shared": "^3.2.45",
- "@vueuse/core": "^9.6.0",
- "@vueuse/shared": "^9.6.0",
- "@zxcvbn-ts/core": "^2.1.0",
- "ant-design-vue": "^3.2.15",
- "axios": "^1.2.1",
+ "@iconify/iconify": "^3.1.0",
+ "@vue/runtime-core": "^3.3.2",
+ "@vue/shared": "^3.3.2",
+ "@vueuse/core": "^10.1.2",
+ "@vueuse/shared": "^10.1.2",
+ "@zxcvbn-ts/core": "^3.0.1",
+ "ant-design-vue": "^3.2.20",
+ "axios": "^1.4.0",
"crypto-js": "^4.1.1",
- "dayjs": "^1.11.6",
+ "dayjs": "^1.11.7",
"lodash-es": "^4.17.21",
- "monaco-editor": "^0.34.1",
+ "monaco-editor": "^0.38.0",
"nprogress": "^0.2.0",
"path-to-regexp": "^6.2.1",
"penpal": "^6.2.2",
- "pinia": "2.0.27",
- "qs": "^6.11.0",
+ "pinia": "2.0.36",
+ "qs": "^6.11.1",
"resize-observer-polyfill": "^1.5.1",
"sql-formatter": "^4.0.2",
- "sweetalert2": "^11.4.18",
+ "sweetalert2": "^11.7.5",
"sortablejs": "^1.15.0",
- "terser": "^5.16.1",
- "vue": "^3.2.47",
+ "terser": "^5.17.3",
+ "vue": "^3.3.2",
"vue-i18n": "^9.2.2",
- "vue-router": "^4.1.6",
+ "vue-router": "^4.2.0",
"vue-types": "^5.0.2"
},
"devDependencies": {
- "@commitlint/cli": "^17.3.0",
- "@commitlint/config-conventional": "^17.3.0",
- "@iconify/json": "^2.1.148",
+ "@commitlint/cli": "^17.6.3",
+ "@commitlint/config-conventional": "^17.6.3",
+ "@iconify/json": "^2.2.64",
"@purge-icons/generated": "^0.9.0",
- "@types/fs-extra": "^9.0.13",
- "@types/lodash-es": "^4.17.6",
- "@types/node": "^18.11.11",
+ "@types/fs-extra": "^11.0.1",
+ "@types/lodash-es": "^4.17.7",
+ "@types/node": "^20.1.3",
"@types/nprogress": "^0.2.0",
"@types/qs": "^6.9.7",
- "@types/showdown": "^2.0.0",
- "@types/sortablejs": "^1.15.0",
- "@typescript-eslint/eslint-plugin": "^5.45.1",
- "@typescript-eslint/parser": "^5.45.1",
+ "@types/showdown": "^2.0.1",
+ "@types/sortablejs": "^1.15.1",
+ "@typescript-eslint/eslint-plugin": "^5.59.5",
+ "@typescript-eslint/parser": "^5.59.5",
"@vitejs/plugin-legacy": "^2.2.0",
"@vitejs/plugin-vue": "^3.1.2",
"@vitejs/plugin-vue-jsx": "^2.0.1",
- "@vue/compiler-sfc": "^3.2.47",
- "autoprefixer": "^10.4.13",
- "commitizen": "^4.2.5",
+ "@vue/compiler-sfc": "^3.3.2",
+ "autoprefixer": "^10.4.14",
+ "commitizen": "^4.3.0",
"cross-env": "^7.0.3",
"dotenv": "^16.0.3",
- "eslint": "^8.29.0",
- "eslint-config-prettier": "^8.5.0",
+ "eslint": "^8.40.0",
+ "eslint-config-prettier": "^8.8.0",
"eslint-plugin-prettier": "^4.2.1",
- "eslint-plugin-vue": "^9.8.0",
+ "eslint-plugin-vue": "^9.12.0",
"esno": "^0.16.3",
- "fs-extra": "^11.1.0",
+ "fs-extra": "^11.1.1",
"less": "^4.1.3",
- "lint-staged": "13.1.0",
+ "lint-staged": "13.2.2",
"picocolors": "^1.0.0",
- "postcss": "^8.4.19",
+ "postcss": "^8.4.23",
"postcss-html": "^1.5.0",
"postcss-less": "^6.0.0",
- "prettier": "^2.8.0",
- "rimraf": "^3.0.2",
+ "prettier": "^2.8.8",
+ "rimraf": "^5.0.0",
"rollup": "^3.20.1",
"rollup-plugin-visualizer": "^5.9.0",
"stylelint": "^14.16.0",
@@ -115,7 +115,7 @@
"stylelint-order": "^5.0.0",
"ts-node": "^10.9.1",
"typescript": "^5.0.2",
- "vite": "^3.2.5",
+ "vite": "^3.2.6",
"vite-plugin-compression": "^0.5.1",
"vite-plugin-html": "^3.2.0",
"vite-plugin-imagemin": "^0.6.1",
@@ -129,7 +129,7 @@
},
"resolutions": {
"bin-wrapper": "npm:bin-wrapper-china",
- "rollup": "^2.56.3",
+ "rollup": "^2.68.0",
"gifsicle": "5.2.0"
},
"engines": {
diff --git a/streampark-flink/streampark-flink-connector/pom.xml
b/streampark-flink/streampark-flink-connector/pom.xml
index 2712e4589..3808a16f7 100644
--- a/streampark-flink/streampark-flink-connector/pom.xml
+++ b/streampark-flink/streampark-flink-connector/pom.xml
@@ -63,14 +63,4 @@
</dependencies>
</dependencyManagement>
- <profiles>
- <profile>
- <id>scala-2.11</id>
- <modules>
- <!-- redis only support scala 2.11 -->
- <module>streampark-flink-connector-redis</module>
- </modules>
- </profile>
- </profiles>
-
</project>
diff --git a/streampark-flink/streampark-flink-shims/pom.xml
b/streampark-flink/streampark-flink-shims/pom.xml
index 1c8200c86..fd6c4688d 100644
--- a/streampark-flink/streampark-flink-shims/pom.xml
+++ b/streampark-flink/streampark-flink-shims/pom.xml
@@ -34,18 +34,9 @@
<module>streampark-flink-shims_flink-1.12</module>
<module>streampark-flink-shims_flink-1.13</module>
<module>streampark-flink-shims_flink-1.14</module>
+ <module>streampark-flink-shims_flink-1.15</module>
+ <module>streampark-flink-shims_flink-1.16</module>
+ <module>streampark-flink-shims_flink-1.17</module>
</modules>
- <profiles>
- <profile>
- <id>scala-2.12</id>
- <modules>
- <!-- flink 1.15+ only support scala 2.12 -->
- <module>streampark-flink-shims_flink-1.15</module>
- <module>streampark-flink-shims_flink-1.16</module>
- <module>streampark-flink-shims_flink-1.17</module>
- </modules>
- </profile>
- </profiles>
-
</project>
