This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.3.2
in repository https://gitbox.apache.org/repos/asf/linkis.git
The following commit(s) were added to refs/heads/dev-1.3.2 by this push:
new 61eb8c755 build: upgrade the version to 1.3.2 (#4398)
61eb8c755 is described below
commit 61eb8c7551537560b0ba2a93df0fa58231716302
Author: Jack Xu <[email protected]>
AuthorDate: Wed Mar 22 16:06:12 2023 +0800
build: upgrade the version to 1.3.2 (#4398)
* build: update the version to 1.3.2
---
.github/workflows/build-backend.yml | 80 ++++++++++++++--------
.../workflows/check-third-party-dependencies.yml | 56 ---------------
.../spark/config/SparkConfiguration.scala | 2 +-
linkis-web/package.json | 5 +-
pom.xml | 3 +-
tool/dependencies/known-dependencies.txt | 23 +++----
.../regenerate_konwn_dependencies_txt.sh | 4 +-
7 files changed, 69 insertions(+), 104 deletions(-)
diff --git a/.github/workflows/build-backend.yml
b/.github/workflows/build-backend.yml
index 319779f42..fec9f02f6 100644
--- a/.github/workflows/build-backend.yml
+++ b/.github/workflows/build-backend.yml
@@ -20,48 +20,72 @@ name: Build Backend
on: [push, pull_request]
env:
- MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false
-Dmaven.wagon.http.retryHandler.class=standard
-Dmaven.wagon.http.retryHandler.count=3
-Dmaven.wagon.httpconnectionManager.ttlSeconds=120
+ MAVEN_OPTS: -Dmaven.resolver.transport=wagon -Dhttp.keepAlive=false
-Dmaven.wagon.http.pool=false -Dmaven.wagon.http.retryHandler.class=standard
-Dmaven.wagon.http.retryHandler.count=3
-Dmaven.wagon.httpconnectionManager.ttlSeconds=120
jobs:
build-backend:
- runs-on: ubuntu-latest
- steps:
- - name: Checkout
- uses: actions/checkout@v2
- - name: Set up JDK 8
- uses: actions/setup-java@v2
- with:
- distribution: 'temurin'
- java-version: 8
- - name: Build backend by maven
- run:
- ./mvnw clean package
- build-spark:
runs-on: ubuntu-latest
strategy:
matrix:
- installSpark: [ 'spark2.4-hadoop2.3',
'spark3.2-hadoop3.3','spark2.4-hadoop3.3' ]
+ spark: [2.4, 3.2]
+ hadoop: [3.3]
+ include:
+ - spark: 2.4
+ hadoop: 2.7
steps:
- name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
- name: Set up JDK 8
- uses: actions/setup-java@v2
+ uses: actions/setup-java@v3
with:
- distribution: 'temurin'
- java-version: 8
- - if: ${{ matrix.installSpark == 'spark2.4-hadoop2.3' }}
- name: build-spark on init
+ distribution: 'temurin'
+ java-version: 8
+ cache: maven
+ - if: ${{matrix.spark == '2.4' && matrix.hadoop == '3.3'}}
+ name: build spark ${{matrix.spark}} and hadoop ${{matrix.hadoop}}
run:
- ./mvnw clean install -Pspark-2.4 -Phadoop-2.3 -Dmaven.test.skip=true
- - if: ${{ matrix.installSpark == 'spark3.2-hadoop3.3' }}
- name: build-spark on 3.2
+ ./mvnw clean package
-Pspark-${{matrix.spark}}-hadoop-${{matrix.hadoop}} -Phadoop-${{matrix.hadoop}}
-Dmaven.test.skip=true
+ - if: ${{matrix.hadoop == '2.7'}}
+ name: build default
run:
- ./mvnw clean install -Pspark-3.2 -Phadoop-3.3 -Dmaven.test.skip=true
- - if: ${{ matrix.installSpark == 'spark2.4-hadoop3.3' }}
- name: build-spark on 2.4
+ ./mvnw clean package
+ - if: ${{matrix.spark != '2.4'}}
+ name: build spark ${{matrix.spark}} and hadoop ${{matrix.hadoop}}
run:
- ./mvnw clean install -Pspark-2.4-hadoop-3.3 -Phadoop-3.3
-Dmaven.test.skip=true
+ ./mvnw clean package -Pspark-${{matrix.spark}}
-Phadoop-${{matrix.hadoop}} -Dmaven.test.skip=true
# - name: Upload coverage to Codecov
# uses: codecov/[email protected]
# with:
# token: ${{ secrets.CODECOV_TOKEN }}
+ third-party-dependencies-check:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout source
+ uses: actions/checkout@v3
+ - name: Set up JDK 8
+ uses: actions/setup-java@v3
+ with:
+ distribution: 'temurin'
+ java-version: 8
+ cache: maven
+ - name: mvn install
+ run:
+ #pom.xml also introduce linkis related jar,so run mvn install in
first time
+ ./mvnw install -Dmaven.test.skip=true -Dmaven.javadoc.skip=true
+ - name: mvn dependency:copy-dependencies
+ run:
+ ./mvnw dependency:copy-dependencies
-DexcludeGroupIds=org.apache.linkis -DincludeScope=runtime
-DoutputDirectory=${{ github.workspace }}/current_dependencies
+ - name: generate current_dependencies.txt
+ run: |
+ ls ${{ github.workspace }}/current_dependencies | sort >
~/current_dependencies.txt
+ cat ~/current_dependencies.txt
+ - name: check third dependencies
+ run: |
+ #by using commond join ,to check whether there are new third-party
dependencies,compared with file(tool/dependencies/known-dependencies.txt)
+ sort ${{ github.workspace
}}/tool/dependencies/known-dependencies.txt > ~/known-dependencies.txt
+ join -t : -o 1.1 2.1 -a2 ~/known-dependencies.txt
~/current_dependencies.txt > ~/result.txt
+ #print new third-party dependencies name if it exists
+ awk -F ":" '{if($1=="")print $2" is not in file
known-dependencies.txt!\n You can refer to this guide to repair
it(你可以参考这个执行进行修复)：https://linkis.apache.org/zh-CN/docs/latest/development/development-specification/license"}'
~/result.txt
+ result=`awk -F ":" '{if($1=="")print $2}' ~/result.txt |wc -l`
+ #if has new third-party,the Action will fail
+ if [[ $result == 0 ]];then echo "All third dependencies is known!"
;else exit 1;fi
\ No newline at end of file
diff --git a/.github/workflows/check-third-party-dependencies.yml
b/.github/workflows/check-third-party-dependencies.yml
deleted file mode 100644
index bcf4a371c..000000000
--- a/.github/workflows/check-third-party-dependencies.yml
+++ /dev/null
@@ -1,56 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-name: Third-party Dependencies Check
-
-on: [push, pull_request]
-
-env:
- MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false
-Dmaven.wagon.http.retryHandler.class=standard
-Dmaven.wagon.http.retryHandler.count=3
-Dmaven.wagon.httpconnectionManager.ttlSeconds=120
-
-jobs:
- third-party-dependencies-check-:
- runs-on: ubuntu-latest
- steps:
- - name: Checkout source
- uses: actions/checkout@v2
- - name: Set up JDK 8
- uses: actions/setup-java@v2
- with:
- java-version: '8'
- distribution: 'adopt'
- - name: mvn install
- run:
- #pom.xml also introduce linkis related jar,so run mvn install in
first time
- ./mvnw install -Dmaven.test.skip=true -Dmaven.javadoc.skip=true
- - name: mvn dependency:copy-dependencies
- run:
- ./mvnw dependency:copy-dependencies -DincludeScope=runtime
-DoutputDirectory=${{ github.workspace }}/current_dependencies
- - name: generate current_dependencies.txt
- run: |
- ls ${{ github.workspace }}/current_dependencies |egrep -v "^linkis"
|sort > ~/current_dependencies.txt
- cat ~/current_dependencies.txt
- - name: check third dependencies
- run: |
- #by using commond join ,to check whether there are new third-party
dependencies,compared with file(tool/dependencies/known-dependencies.txt)
- sort ${{ github.workspace
}}/tool/dependencies/known-dependencies.txt > ~/known-dependencies.txt
- join -t : -o 1.1 2.1 -a2 ~/known-dependencies.txt
~/current_dependencies.txt > ~/result.txt
- #print new third-party dependencies name if it exists
- awk -F ":" '{if($1=="")print $2" is not in file
known-dependencies.txt!\n You can refer to this guide to repair
it(你可以参考这个执行进行修复)：https://linkis.apache.org/zh-CN/docs/latest/development/development-specification/license"}'
~/result.txt
- result=`awk -F ":" '{if($1=="")print $2}' ~/result.txt |wc -l`
- #if has new third-party,the Action will fail
- if [[ $result == 0 ]];then echo "All third dependencies is known!"
;else exit 1;fi
\ No newline at end of file
diff --git
a/linkis-engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/config/SparkConfiguration.scala
b/linkis-engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/config/SparkConfiguration.scala
index 966caa03a..0a3966701 100644
---
a/linkis-engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/config/SparkConfiguration.scala
+++
b/linkis-engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/config/SparkConfiguration.scala
@@ -87,7 +87,7 @@ object SparkConfiguration extends Logging {
val LINKIS_SPARK_USEHIVECONTEXT =
CommonVars[Boolean]("wds.linkis.spark.useHiveContext", true)
val DEFAULT_SPARK_JAR_NAME =
- CommonVars[String]("wds.linkis.ecp.spark.default.jar",
"linkis-engineconn-core-1.3.1.jar")
+ CommonVars[String]("wds.linkis.ecp.spark.default.jar",
"linkis-engineconn-core-1.3.2.jar")
val ENGINE_JAR = CommonVars[String]("wds.linkis.enginemanager.core.jar",
getMainJarName)
diff --git a/linkis-web/package.json b/linkis-web/package.json
index 0b1b83855..d1ed26e81 100644
--- a/linkis-web/package.json
+++ b/linkis-web/package.json
@@ -1,6 +1,6 @@
{
"name": "linkis",
- "version": "1.3.1",
+ "version": "1.3.2",
"private": true,
"scripts": {
"serve": "vue-cli-service serve",
@@ -18,8 +18,7 @@
},
"lint-staged": {
"src/**/*.{js,vue}": [
- "vue-cli-service lint --no-fix",
- "git add"
+ "vue-cli-service lint --no-fix"
]
},
"dependencies": {
diff --git a/pom.xml b/pom.xml
index 4f2381c87..3b3164400 100644
--- a/pom.xml
+++ b/pom.xml
@@ -103,7 +103,7 @@
</snapshotRepository>
</distributionManagement>
<properties>
- <revision>1.3.2-SNAPSHOT</revision>
+ <revision>1.3.2</revision>
<jedis.version>2.9.2</jedis.version>
<spark.version>2.4.3</spark.version>
<hive.version>2.3.3</hive.version>
@@ -1177,6 +1177,7 @@
<exclude>**/target/**</exclude>
<exclude>**/out/**</exclude>
<exclude>**/*.log</exclude>
+ <exclude>**/logs/**</exclude>
<exclude>CONTRIBUTING.md</exclude>
<exclude>CONTRIBUTING_CN.md</exclude>
<exclude>README.md</exclude>
diff --git a/tool/dependencies/known-dependencies.txt
b/tool/dependencies/known-dependencies.txt
index de0f8e526..62f7f83f2 100644
--- a/tool/dependencies/known-dependencies.txt
+++ b/tool/dependencies/known-dependencies.txt
@@ -51,6 +51,7 @@ chill-java-0.7.6.jar
chill_2.11-0.7.6.jar
classgraph-4.1.7.jar
classmate-1.5.1.jar
+clickhouse-jdbc-0.3.2-patch11.jar
commons-beanutils-1.9.4.jar
commons-cli-1.2.jar
commons-cli-1.3.1.jar
@@ -76,6 +77,7 @@ commons-math3-3.6.1.jar
commons-net-3.1.jar
commons-net-3.9.0.jar
commons-pool-1.6.jar
+commons-pool2-2.8.1.jar
commons-text-1.10.0.jar
concurrent-0.191.jar
config-1.3.3.jar
@@ -91,6 +93,7 @@ derby-10.14.2.0.jar
disruptor-3.3.0.jar
dropwizard-metrics-hadoop-metrics2-reporter-0.1.2.jar
druid-1.1.22.jar
+dss-gateway-support-1.1.1.jar
eigenbase-properties-1.1.5.jar
elasticsearch-rest-client-6.8.15.jar
elasticsearch-rest-client-7.6.2.jar
@@ -267,6 +270,7 @@ jcommander-1.30.jar
jdbi3-core-3.4.0.jar
jdbi3-sqlobject-3.4.0.jar
jdo-api-3.0.1.jar
+jedis-2.9.2.jar
jersey-apache-client4-1.19.4.jar
jersey-client-1.19.4.jar
jersey-client-2.23.1.jar
@@ -301,10 +305,10 @@ jline-2.14.6.jar
jmxutils-1.19.jar
jna-5.12.1.jar
jna-platform-5.12.1.jar
+joda-time-2.10.5.jar
joda-time-2.3.jar
joda-time-2.8.1.jar
joda-time-2.9.3.jar
-joda-time-2.10.5.jar
jol-core-0.2.jar
joni-2.1.2.jar
jpam-1.1.jar
@@ -316,7 +320,6 @@ json4s-core_2.11-3.5.3.jar
json4s-jackson_2.11-3.5.3.jar
json4s-scalap_2.11-3.5.3.jar
jsp-api-2.1.jar
-jsqlparser-1.0.jar
jsqlparser-4.2.jar
jsr305-1.3.9.jar
jsr305-3.0.1.jar
@@ -359,6 +362,7 @@ metrics-jvm-4.1.22.jar
micrometer-core-1.5.14.jar
micrometer-registry-prometheus-1.5.14.jar
minlog-1.3.0.jar
+mongo-java-driver-3.12.8.jar
mybatis-3.5.6.jar
mybatis-plus-3.4.1.jar
mybatis-plus-annotation-3.4.1.jar
@@ -424,6 +428,7 @@ poi-5.2.3.jar
poi-ooxml-5.2.3.jar
poi-ooxml-lite-5.2.3.jar
poi-shared-strings-2.5.6.jar
+postgresql-42.3.8.jar
presto-client-0.234.jar
presto-client-1.5.0.jar
presto-resource-group-managers-0.234.jar
@@ -460,6 +465,9 @@ scala-reflect-2.11.12.jar
scala-xml_2.11-1.0.5.jar
scalap-2.11.12.jar
scopt_2.11-3.5.0.jar
+seatunnel-core-flink-2.1.2.jar
+seatunnel-core-flink-sql-2.1.2.jar
+seatunnel-core-spark-2.1.2.jar
security-0.191.jar
security-0.193.jar
servo-core-0.12.21.jar
@@ -484,7 +492,6 @@ spring-boot-starter-actuator-2.3.12.RELEASE.jar
spring-boot-starter-aop-2.3.12.RELEASE.jar
spring-boot-starter-cache-2.3.12.RELEASE.jar
spring-boot-starter-freemarker-2.3.12.RELEASE.jar
-spring-boot-starter-jdbc-2.3.12.RELEASE.jar
spring-boot-starter-jetty-2.3.12.RELEASE.jar
spring-boot-starter-json-2.3.12.RELEASE.jar
spring-boot-starter-log4j2-2.3.12.RELEASE.jar
@@ -577,13 +584,3 @@ zookeeper-3.5.9.jar
zookeeper-jute-3.5.9.jar
zstd-jni-1.4.4-7.jar
zstd-jni-1.4.5-6.jar
-commons-pool2-2.8.1.jar
-jedis-2.9.2.jar
-dss-gateway-support-1.1.1.jar
-seatunnel-core-flink-2.1.2.jar
-seatunnel-core-flink-sql-2.1.2.jar
-seatunnel-core-spark-2.1.2.jar
-mongo-java-driver-3.12.8.jar
-clickhouse-jdbc-0.3.2-patch11.jar
-postgresql-42.3.8.jar
-
diff --git a/tool/dependencies/regenerate_konwn_dependencies_txt.sh
b/tool/dependencies/regenerate_konwn_dependencies_txt.sh
index 8a5743b07..e359ba7c5 100755
--- a/tool/dependencies/regenerate_konwn_dependencies_txt.sh
+++ b/tool/dependencies/regenerate_konwn_dependencies_txt.sh
@@ -23,6 +23,6 @@ if [[ -d $dependencies_path ]];then
rm -r -f $dependencies_path
fi
cd ../../
-mvn dependency:copy-dependencies -DincludeScope=runtime
-DoutputDirectory=$dependencies_path
-ls $dependencies_path | egrep -v "^linkis" | sort -n >
$basepath/known-dependencies.txt
+mvn dependency:copy-dependencies -DexcludeGroupIds=org.apache.linkis
-DincludeScope=runtime -DoutputDirectory=$dependencies_path
+ls $dependencies_path | sort -n > $basepath/known-dependencies.txt
rm -r -f $dependencies_path
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
