You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by xx...@apache.org on 2023/04/21 08:48:28 UTC
[kylin] branch kylin5 updated (ad85b9805f -> 2312dbf4ba)
This is an automated email from the ASF dual-hosted git repository.
xxyu pushed a change to branch kylin5
in repository https://gitbox.apache.org/repos/asf/kylin.git
from ad85b9805f KYLIN-5471 fix model edit cc panel issue
new 57544d30db Create first release of Kylin 5.X
new c0e48bbcab Update release scripts
new 6057106513 [maven-release-plugin] prepare release kylin-5.0.0-alpha
new b096e174d4 [maven-release-plugin] prepare for next development iteration
new 7015516a0a minor, disable several tests to shorten the overall time
new e5a526ee1e KYLIN-5519 DateFormatTest shouldn't rely on user's timezone
new 35d5bcd33e Fix NPE for six UTs
new 340cd4a629 [maven-release-plugin] prepare release kylin-5.0.0-alpha
new 2312dbf4ba [maven-release-plugin] prepare for next development iteration
The 9 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
NOTICE | 3 +
.../async-profiler-lib/download-async-profiler.sh | 21 +++
.../libasyncProfiler-linux-arm64.so | Bin 298256 -> 0 bytes
.../libasyncProfiler-linux-x64.so | Bin 303903 -> 0 bytes
build/async-profiler-lib/libasyncProfiler-mac.so | Bin 634272 -> 0 bytes
build/bin/upgrade.sh | 10 +-
build/release/compress.sh | 27 ++-
build/release/jdbc_package.sh | 4 +-
build/release/package.sh | 21 ++-
build/release/prepare.sh | 2 +-
build/release/release-pipeline-docker/README.md | 91 +++++++++
.../release-pipeline-docker/release-in-docker.sh | 39 ++++
.../release-machine/Dockerfile | 67 +++++++
.../release-machine/conf/setenv.sh | 38 ++++
.../release-machine/conf/settings.xml | 101 ++++++++++
.../release-machine/create-release-machine.sh | 27 +++
.../release-machine/script/entrypoint.sh | 23 +++
.../release-machine/script/release-publish.sh | 203 +++++++++++++++++++++
build/release/release.sh | 6 +-
...influxdb.sh => disabled-check-1900-influxdb.sh} | 0
...khouse.sh => disabled-check-3000-clickhouse.sh} | 0
build/sbin/download-spark-user.sh | 69 +++++++
build/sbin/prepare-hadoop-conf-dir.sh | 2 +-
dev-support/unit_testing.sh | 79 ++++----
.../src/components/setting/SettingModel/locales.js | 2 +-
kystudio/src/components/user/login.vue | 14 +-
pom.xml | 74 ++++----
src/assembly/pom.xml | 9 +-
src/assembly/source-assembly.xml | 121 ++++++++++++
src/common-booter/pom.xml | 6 +-
.../src/main/resources/config/config_library.csv | 10 +-
src/common-server/pom.xml | 6 +-
src/common-service/pom.xml | 6 +-
.../org/apache/kylin/rest/cache/RedisCache.java | 2 +-
.../apache/kylin/tool/garbage/StorageCleaner.java | 2 +-
src/core-common/pom.xml | 5 +-
.../java/org/apache/kylin/common/KapConfig.java | 23 ---
.../java/org/apache/kylin/common/KylinVersion.java | 2 +-
.../org/apache/kylin/common/msg/CnMessage.java | 109 +----------
.../java/org/apache/kylin/common/msg/Message.java | 73 ++------
.../org/apache/kylin/common/util/DateFormat.java | 34 +++-
.../resources/kylin_error_msg_conf_cn.properties | 2 +-
.../resources/kylin_error_msg_conf_en.properties | 2 +-
.../org/apache/kylin/common/KapConfigTest.java | 10 -
.../kylin/common/exception/code/ErrorCodeTest.java | 6 +-
.../apache/kylin/common/util/DateFormatTest.java | 65 +++----
src/core-job/pom.xml | 6 +-
.../job/impl/threadpool/NDefaultScheduler.java | 3 -
.../org/apache/kylin/job/lock/ZookeeperUtil.java | 1 -
src/core-metadata/pom.xml | 5 +-
.../apache/kylin/measure/topn/TopNCounterTest.java | 2 +-
.../metadata/cube/model/NDataflowManagerTest.java | 1 -
.../cube/planner/CostBasePlannerUtilsTest.java | 17 ++
src/core-metrics/pom.xml | 6 +-
src/core-storage/pom.xml | 6 +-
src/data-loading-booter/pom.xml | 6 +-
.../src/main/resources/config/config_library.csv | 10 +-
src/data-loading-server/pom.xml | 6 +-
src/data-loading-service/pom.xml | 6 +-
.../org/apache/kylin/rest/service/JobService.java | 2 +-
src/datasource-sdk/pom.xml | 6 +-
src/datasource-service/pom.xml | 6 +-
src/distributed-lock-ext/pom.xml | 6 +-
src/examples/LICENSE | 10 -
src/jdbc/libs/log4j-api-2.18.0.jar | Bin 315115 -> 0 bytes
src/jdbc/libs/log4j-core-2.18.0.jar | Bin 1861441 -> 0 bytes
src/jdbc/libs/log4j-slf4j-impl-2.18.0.jar | Bin 24801 -> 0 bytes
src/jdbc/pom.xml | 23 +--
.../java/org/apache/kylin/jdbc/KylinClient.java | 2 +-
.../resources/org-apache-kylin-jdbc.properties | 6 +-
src/job-service/pom.xml | 6 +-
.../initialize/JobSchedulerListenerTest.java | 2 +-
src/kylin-it/pom.xml | 6 +-
.../apache/kylin/query/engine/QueryExecTest.java | 2 -
.../springframework/conf/applicationContext.xml | 12 +-
src/metadata-server/pom.xml | 6 +-
src/modeling-service/pom.xml | 6 +-
.../nmodel_test_expected.json | 2 +-
src/query-booter/pom.xml | 6 +-
.../src/main/resources/config/config_library.csv | 10 +-
src/query-common/pom.xml | 6 +-
.../apache/kylin/query/relnode/ContextUtil.java | 1 -
src/query-server/pom.xml | 6 +-
src/query-service/pom.xml | 6 +-
.../service/QueryCompositeMemcachedCacheTest.java | 2 +
src/query/pom.xml | 6 +-
.../kap/query/optrule/ExtensionOlapJoinRule.java | 1 -
.../kyligence/kap/query/optrule/KapJoinRule.java | 2 +-
.../kap/query/optrule/SumBasicOperatorRule.java | 1 -
.../apache/kylin/query/engine/SQLConverter.java | 1 -
.../kylin/query/relnode/ContextUtilTest.java | 1 -
.../kylin/query/util/ExpressionComparatorTest.java | 1 -
.../org/apache/kylin/query/util/QueryUtilTest.java | 4 +-
src/second-storage/clickhouse-it/pom.xml | 6 +-
src/second-storage/clickhouse/pom.xml | 6 +-
src/second-storage/core-ui/pom.xml | 6 +-
src/second-storage/core/pom.xml | 6 +-
src/server/pom.xml | 6 +-
.../org/apache/kylin/rest/BootstrapServer.java | 2 +-
.../org/apache/kylin/rest/InitConfiguration.java | 2 +-
.../apache/kylin/rest/config/SwaggerConfig.java | 2 +-
.../src/main/resources/config/config_library.csv | 10 +-
src/source-hive/pom.xml | 5 +-
src/spark-project/engine-build-sdk/pom.xml | 6 +-
src/spark-project/engine-spark/pom.xml | 6 +-
src/spark-project/examples/buildKylinFact.zip | Bin 12326261 -> 0 bytes
.../kylin-soft-affinity-cache/pom.xml | 2 +-
src/spark-project/source-jdbc/pom.xml | 6 +-
src/spark-project/sparder/pom.xml | 6 +-
src/spark-project/spark-common/pom.xml | 6 +-
src/spark-project/spark-it/pom.xml | 6 +-
src/streaming-sdk/pom.xml | 6 +-
src/streaming-service/pom.xml | 6 +-
src/streaming/pom.xml | 6 +-
src/systools/pom.xml | 0
src/systools/src/test/resources/ehcache.xml | 0
src/tool/pom.xml | 6 +-
.../org/apache/kylin/tool/util/ServerInfoUtil.java | 4 +-
.../kylin/tool/AbstractInfoExtractorToolTest.java | 4 +-
.../kylin/tool/upgrade/UpdateUserAclToolTest.java | 8 +-
.../apache/kylin/tool/util/ServerInfoUtilTest.java | 4 +-
src/tool/src/test/resources/diag/eventlog | 2 +-
122 files changed, 1173 insertions(+), 610 deletions(-)
create mode 100644 build/async-profiler-lib/download-async-profiler.sh
delete mode 100644 build/async-profiler-lib/libasyncProfiler-linux-arm64.so
delete mode 100644 build/async-profiler-lib/libasyncProfiler-linux-x64.so
delete mode 100644 build/async-profiler-lib/libasyncProfiler-mac.so
create mode 100644 build/release/release-pipeline-docker/README.md
create mode 100644 build/release/release-pipeline-docker/release-in-docker.sh
create mode 100644 build/release/release-pipeline-docker/release-machine/Dockerfile
create mode 100644 build/release/release-pipeline-docker/release-machine/conf/setenv.sh
create mode 100644 build/release/release-pipeline-docker/release-machine/conf/settings.xml
create mode 100644 build/release/release-pipeline-docker/release-machine/create-release-machine.sh
create mode 100644 build/release/release-pipeline-docker/release-machine/script/entrypoint.sh
create mode 100644 build/release/release-pipeline-docker/release-machine/script/release-publish.sh
rename build/sbin/{check-1900-influxdb.sh => disabled-check-1900-influxdb.sh} (100%)
rename build/sbin/{check-3000-clickhouse.sh => disabled-check-3000-clickhouse.sh} (100%)
create mode 100755 build/sbin/download-spark-user.sh
create mode 100644 src/assembly/source-assembly.xml
delete mode 100644 src/examples/LICENSE
delete mode 100644 src/jdbc/libs/log4j-api-2.18.0.jar
delete mode 100644 src/jdbc/libs/log4j-core-2.18.0.jar
delete mode 100644 src/jdbc/libs/log4j-slf4j-impl-2.18.0.jar
delete mode 100644 src/spark-project/examples/buildKylinFact.zip
delete mode 100644 src/systools/pom.xml
delete mode 100644 src/systools/src/test/resources/ehcache.xml
[kylin] 09/09: [maven-release-plugin] prepare for next development iteration
Posted by xx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xxyu pushed a commit to branch kylin5
in repository https://gitbox.apache.org/repos/asf/kylin.git
commit 2312dbf4baa514d14ebb14d988a70bf8032905fb
Author: XiaoxiangYu <xx...@apache.org>
AuthorDate: Fri Apr 21 02:50:13 2023 +0000
[maven-release-plugin] prepare for next development iteration
---
pom.xml | 4 ++--
src/assembly/pom.xml | 2 +-
src/common-booter/pom.xml | 2 +-
src/common-server/pom.xml | 2 +-
src/common-service/pom.xml | 2 +-
src/core-common/pom.xml | 2 +-
src/core-job/pom.xml | 2 +-
src/core-metadata/pom.xml | 2 +-
src/core-metrics/pom.xml | 2 +-
src/core-storage/pom.xml | 2 +-
src/data-loading-booter/pom.xml | 2 +-
src/data-loading-server/pom.xml | 2 +-
src/data-loading-service/pom.xml | 2 +-
src/datasource-sdk/pom.xml | 2 +-
src/datasource-service/pom.xml | 2 +-
src/distributed-lock-ext/pom.xml | 2 +-
src/jdbc/pom.xml | 2 +-
src/job-service/pom.xml | 2 +-
src/kylin-it/pom.xml | 2 +-
src/metadata-server/pom.xml | 2 +-
src/modeling-service/pom.xml | 2 +-
src/query-booter/pom.xml | 2 +-
src/query-common/pom.xml | 2 +-
src/query-server/pom.xml | 2 +-
src/query-service/pom.xml | 2 +-
src/query/pom.xml | 2 +-
src/second-storage/clickhouse-it/pom.xml | 2 +-
src/second-storage/clickhouse/pom.xml | 2 +-
src/second-storage/core-ui/pom.xml | 2 +-
src/second-storage/core/pom.xml | 2 +-
src/server/pom.xml | 2 +-
src/source-hive/pom.xml | 2 +-
src/spark-project/engine-build-sdk/pom.xml | 2 +-
src/spark-project/engine-spark/pom.xml | 2 +-
src/spark-project/kylin-soft-affinity-cache/pom.xml | 2 +-
src/spark-project/source-jdbc/pom.xml | 2 +-
src/spark-project/sparder/pom.xml | 2 +-
src/spark-project/spark-common/pom.xml | 2 +-
src/spark-project/spark-it/pom.xml | 2 +-
src/streaming-sdk/pom.xml | 2 +-
src/streaming-service/pom.xml | 2 +-
src/streaming/pom.xml | 2 +-
src/tool/pom.xml | 2 +-
43 files changed, 44 insertions(+), 44 deletions(-)
diff --git a/pom.xml b/pom.xml
index ba0fb13112..3e8a58dba3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
<packaging>pom</packaging>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<name>Apache Kylin</name>
<url>http://kylin.apache.org</url>
@@ -45,7 +45,7 @@
<!-- developerConnection is using in maven-release-plugin https://maven.apache.org/guides/mini/guide-releasing.html-->
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/kylin.git</developerConnection>
<url>scm:git:https://gitbox.apache.org/repos/asf/kylin.git</url>
- <tag>kylin-5.0.0-alpha</tag>
+ <tag>HEAD</tag>
</scm>
<issueManagement>
diff --git a/src/assembly/pom.xml b/src/assembly/pom.xml
index d66a732769..1205fe9287 100644
--- a/src/assembly/pom.xml
+++ b/src/assembly/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/common-booter/pom.xml b/src/common-booter/pom.xml
index d03425fdbc..66490fc55f 100644
--- a/src/common-booter/pom.xml
+++ b/src/common-booter/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/common-server/pom.xml b/src/common-server/pom.xml
index 59677a8f09..d85c09ad2c 100644
--- a/src/common-server/pom.xml
+++ b/src/common-server/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/common-service/pom.xml b/src/common-service/pom.xml
index d282cd897b..e8f7040c16 100644
--- a/src/common-service/pom.xml
+++ b/src/common-service/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/core-common/pom.xml b/src/core-common/pom.xml
index ef80be28f7..f1069ff094 100644
--- a/src/core-common/pom.xml
+++ b/src/core-common/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/src/core-job/pom.xml b/src/core-job/pom.xml
index 4a0d2f9a04..411fba7683 100644
--- a/src/core-job/pom.xml
+++ b/src/core-job/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/src/core-metadata/pom.xml b/src/core-metadata/pom.xml
index 73500d323c..41aef82ee8 100644
--- a/src/core-metadata/pom.xml
+++ b/src/core-metadata/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/src/core-metrics/pom.xml b/src/core-metrics/pom.xml
index 904d490574..2094263787 100644
--- a/src/core-metrics/pom.xml
+++ b/src/core-metrics/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<name>Kylin - Core Metrics</name>
diff --git a/src/core-storage/pom.xml b/src/core-storage/pom.xml
index 2c3a7836ed..78be4d11da 100644
--- a/src/core-storage/pom.xml
+++ b/src/core-storage/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/src/data-loading-booter/pom.xml b/src/data-loading-booter/pom.xml
index 4bf75836e5..4d12f10c6a 100644
--- a/src/data-loading-booter/pom.xml
+++ b/src/data-loading-booter/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/data-loading-server/pom.xml b/src/data-loading-server/pom.xml
index 08abccb76f..d1b3a69c8c 100644
--- a/src/data-loading-server/pom.xml
+++ b/src/data-loading-server/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/data-loading-service/pom.xml b/src/data-loading-service/pom.xml
index 74f356edad..aab8c449be 100644
--- a/src/data-loading-service/pom.xml
+++ b/src/data-loading-service/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/datasource-sdk/pom.xml b/src/datasource-sdk/pom.xml
index bbbb2c8f88..5bb1a9038a 100644
--- a/src/datasource-sdk/pom.xml
+++ b/src/datasource-sdk/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/datasource-service/pom.xml b/src/datasource-service/pom.xml
index 50d2219113..ed13b19273 100644
--- a/src/datasource-service/pom.xml
+++ b/src/datasource-service/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/distributed-lock-ext/pom.xml b/src/distributed-lock-ext/pom.xml
index 723b161960..2cf08f1634 100644
--- a/src/distributed-lock-ext/pom.xml
+++ b/src/distributed-lock-ext/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/jdbc/pom.xml b/src/jdbc/pom.xml
index 05159b0b60..1d92744a46 100644
--- a/src/jdbc/pom.xml
+++ b/src/jdbc/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/job-service/pom.xml b/src/job-service/pom.xml
index 18efc843cd..3508f3259d 100644
--- a/src/job-service/pom.xml
+++ b/src/job-service/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/kylin-it/pom.xml b/src/kylin-it/pom.xml
index f65782ddc6..2ed10dc0ff 100644
--- a/src/kylin-it/pom.xml
+++ b/src/kylin-it/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/metadata-server/pom.xml b/src/metadata-server/pom.xml
index 4b17c39ded..38ff80c59b 100644
--- a/src/metadata-server/pom.xml
+++ b/src/metadata-server/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/modeling-service/pom.xml b/src/modeling-service/pom.xml
index 9ba94b83d3..c6c5a996f0 100644
--- a/src/modeling-service/pom.xml
+++ b/src/modeling-service/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/query-booter/pom.xml b/src/query-booter/pom.xml
index ec9976704d..2651a9aa28 100644
--- a/src/query-booter/pom.xml
+++ b/src/query-booter/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/query-common/pom.xml b/src/query-common/pom.xml
index 812b92e33c..18a5e8e2c0 100644
--- a/src/query-common/pom.xml
+++ b/src/query-common/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/src/query-server/pom.xml b/src/query-server/pom.xml
index 6065205305..c1045d9614 100644
--- a/src/query-server/pom.xml
+++ b/src/query-server/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/query-service/pom.xml b/src/query-service/pom.xml
index 2acf89b8a6..7f3301d207 100644
--- a/src/query-service/pom.xml
+++ b/src/query-service/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/query/pom.xml b/src/query/pom.xml
index 3380cba019..ed43542bf9 100644
--- a/src/query/pom.xml
+++ b/src/query/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/src/second-storage/clickhouse-it/pom.xml b/src/second-storage/clickhouse-it/pom.xml
index 8d0fd5d652..bf2a5cd262 100644
--- a/src/second-storage/clickhouse-it/pom.xml
+++ b/src/second-storage/clickhouse-it/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/second-storage/clickhouse/pom.xml b/src/second-storage/clickhouse/pom.xml
index ff3ae14f97..e173d69cde 100644
--- a/src/second-storage/clickhouse/pom.xml
+++ b/src/second-storage/clickhouse/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/second-storage/core-ui/pom.xml b/src/second-storage/core-ui/pom.xml
index 0a20e5fda4..33891070aa 100644
--- a/src/second-storage/core-ui/pom.xml
+++ b/src/second-storage/core-ui/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/second-storage/core/pom.xml b/src/second-storage/core/pom.xml
index e1b0e56794..657e2df052 100644
--- a/src/second-storage/core/pom.xml
+++ b/src/second-storage/core/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/src/server/pom.xml b/src/server/pom.xml
index b1414ff8ae..1b24a133b6 100644
--- a/src/server/pom.xml
+++ b/src/server/pom.xml
@@ -27,7 +27,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/src/source-hive/pom.xml b/src/source-hive/pom.xml
index 0d457bf1b3..4831c23b15 100644
--- a/src/source-hive/pom.xml
+++ b/src/source-hive/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/src/spark-project/engine-build-sdk/pom.xml b/src/spark-project/engine-build-sdk/pom.xml
index 3c24c6d314..3eba2238dc 100644
--- a/src/spark-project/engine-build-sdk/pom.xml
+++ b/src/spark-project/engine-build-sdk/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/spark-project/engine-spark/pom.xml b/src/spark-project/engine-spark/pom.xml
index 12eb543bc8..b22aefa720 100644
--- a/src/spark-project/engine-spark/pom.xml
+++ b/src/spark-project/engine-spark/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/src/spark-project/kylin-soft-affinity-cache/pom.xml b/src/spark-project/kylin-soft-affinity-cache/pom.xml
index f4e7552c95..b45cfd71ab 100644
--- a/src/spark-project/kylin-soft-affinity-cache/pom.xml
+++ b/src/spark-project/kylin-soft-affinity-cache/pom.xml
@@ -31,7 +31,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/src/spark-project/source-jdbc/pom.xml b/src/spark-project/source-jdbc/pom.xml
index 523d5f1a63..0130a9cda2 100644
--- a/src/spark-project/source-jdbc/pom.xml
+++ b/src/spark-project/source-jdbc/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/spark-project/sparder/pom.xml b/src/spark-project/sparder/pom.xml
index ec5c590a7a..ee5c7bad54 100644
--- a/src/spark-project/sparder/pom.xml
+++ b/src/spark-project/sparder/pom.xml
@@ -30,7 +30,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/src/spark-project/spark-common/pom.xml b/src/spark-project/spark-common/pom.xml
index 701dcaf11e..98cf5f29cd 100644
--- a/src/spark-project/spark-common/pom.xml
+++ b/src/spark-project/spark-common/pom.xml
@@ -27,7 +27,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/src/spark-project/spark-it/pom.xml b/src/spark-project/spark-it/pom.xml
index 43f2837578..4f9133858a 100644
--- a/src/spark-project/spark-it/pom.xml
+++ b/src/spark-project/spark-it/pom.xml
@@ -27,7 +27,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/src/streaming-sdk/pom.xml b/src/streaming-sdk/pom.xml
index 43d3f81c05..b542ea7637 100644
--- a/src/streaming-sdk/pom.xml
+++ b/src/streaming-sdk/pom.xml
@@ -18,7 +18,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/streaming-service/pom.xml b/src/streaming-service/pom.xml
index 2870753b60..766f0ae85f 100644
--- a/src/streaming-service/pom.xml
+++ b/src/streaming-service/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/streaming/pom.xml b/src/streaming/pom.xml
index effce60b2d..2008304b22 100644
--- a/src/streaming/pom.xml
+++ b/src/streaming/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<properties>
diff --git a/src/tool/pom.xml b/src/tool/pom.xml
index 34bbd2808a..719fefc22e 100644
--- a/src/tool/pom.xml
+++ b/src/tool/pom.xml
@@ -27,7 +27,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
[kylin] 02/09: Update release scripts
Posted by xx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xxyu pushed a commit to branch kylin5
in repository https://gitbox.apache.org/repos/asf/kylin.git
commit c0e48bbcab89b1a0b16e3a5e5361eef66179fe71
Author: XiaoxiangYu <xx...@apache.org>
AuthorDate: Tue Apr 4 11:38:52 2023 +0800
Update release scripts
---
.../async-profiler-lib/download-async-profiler.sh | 21 +++++++++++++++++++++
.../libasyncProfiler-linux-arm64.so | Bin 298256 -> 0 bytes
.../libasyncProfiler-linux-x64.so | Bin 303903 -> 0 bytes
build/async-profiler-lib/libasyncProfiler-mac.so | Bin 634272 -> 0 bytes
build/release/compress.sh | 14 ++++++++++----
build/release/jdbc_package.sh | 4 ++--
.../release-machine/script/release-publish.sh | 17 ++++++++++++++++-
pom.xml | 4 ++--
src/jdbc/libs/log4j-api-2.18.0.jar | Bin 315115 -> 0 bytes
src/jdbc/libs/log4j-core-2.18.0.jar | Bin 1861441 -> 0 bytes
src/jdbc/libs/log4j-slf4j-impl-2.18.0.jar | Bin 24801 -> 0 bytes
.../resources/org-apache-kylin-jdbc.properties | 6 +++---
src/spark-project/examples/buildKylinFact.zip | Bin 12326261 -> 0 bytes
13 files changed, 54 insertions(+), 12 deletions(-)
diff --git a/build/async-profiler-lib/download-async-profiler.sh b/build/async-profiler-lib/download-async-profiler.sh
new file mode 100644
index 0000000000..bbb33b26a1
--- /dev/null
+++ b/build/async-profiler-lib/download-async-profiler.sh
@@ -0,0 +1,21 @@
+#
+# /*
+# * 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.
+# */
+#
+
+wget https://github.com/jvm-profiling-tools/async-profiler/releases/download/v2.9/async-profiler-2.9-linux-x64.tar.gz
\ No newline at end of file
diff --git a/build/async-profiler-lib/libasyncProfiler-linux-arm64.so b/build/async-profiler-lib/libasyncProfiler-linux-arm64.so
deleted file mode 100644
index b959823506..0000000000
Binary files a/build/async-profiler-lib/libasyncProfiler-linux-arm64.so and /dev/null differ
diff --git a/build/async-profiler-lib/libasyncProfiler-linux-x64.so b/build/async-profiler-lib/libasyncProfiler-linux-x64.so
deleted file mode 100644
index 6d961cec0d..0000000000
Binary files a/build/async-profiler-lib/libasyncProfiler-linux-x64.so and /dev/null differ
diff --git a/build/async-profiler-lib/libasyncProfiler-mac.so b/build/async-profiler-lib/libasyncProfiler-mac.so
deleted file mode 100644
index ad45237d5f..0000000000
Binary files a/build/async-profiler-lib/libasyncProfiler-mac.so and /dev/null differ
diff --git a/build/release/compress.sh b/build/release/compress.sh
index 71c5ad3978..e0d646fb40 100755
--- a/build/release/compress.sh
+++ b/build/release/compress.sh
@@ -46,10 +46,12 @@ if [[ -d "influxdb" ]]; then
cp -rf postgresql ${package_name}/
fi
-# copy async profiler native files
-cp -rf async-profiler-lib/libasyncProfiler-mac.so "${package_name}"/lib/libasyncProfiler-mac.so
-cp -rf async-profiler-lib/libasyncProfiler-linux-x64.so "${package_name}"/lib/libasyncProfiler-linux-x64.so
-cp -rf async-profiler-lib/libasyncProfiler-linux-arm64.so "${package_name}"/lib/libasyncProfiler-linux-arm64.so
+## copy async profiler native files
+bash async-profiler-lib/download-async-profiler.sh
+cp -rf async-profiler-2.9-linux-x64.tar.gz "${package_name}"/lib/libasyncProfiler-linux-x64.so
+#cp -rf async-profiler-lib/libasyncProfiler-mac.so "${package_name}"/lib/libasyncProfiler-mac.so
+#cp -rf async-profiler-lib/libasyncProfiler-linux-x64.so "${package_name}"/lib/libasyncProfiler-linux-x64.so
+#cp -rf async-profiler-lib/libasyncProfiler-linux-arm64.so "${package_name}"/lib/libasyncProfiler-linux-arm64.so
# Add ssb data preparation files
mkdir -p ${package_name}/tool/ssb
@@ -62,6 +64,10 @@ cp -rf ../build/deploy/grafana/dashboards ${package_name}/tool/grafana/
cp -rf ../build/deploy/grafana/provisioning ${package_name}/tool/grafana/
cp -rf ../build/deploy/grafana/custom.ini ${package_name}/tool/grafana/
+# Add JDBC Driver
+bash release/jdbc_package.sh
+cp ../jdbc_dist/kylin-jdbc-${RELEASE_VERSION}.tar.gz "${package_name}"/lib
+
# Add conf profiles
mkdir -p ${package_name}/conf
mkdir -p ${package_name}/tool/conf
diff --git a/build/release/jdbc_package.sh b/build/release/jdbc_package.sh
index fe8c0f831a..a8c41b8f84 100755
--- a/build/release/jdbc_package.sh
+++ b/build/release/jdbc_package.sh
@@ -23,7 +23,7 @@ cd ${dir}/../..
mvn versions:set -DnewVersion=${RELEASE_VERSION}
RELEASE_VERSION=$(mvn -q -Dexec.executable="echo" -Dexec.args='${project.version}' --non-recursive exec:exec)
-mvn clean install -e -DskipTests -pl src/jdbc
+mvn install -DskipTests -pl src/jdbc
if [[ -d jdbc_dist ]]; then
rm -rf jdbc_dist/*
@@ -32,7 +32,7 @@ mkdir -p jdbc_dist
cp src/jdbc/target/kylin-*.jar jdbc_dist/
cp src/jdbc/target/kylin-jdbc.properties jdbc_dist/
-cp src/jdbc/libs/*.jar jdbc_dist/
+#cp src/jdbc/libs/*.jar jdbc_dist/
rm -f jdbc_dist/*-tests.jar
cd jdbc_dist
tar -zcvf kylin-jdbc-${RELEASE_VERSION}.tar.gz ./*
diff --git a/build/release/release-pipeline-docker/release-machine/script/release-publish.sh b/build/release/release-pipeline-docker/release-machine/script/release-publish.sh
index d868e7e772..8c5c5a082a 100644
--- a/build/release/release-pipeline-docker/release-machine/script/release-publish.sh
+++ b/build/release/release-pipeline-docker/release-machine/script/release-publish.sh
@@ -46,6 +46,12 @@ function run_command {
#### Release Configuration
source /root/scripts/setenv.sh
+if [ $# -eq 0 ]; then
+ RELEASE_STEP="publish-rc"
+else
+ RELEASE_STEP=$1
+fi
+echo "==> Running step : $RELEASE_STEP"
GIT_BRANCH=${GIT_BRANCH:-kylin5}
ASF_USERNAME=${ASF_USERNAME:-xxyu}
@@ -111,6 +117,15 @@ if [[ "$RELEASE_STEP" == "publish-rc" ]]; then
fi
fi
+if [[ "$RELEASE_STEP" == "reset" ]]; then
+ echo "==> reset release folder"
+ cd ${source_code_folder}
+ git reset --hard HEAD~5
+ git pull -r origin "$GIT_BRANCH"
+ mvn clean
+ mvn release:clean
+fi
+
####################################################
####################################################
#### Publish maven artifact and source package
@@ -141,7 +156,7 @@ if [[ "$RELEASE_STEP" == "publish-rc" ]]; then
# Create a directory for this release candidate
mkdir -p ${release_candidate_folder}
- # rm -rf target/apache-kylin-*ource-release.zip.asc.sha256
+ rm -rf target/apache-kylin-*ource-release.zip.asc.sha256
# Move source code and signture of source code to release candidate directory
cp target/apache-kylin-*source-release.zip* "${release_candidate_folder}"
diff --git a/pom.xml b/pom.xml
index 4dfba2dd28..adf6002c5a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3633,8 +3633,8 @@
<exclude>src/examples/sample_cube/template/**</exclude>
<exclude>src/examples/test_case_data/localmeta/**</exclude>
<exclude>src/examples/test_case_data/parquet_test/**</exclude>
- <exclude>**/src/spark-project/engine-spark/metastore_db/db.lck</exclude>
- <exclude>**/src/spark-project/engine-spark/metastore_db/service.properties</exclude>
+ <exclude>**/metastore_db/*.lck</exclude>
+ <exclude>**/metastore_db/*.properties</exclude>
<!-- generated files -->
<exclude>**/target/**</exclude>
diff --git a/src/jdbc/libs/log4j-api-2.18.0.jar b/src/jdbc/libs/log4j-api-2.18.0.jar
deleted file mode 100644
index b4e933f7ec..0000000000
Binary files a/src/jdbc/libs/log4j-api-2.18.0.jar and /dev/null differ
diff --git a/src/jdbc/libs/log4j-core-2.18.0.jar b/src/jdbc/libs/log4j-core-2.18.0.jar
deleted file mode 100644
index d6486fdf3d..0000000000
Binary files a/src/jdbc/libs/log4j-core-2.18.0.jar and /dev/null differ
diff --git a/src/jdbc/libs/log4j-slf4j-impl-2.18.0.jar b/src/jdbc/libs/log4j-slf4j-impl-2.18.0.jar
deleted file mode 100644
index cc41910c32..0000000000
Binary files a/src/jdbc/libs/log4j-slf4j-impl-2.18.0.jar and /dev/null differ
diff --git a/src/jdbc/src/main/resources/org-apache-kylin-jdbc.properties b/src/jdbc/src/main/resources/org-apache-kylin-jdbc.properties
index 68918b146c..3814b4baa8 100644
--- a/src/jdbc/src/main/resources/org-apache-kylin-jdbc.properties
+++ b/src/jdbc/src/main/resources/org-apache-kylin-jdbc.properties
@@ -16,10 +16,10 @@
# limitations under the License.
#
-driver.name=Kylin JDBC Driver
-driver.version=0.1
+driver.name=Apache Kylin JDBC Driver
+driver.version=1.0
product.name=Kylin
-product.version=0.1
+product.version=1.0
jdbc.compliant=true
driver.version.major=0
driver.version.minor=8
diff --git a/src/spark-project/examples/buildKylinFact.zip b/src/spark-project/examples/buildKylinFact.zip
deleted file mode 100644
index 96b8652904..0000000000
Binary files a/src/spark-project/examples/buildKylinFact.zip and /dev/null differ
[kylin] 05/09: minor, disable several tests to shorten the overall time
Posted by xx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xxyu pushed a commit to branch kylin5
in repository https://gitbox.apache.org/repos/asf/kylin.git
commit 7015516a0a479ae6f7f376b23e457f2cad6f0eae
Author: Shaofeng Shi <sh...@apache.org>
AuthorDate: Wed Apr 19 14:13:46 2023 +0800
minor, disable several tests to shorten the overall time
---
dev-support/unit_testing.sh | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/dev-support/unit_testing.sh b/dev-support/unit_testing.sh
index 7598e5ad68..e1d48795ad 100644
--- a/dev-support/unit_testing.sh
+++ b/dev-support/unit_testing.sh
@@ -34,12 +34,12 @@ mvn clean test --fail-at-end -pl src/core-storage -DfailIfNoTests=false -Duser.t
mvn clean test --fail-at-end -pl src/data-loading-booter -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
mvn clean test --fail-at-end -pl src/data-loading-server -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
mvn clean test --fail-at-end -pl src/data-loading-service -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
-mvn clean test --fail-at-end -pl src/datasource-sdk -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
-mvn clean test --fail-at-end -pl src/datasource-service -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
+-- mvn clean test --fail-at-end -pl src/datasource-sdk -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
+-- mvn clean test --fail-at-end -pl src/datasource-service -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
mvn clean test --fail-at-end -pl src/distributed-lock-ext -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
mvn clean test --fail-at-end -pl src/jdbc -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
mvn clean test --fail-at-end -pl src/job-service -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
-mvn clean test --fail-at-end -pl src/kylin-it -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
+-- mvn clean test --fail-at-end -pl src/kylin-it -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
mvn clean test --fail-at-end -pl src/metadata-server -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
mvn clean test --fail-at-end -pl src/modeling-service -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
mvn clean test --fail-at-end -pl src/query -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
@@ -49,18 +49,18 @@ mvn clean test --fail-at-end -pl src/query-server -DfailIfNoTests=false -Duser.t
mvn clean test --fail-at-end -pl src/query-service -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
mvn clean test --fail-at-end -pl src/server -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
mvn clean test --fail-at-end -pl src/source-hive -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
-mvn clean test --fail-at-end -pl src/streaming -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
-mvn clean test --fail-at-end -pl src/streaming-sdk -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
-mvn clean test --fail-at-end -pl src/streaming-service -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
+-- mvn clean test --fail-at-end -pl src/streaming -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
+-- mvn clean test --fail-at-end -pl src/streaming-sdk -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
+-- mvn clean test --fail-at-end -pl src/streaming-service -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
mvn clean test --fail-at-end -pl src/tool -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
mvn clean test --fail-at-end -pl src/spark-project/ -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
mvn clean test --fail-at-end -pl src/spark-project/engine-build-sdk -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
mvn clean test --fail-at-end -pl src/spark-project/engine-spark -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
-mvn clean test --fail-at-end -pl src/spark-project/kylin-soft-affinity-cache -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
+-- mvn clean test --fail-at-end -pl src/spark-project/kylin-soft-affinity-cache -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
mvn clean test --fail-at-end -pl src/spark-project/source-jdbc -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
mvn clean test --fail-at-end -pl src/spark-project/sparder -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
mvn clean test --fail-at-end -pl src/spark-project/spark-common -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
-mvn clean test --fail-at-end -pl src/spark-project/spark-it -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
+-- mvn clean test --fail-at-end -pl src/spark-project/spark-it -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
echo "----------- Kylin Test Completed -----------"
[kylin] 03/09: [maven-release-plugin] prepare release kylin-5.0.0-alpha
Posted by xx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xxyu pushed a commit to branch kylin5
in repository https://gitbox.apache.org/repos/asf/kylin.git
commit 60571065139b76b57d5901a3084a3c7573bdd4ac
Author: XiaoxiangYu <xx...@apache.org>
AuthorDate: Wed Apr 12 02:27:13 2023 +0000
[maven-release-plugin] prepare release kylin-5.0.0-alpha
---
pom.xml | 8 +++-----
src/assembly/pom.xml | 9 +++------
src/common-booter/pom.xml | 6 ++----
src/common-server/pom.xml | 6 ++----
src/common-service/pom.xml | 6 ++----
src/core-common/pom.xml | 5 ++---
src/core-job/pom.xml | 6 ++----
src/core-metadata/pom.xml | 5 ++---
src/core-metrics/pom.xml | 6 ++----
src/core-storage/pom.xml | 6 ++----
src/data-loading-booter/pom.xml | 6 ++----
src/data-loading-server/pom.xml | 6 ++----
src/data-loading-service/pom.xml | 6 ++----
src/datasource-sdk/pom.xml | 6 ++----
src/datasource-service/pom.xml | 6 ++----
src/distributed-lock-ext/pom.xml | 6 ++----
src/jdbc/pom.xml | 8 +++-----
src/job-service/pom.xml | 6 ++----
src/kylin-it/pom.xml | 6 ++----
src/metadata-server/pom.xml | 6 ++----
src/modeling-service/pom.xml | 6 ++----
src/query-booter/pom.xml | 6 ++----
src/query-common/pom.xml | 6 ++----
src/query-server/pom.xml | 6 ++----
src/query-service/pom.xml | 6 ++----
src/query/pom.xml | 6 ++----
src/second-storage/clickhouse-it/pom.xml | 6 ++----
src/second-storage/clickhouse/pom.xml | 6 ++----
src/second-storage/core-ui/pom.xml | 6 ++----
src/second-storage/core/pom.xml | 6 ++----
src/server/pom.xml | 6 ++----
src/source-hive/pom.xml | 5 ++---
src/spark-project/engine-build-sdk/pom.xml | 6 ++----
src/spark-project/engine-spark/pom.xml | 6 ++----
src/spark-project/kylin-soft-affinity-cache/pom.xml | 2 +-
src/spark-project/source-jdbc/pom.xml | 6 ++----
src/spark-project/sparder/pom.xml | 6 ++----
src/spark-project/spark-common/pom.xml | 6 ++----
src/spark-project/spark-it/pom.xml | 6 ++----
src/streaming-sdk/pom.xml | 6 ++----
src/streaming-service/pom.xml | 6 ++----
src/streaming/pom.xml | 6 ++----
src/tool/pom.xml | 6 ++----
43 files changed, 88 insertions(+), 170 deletions(-)
diff --git a/pom.xml b/pom.xml
index adf6002c5a..ba0fb13112 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,9 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<!-- https://infra.apache.org/publishing-maven-artifacts.html -->
@@ -30,7 +28,7 @@
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
<packaging>pom</packaging>
- <version>5.0.0-alpha-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<name>Apache Kylin</name>
<url>http://kylin.apache.org</url>
@@ -47,7 +45,7 @@
<!-- developerConnection is using in maven-release-plugin https://maven.apache.org/guides/mini/guide-releasing.html-->
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/kylin.git</developerConnection>
<url>scm:git:https://gitbox.apache.org/repos/asf/kylin.git</url>
- <tag>HEAD</tag>
+ <tag>kylin-5.0.0-alpha</tag>
</scm>
<issueManagement>
diff --git a/src/assembly/pom.xml b/src/assembly/pom.xml
index eb2bc140a7..d66a732769 100644
--- a/src/assembly/pom.xml
+++ b/src/assembly/pom.xml
@@ -15,13 +15,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -261,8 +259,7 @@
</excludes>
</artifactSet>
<transformers>
- <transformer
- implementation="com.github.edwgiz.maven_shade_plugin.log4j2_cache_transformer.PluginsCacheFileTransformer"/>
+ <transformer implementation="com.github.edwgiz.maven_shade_plugin.log4j2_cache_transformer.PluginsCacheFileTransformer" />
</transformers>
<relocations>
<relocation>
diff --git a/src/common-booter/pom.xml b/src/common-booter/pom.xml
index a9741c8ffe..d03425fdbc 100644
--- a/src/common-booter/pom.xml
+++ b/src/common-booter/pom.xml
@@ -15,13 +15,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/common-server/pom.xml b/src/common-server/pom.xml
index 8a16402ba1..59677a8f09 100644
--- a/src/common-server/pom.xml
+++ b/src/common-server/pom.xml
@@ -15,13 +15,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/common-service/pom.xml b/src/common-service/pom.xml
index 081ad89602..d282cd897b 100644
--- a/src/common-service/pom.xml
+++ b/src/common-service/pom.xml
@@ -15,13 +15,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>5.0.0-alpha-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/core-common/pom.xml b/src/core-common/pom.xml
index 755932f523..ef80be28f7 100644
--- a/src/core-common/pom.xml
+++ b/src/core-common/pom.xml
@@ -14,8 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>kylin-core-common</artifactId>
<packaging>jar</packaging>
@@ -26,7 +25,7 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>5.0.0-alpha-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/src/core-job/pom.xml b/src/core-job/pom.xml
index d41f67cfd2..4a0d2f9a04 100644
--- a/src/core-job/pom.xml
+++ b/src/core-job/pom.xml
@@ -14,9 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>kylin-core-job</artifactId>
<packaging>jar</packaging>
@@ -27,7 +25,7 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>5.0.0-alpha-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/src/core-metadata/pom.xml b/src/core-metadata/pom.xml
index d3c0bf0c87..73500d323c 100644
--- a/src/core-metadata/pom.xml
+++ b/src/core-metadata/pom.xml
@@ -14,8 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>kylin-core-metadata</artifactId>
<packaging>jar</packaging>
@@ -27,7 +26,7 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>5.0.0-alpha-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/src/core-metrics/pom.xml b/src/core-metrics/pom.xml
index 8902aae48f..904d490574 100644
--- a/src/core-metrics/pom.xml
+++ b/src/core-metrics/pom.xml
@@ -15,13 +15,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<name>Kylin - Core Metrics</name>
diff --git a/src/core-storage/pom.xml b/src/core-storage/pom.xml
index 8846566e70..2c3a7836ed 100644
--- a/src/core-storage/pom.xml
+++ b/src/core-storage/pom.xml
@@ -15,9 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>kylin-core-storage</artifactId>
<packaging>jar</packaging>
@@ -28,7 +26,7 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>5.0.0-alpha-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/src/data-loading-booter/pom.xml b/src/data-loading-booter/pom.xml
index 90536213ae..4bf75836e5 100644
--- a/src/data-loading-booter/pom.xml
+++ b/src/data-loading-booter/pom.xml
@@ -15,13 +15,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/data-loading-server/pom.xml b/src/data-loading-server/pom.xml
index 50d47eadbc..08abccb76f 100644
--- a/src/data-loading-server/pom.xml
+++ b/src/data-loading-server/pom.xml
@@ -15,13 +15,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/data-loading-service/pom.xml b/src/data-loading-service/pom.xml
index 6ec32d89ba..74f356edad 100644
--- a/src/data-loading-service/pom.xml
+++ b/src/data-loading-service/pom.xml
@@ -15,13 +15,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/datasource-sdk/pom.xml b/src/datasource-sdk/pom.xml
index d09e65b44a..bbbb2c8f88 100644
--- a/src/datasource-sdk/pom.xml
+++ b/src/datasource-sdk/pom.xml
@@ -15,13 +15,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/datasource-service/pom.xml b/src/datasource-service/pom.xml
index f3e5969497..50d2219113 100644
--- a/src/datasource-service/pom.xml
+++ b/src/datasource-service/pom.xml
@@ -15,13 +15,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/distributed-lock-ext/pom.xml b/src/distributed-lock-ext/pom.xml
index c35edddd35..723b161960 100644
--- a/src/distributed-lock-ext/pom.xml
+++ b/src/distributed-lock-ext/pom.xml
@@ -15,13 +15,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/jdbc/pom.xml b/src/jdbc/pom.xml
index 979fa50454..05159b0b60 100644
--- a/src/jdbc/pom.xml
+++ b/src/jdbc/pom.xml
@@ -15,13 +15,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -215,7 +213,7 @@
<configuration>
<tasks>
<echo>Copy kylin-jdbc.properties</echo>
- <copy file="${basedir}/src/main/resources/kylin-jdbc.properties" tofile="${basedir}/target/kylin-jdbc.properties"/>
+ <copy file="${basedir}/src/main/resources/kylin-jdbc.properties" tofile="${basedir}/target/kylin-jdbc.properties" />
</tasks>
</configuration>
</execution>
diff --git a/src/job-service/pom.xml b/src/job-service/pom.xml
index 38c92b0b25..18efc843cd 100644
--- a/src/job-service/pom.xml
+++ b/src/job-service/pom.xml
@@ -15,13 +15,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/kylin-it/pom.xml b/src/kylin-it/pom.xml
index 091bdaaea6..f65782ddc6 100644
--- a/src/kylin-it/pom.xml
+++ b/src/kylin-it/pom.xml
@@ -15,13 +15,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/metadata-server/pom.xml b/src/metadata-server/pom.xml
index 1ff70f33cb..4b17c39ded 100644
--- a/src/metadata-server/pom.xml
+++ b/src/metadata-server/pom.xml
@@ -15,13 +15,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/modeling-service/pom.xml b/src/modeling-service/pom.xml
index c560e34aaa..9ba94b83d3 100644
--- a/src/modeling-service/pom.xml
+++ b/src/modeling-service/pom.xml
@@ -15,13 +15,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>5.0.0-alpha-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/query-booter/pom.xml b/src/query-booter/pom.xml
index e6b1fcd090..ec9976704d 100644
--- a/src/query-booter/pom.xml
+++ b/src/query-booter/pom.xml
@@ -15,13 +15,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/query-common/pom.xml b/src/query-common/pom.xml
index 1df2e19486..812b92e33c 100644
--- a/src/query-common/pom.xml
+++ b/src/query-common/pom.xml
@@ -15,9 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>kylin-query-common</artifactId>
<packaging>jar</packaging>
@@ -28,7 +26,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/src/query-server/pom.xml b/src/query-server/pom.xml
index 22adaf2ed6..6065205305 100644
--- a/src/query-server/pom.xml
+++ b/src/query-server/pom.xml
@@ -15,13 +15,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/query-service/pom.xml b/src/query-service/pom.xml
index 2d289bf34e..2acf89b8a6 100644
--- a/src/query-service/pom.xml
+++ b/src/query-service/pom.xml
@@ -15,13 +15,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/query/pom.xml b/src/query/pom.xml
index ca0c7cc2f2..3380cba019 100644
--- a/src/query/pom.xml
+++ b/src/query/pom.xml
@@ -14,9 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://maven.apache.org/POM/4.0.0"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>kylin-query</artifactId>
<packaging>jar</packaging>
@@ -27,7 +25,7 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>5.0.0-alpha-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/src/second-storage/clickhouse-it/pom.xml b/src/second-storage/clickhouse-it/pom.xml
index 901d309455..8d0fd5d652 100644
--- a/src/second-storage/clickhouse-it/pom.xml
+++ b/src/second-storage/clickhouse-it/pom.xml
@@ -15,13 +15,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/second-storage/clickhouse/pom.xml b/src/second-storage/clickhouse/pom.xml
index 31acfcb70f..ff3ae14f97 100644
--- a/src/second-storage/clickhouse/pom.xml
+++ b/src/second-storage/clickhouse/pom.xml
@@ -15,13 +15,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>5.0.0-alpha-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/second-storage/core-ui/pom.xml b/src/second-storage/core-ui/pom.xml
index 8df89d9173..0a20e5fda4 100644
--- a/src/second-storage/core-ui/pom.xml
+++ b/src/second-storage/core-ui/pom.xml
@@ -15,13 +15,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/second-storage/core/pom.xml b/src/second-storage/core/pom.xml
index f5102b72d9..e1b0e56794 100644
--- a/src/second-storage/core/pom.xml
+++ b/src/second-storage/core/pom.xml
@@ -15,14 +15,12 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/src/server/pom.xml b/src/server/pom.xml
index 01344da732..b1414ff8ae 100644
--- a/src/server/pom.xml
+++ b/src/server/pom.xml
@@ -15,9 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>kylin-server</artifactId>
@@ -29,7 +27,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/src/source-hive/pom.xml b/src/source-hive/pom.xml
index 41e9f9d1c3..0d457bf1b3 100644
--- a/src/source-hive/pom.xml
+++ b/src/source-hive/pom.xml
@@ -16,8 +16,7 @@
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>kylin-source-hive</artifactId>
@@ -28,7 +27,7 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>5.0.0-alpha-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/src/spark-project/engine-build-sdk/pom.xml b/src/spark-project/engine-build-sdk/pom.xml
index 8a7068675c..3c24c6d314 100644
--- a/src/spark-project/engine-build-sdk/pom.xml
+++ b/src/spark-project/engine-build-sdk/pom.xml
@@ -15,14 +15,12 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>5.0.0-alpha-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/spark-project/engine-spark/pom.xml b/src/spark-project/engine-spark/pom.xml
index 99f02a7cf8..12eb543bc8 100644
--- a/src/spark-project/engine-spark/pom.xml
+++ b/src/spark-project/engine-spark/pom.xml
@@ -15,9 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>kylin-engine-spark</artifactId>
<packaging>jar</packaging>
@@ -28,7 +26,7 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>5.0.0-alpha-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/src/spark-project/kylin-soft-affinity-cache/pom.xml b/src/spark-project/kylin-soft-affinity-cache/pom.xml
index a2a576a8de..f4e7552c95 100644
--- a/src/spark-project/kylin-soft-affinity-cache/pom.xml
+++ b/src/spark-project/kylin-soft-affinity-cache/pom.xml
@@ -31,7 +31,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/src/spark-project/source-jdbc/pom.xml b/src/spark-project/source-jdbc/pom.xml
index 53869ffb9a..523d5f1a63 100644
--- a/src/spark-project/source-jdbc/pom.xml
+++ b/src/spark-project/source-jdbc/pom.xml
@@ -15,13 +15,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/spark-project/sparder/pom.xml b/src/spark-project/sparder/pom.xml
index cc12d2feea..ec5c590a7a 100644
--- a/src/spark-project/sparder/pom.xml
+++ b/src/spark-project/sparder/pom.xml
@@ -14,9 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>kylin-sparder</artifactId>
<packaging>jar</packaging>
@@ -32,7 +30,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/src/spark-project/spark-common/pom.xml b/src/spark-project/spark-common/pom.xml
index b4d5b433ef..701dcaf11e 100644
--- a/src/spark-project/spark-common/pom.xml
+++ b/src/spark-project/spark-common/pom.xml
@@ -16,9 +16,7 @@
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>Kylin - Spark Common</name>
<url>http://kylin.apache.org</url>
@@ -29,7 +27,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/src/spark-project/spark-it/pom.xml b/src/spark-project/spark-it/pom.xml
index 71255f87a6..43f2837578 100644
--- a/src/spark-project/spark-it/pom.xml
+++ b/src/spark-project/spark-it/pom.xml
@@ -16,9 +16,7 @@
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>kylin-spark-it</artifactId>
@@ -29,7 +27,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/src/streaming-sdk/pom.xml b/src/streaming-sdk/pom.xml
index c82e8a1315..43d3f81c05 100644
--- a/src/streaming-sdk/pom.xml
+++ b/src/streaming-sdk/pom.xml
@@ -14,13 +14,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/streaming-service/pom.xml b/src/streaming-service/pom.xml
index fd0dab71a8..2870753b60 100644
--- a/src/streaming-service/pom.xml
+++ b/src/streaming-service/pom.xml
@@ -15,13 +15,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/streaming/pom.xml b/src/streaming/pom.xml
index 8b0dbd5b6e..effce60b2d 100644
--- a/src/streaming/pom.xml
+++ b/src/streaming/pom.xml
@@ -16,9 +16,7 @@
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
@@ -27,7 +25,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<properties>
diff --git a/src/tool/pom.xml b/src/tool/pom.xml
index 9af9d5d9ab..34bbd2808a 100644
--- a/src/tool/pom.xml
+++ b/src/tool/pom.xml
@@ -15,9 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>kylin-tool</artifactId>
@@ -29,7 +27,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../pom.xml</relativePath>
</parent>
[kylin] 04/09: [maven-release-plugin] prepare for next development iteration
Posted by xx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xxyu pushed a commit to branch kylin5
in repository https://gitbox.apache.org/repos/asf/kylin.git
commit b096e174d453d96089b3225a36899ea0f008ee49
Author: XiaoxiangYu <xx...@apache.org>
AuthorDate: Wed Apr 12 02:30:49 2023 +0000
[maven-release-plugin] prepare for next development iteration
---
pom.xml | 4 ++--
src/assembly/pom.xml | 2 +-
src/common-booter/pom.xml | 2 +-
src/common-server/pom.xml | 2 +-
src/common-service/pom.xml | 2 +-
src/core-common/pom.xml | 2 +-
src/core-job/pom.xml | 2 +-
src/core-metadata/pom.xml | 2 +-
src/core-metrics/pom.xml | 2 +-
src/core-storage/pom.xml | 2 +-
src/data-loading-booter/pom.xml | 2 +-
src/data-loading-server/pom.xml | 2 +-
src/data-loading-service/pom.xml | 2 +-
src/datasource-sdk/pom.xml | 2 +-
src/datasource-service/pom.xml | 2 +-
src/distributed-lock-ext/pom.xml | 2 +-
src/jdbc/pom.xml | 2 +-
src/job-service/pom.xml | 2 +-
src/kylin-it/pom.xml | 2 +-
src/metadata-server/pom.xml | 2 +-
src/modeling-service/pom.xml | 2 +-
src/query-booter/pom.xml | 2 +-
src/query-common/pom.xml | 2 +-
src/query-server/pom.xml | 2 +-
src/query-service/pom.xml | 2 +-
src/query/pom.xml | 2 +-
src/second-storage/clickhouse-it/pom.xml | 2 +-
src/second-storage/clickhouse/pom.xml | 2 +-
src/second-storage/core-ui/pom.xml | 2 +-
src/second-storage/core/pom.xml | 2 +-
src/server/pom.xml | 2 +-
src/source-hive/pom.xml | 2 +-
src/spark-project/engine-build-sdk/pom.xml | 2 +-
src/spark-project/engine-spark/pom.xml | 2 +-
src/spark-project/kylin-soft-affinity-cache/pom.xml | 2 +-
src/spark-project/source-jdbc/pom.xml | 2 +-
src/spark-project/sparder/pom.xml | 2 +-
src/spark-project/spark-common/pom.xml | 2 +-
src/spark-project/spark-it/pom.xml | 2 +-
src/streaming-sdk/pom.xml | 2 +-
src/streaming-service/pom.xml | 2 +-
src/streaming/pom.xml | 2 +-
src/tool/pom.xml | 2 +-
43 files changed, 44 insertions(+), 44 deletions(-)
diff --git a/pom.xml b/pom.xml
index ba0fb13112..3e8a58dba3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
<packaging>pom</packaging>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<name>Apache Kylin</name>
<url>http://kylin.apache.org</url>
@@ -45,7 +45,7 @@
<!-- developerConnection is using in maven-release-plugin https://maven.apache.org/guides/mini/guide-releasing.html-->
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/kylin.git</developerConnection>
<url>scm:git:https://gitbox.apache.org/repos/asf/kylin.git</url>
- <tag>kylin-5.0.0-alpha</tag>
+ <tag>HEAD</tag>
</scm>
<issueManagement>
diff --git a/src/assembly/pom.xml b/src/assembly/pom.xml
index d66a732769..1205fe9287 100644
--- a/src/assembly/pom.xml
+++ b/src/assembly/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/common-booter/pom.xml b/src/common-booter/pom.xml
index d03425fdbc..66490fc55f 100644
--- a/src/common-booter/pom.xml
+++ b/src/common-booter/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/common-server/pom.xml b/src/common-server/pom.xml
index 59677a8f09..d85c09ad2c 100644
--- a/src/common-server/pom.xml
+++ b/src/common-server/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/common-service/pom.xml b/src/common-service/pom.xml
index d282cd897b..e8f7040c16 100644
--- a/src/common-service/pom.xml
+++ b/src/common-service/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/core-common/pom.xml b/src/core-common/pom.xml
index ef80be28f7..f1069ff094 100644
--- a/src/core-common/pom.xml
+++ b/src/core-common/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/src/core-job/pom.xml b/src/core-job/pom.xml
index 4a0d2f9a04..411fba7683 100644
--- a/src/core-job/pom.xml
+++ b/src/core-job/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/src/core-metadata/pom.xml b/src/core-metadata/pom.xml
index 73500d323c..41aef82ee8 100644
--- a/src/core-metadata/pom.xml
+++ b/src/core-metadata/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/src/core-metrics/pom.xml b/src/core-metrics/pom.xml
index 904d490574..2094263787 100644
--- a/src/core-metrics/pom.xml
+++ b/src/core-metrics/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<name>Kylin - Core Metrics</name>
diff --git a/src/core-storage/pom.xml b/src/core-storage/pom.xml
index 2c3a7836ed..78be4d11da 100644
--- a/src/core-storage/pom.xml
+++ b/src/core-storage/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/src/data-loading-booter/pom.xml b/src/data-loading-booter/pom.xml
index 4bf75836e5..4d12f10c6a 100644
--- a/src/data-loading-booter/pom.xml
+++ b/src/data-loading-booter/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/data-loading-server/pom.xml b/src/data-loading-server/pom.xml
index 08abccb76f..d1b3a69c8c 100644
--- a/src/data-loading-server/pom.xml
+++ b/src/data-loading-server/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/data-loading-service/pom.xml b/src/data-loading-service/pom.xml
index 74f356edad..aab8c449be 100644
--- a/src/data-loading-service/pom.xml
+++ b/src/data-loading-service/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/datasource-sdk/pom.xml b/src/datasource-sdk/pom.xml
index bbbb2c8f88..5bb1a9038a 100644
--- a/src/datasource-sdk/pom.xml
+++ b/src/datasource-sdk/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/datasource-service/pom.xml b/src/datasource-service/pom.xml
index 50d2219113..ed13b19273 100644
--- a/src/datasource-service/pom.xml
+++ b/src/datasource-service/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/distributed-lock-ext/pom.xml b/src/distributed-lock-ext/pom.xml
index 723b161960..2cf08f1634 100644
--- a/src/distributed-lock-ext/pom.xml
+++ b/src/distributed-lock-ext/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/jdbc/pom.xml b/src/jdbc/pom.xml
index 05159b0b60..1d92744a46 100644
--- a/src/jdbc/pom.xml
+++ b/src/jdbc/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/job-service/pom.xml b/src/job-service/pom.xml
index 18efc843cd..3508f3259d 100644
--- a/src/job-service/pom.xml
+++ b/src/job-service/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/kylin-it/pom.xml b/src/kylin-it/pom.xml
index f65782ddc6..2ed10dc0ff 100644
--- a/src/kylin-it/pom.xml
+++ b/src/kylin-it/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/metadata-server/pom.xml b/src/metadata-server/pom.xml
index 4b17c39ded..38ff80c59b 100644
--- a/src/metadata-server/pom.xml
+++ b/src/metadata-server/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/modeling-service/pom.xml b/src/modeling-service/pom.xml
index 9ba94b83d3..c6c5a996f0 100644
--- a/src/modeling-service/pom.xml
+++ b/src/modeling-service/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/query-booter/pom.xml b/src/query-booter/pom.xml
index ec9976704d..2651a9aa28 100644
--- a/src/query-booter/pom.xml
+++ b/src/query-booter/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/query-common/pom.xml b/src/query-common/pom.xml
index 812b92e33c..18a5e8e2c0 100644
--- a/src/query-common/pom.xml
+++ b/src/query-common/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/src/query-server/pom.xml b/src/query-server/pom.xml
index 6065205305..c1045d9614 100644
--- a/src/query-server/pom.xml
+++ b/src/query-server/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/query-service/pom.xml b/src/query-service/pom.xml
index 2acf89b8a6..7f3301d207 100644
--- a/src/query-service/pom.xml
+++ b/src/query-service/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/query/pom.xml b/src/query/pom.xml
index 3380cba019..ed43542bf9 100644
--- a/src/query/pom.xml
+++ b/src/query/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/src/second-storage/clickhouse-it/pom.xml b/src/second-storage/clickhouse-it/pom.xml
index 8d0fd5d652..bf2a5cd262 100644
--- a/src/second-storage/clickhouse-it/pom.xml
+++ b/src/second-storage/clickhouse-it/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/second-storage/clickhouse/pom.xml b/src/second-storage/clickhouse/pom.xml
index ff3ae14f97..e173d69cde 100644
--- a/src/second-storage/clickhouse/pom.xml
+++ b/src/second-storage/clickhouse/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/second-storage/core-ui/pom.xml b/src/second-storage/core-ui/pom.xml
index 0a20e5fda4..33891070aa 100644
--- a/src/second-storage/core-ui/pom.xml
+++ b/src/second-storage/core-ui/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/second-storage/core/pom.xml b/src/second-storage/core/pom.xml
index e1b0e56794..657e2df052 100644
--- a/src/second-storage/core/pom.xml
+++ b/src/second-storage/core/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/src/server/pom.xml b/src/server/pom.xml
index b1414ff8ae..1b24a133b6 100644
--- a/src/server/pom.xml
+++ b/src/server/pom.xml
@@ -27,7 +27,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/src/source-hive/pom.xml b/src/source-hive/pom.xml
index 0d457bf1b3..4831c23b15 100644
--- a/src/source-hive/pom.xml
+++ b/src/source-hive/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/src/spark-project/engine-build-sdk/pom.xml b/src/spark-project/engine-build-sdk/pom.xml
index 3c24c6d314..3eba2238dc 100644
--- a/src/spark-project/engine-build-sdk/pom.xml
+++ b/src/spark-project/engine-build-sdk/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/spark-project/engine-spark/pom.xml b/src/spark-project/engine-spark/pom.xml
index 12eb543bc8..b22aefa720 100644
--- a/src/spark-project/engine-spark/pom.xml
+++ b/src/spark-project/engine-spark/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/src/spark-project/kylin-soft-affinity-cache/pom.xml b/src/spark-project/kylin-soft-affinity-cache/pom.xml
index f4e7552c95..b45cfd71ab 100644
--- a/src/spark-project/kylin-soft-affinity-cache/pom.xml
+++ b/src/spark-project/kylin-soft-affinity-cache/pom.xml
@@ -31,7 +31,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/src/spark-project/source-jdbc/pom.xml b/src/spark-project/source-jdbc/pom.xml
index 523d5f1a63..0130a9cda2 100644
--- a/src/spark-project/source-jdbc/pom.xml
+++ b/src/spark-project/source-jdbc/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/spark-project/sparder/pom.xml b/src/spark-project/sparder/pom.xml
index ec5c590a7a..ee5c7bad54 100644
--- a/src/spark-project/sparder/pom.xml
+++ b/src/spark-project/sparder/pom.xml
@@ -30,7 +30,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/src/spark-project/spark-common/pom.xml b/src/spark-project/spark-common/pom.xml
index 701dcaf11e..98cf5f29cd 100644
--- a/src/spark-project/spark-common/pom.xml
+++ b/src/spark-project/spark-common/pom.xml
@@ -27,7 +27,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/src/spark-project/spark-it/pom.xml b/src/spark-project/spark-it/pom.xml
index 43f2837578..4f9133858a 100644
--- a/src/spark-project/spark-it/pom.xml
+++ b/src/spark-project/spark-it/pom.xml
@@ -27,7 +27,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/src/streaming-sdk/pom.xml b/src/streaming-sdk/pom.xml
index 43d3f81c05..b542ea7637 100644
--- a/src/streaming-sdk/pom.xml
+++ b/src/streaming-sdk/pom.xml
@@ -18,7 +18,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/streaming-service/pom.xml b/src/streaming-service/pom.xml
index 2870753b60..766f0ae85f 100644
--- a/src/streaming-service/pom.xml
+++ b/src/streaming-service/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/streaming/pom.xml b/src/streaming/pom.xml
index effce60b2d..2008304b22 100644
--- a/src/streaming/pom.xml
+++ b/src/streaming/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<properties>
diff --git a/src/tool/pom.xml b/src/tool/pom.xml
index 34bbd2808a..719fefc22e 100644
--- a/src/tool/pom.xml
+++ b/src/tool/pom.xml
@@ -27,7 +27,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-alpha</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
[kylin] 08/09: [maven-release-plugin] prepare release kylin-5.0.0-alpha
Posted by xx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xxyu pushed a commit to branch kylin5
in repository https://gitbox.apache.org/repos/asf/kylin.git
commit 340cd4a6292335e501668aca9d9d6b4d98fbc82c
Author: XiaoxiangYu <xx...@apache.org>
AuthorDate: Fri Apr 21 02:47:56 2023 +0000
[maven-release-plugin] prepare release kylin-5.0.0-alpha
---
pom.xml | 4 ++--
src/assembly/pom.xml | 2 +-
src/common-booter/pom.xml | 2 +-
src/common-server/pom.xml | 2 +-
src/common-service/pom.xml | 2 +-
src/core-common/pom.xml | 2 +-
src/core-job/pom.xml | 2 +-
src/core-metadata/pom.xml | 2 +-
src/core-metrics/pom.xml | 2 +-
src/core-storage/pom.xml | 2 +-
src/data-loading-booter/pom.xml | 2 +-
src/data-loading-server/pom.xml | 2 +-
src/data-loading-service/pom.xml | 2 +-
src/datasource-sdk/pom.xml | 2 +-
src/datasource-service/pom.xml | 2 +-
src/distributed-lock-ext/pom.xml | 2 +-
src/jdbc/pom.xml | 2 +-
src/job-service/pom.xml | 2 +-
src/kylin-it/pom.xml | 2 +-
src/metadata-server/pom.xml | 2 +-
src/modeling-service/pom.xml | 2 +-
src/query-booter/pom.xml | 2 +-
src/query-common/pom.xml | 2 +-
src/query-server/pom.xml | 2 +-
src/query-service/pom.xml | 2 +-
src/query/pom.xml | 2 +-
src/second-storage/clickhouse-it/pom.xml | 2 +-
src/second-storage/clickhouse/pom.xml | 2 +-
src/second-storage/core-ui/pom.xml | 2 +-
src/second-storage/core/pom.xml | 2 +-
src/server/pom.xml | 2 +-
src/source-hive/pom.xml | 2 +-
src/spark-project/engine-build-sdk/pom.xml | 2 +-
src/spark-project/engine-spark/pom.xml | 2 +-
src/spark-project/kylin-soft-affinity-cache/pom.xml | 2 +-
src/spark-project/source-jdbc/pom.xml | 2 +-
src/spark-project/sparder/pom.xml | 2 +-
src/spark-project/spark-common/pom.xml | 2 +-
src/spark-project/spark-it/pom.xml | 2 +-
src/streaming-sdk/pom.xml | 2 +-
src/streaming-service/pom.xml | 2 +-
src/streaming/pom.xml | 2 +-
src/tool/pom.xml | 2 +-
43 files changed, 44 insertions(+), 44 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3e8a58dba3..ba0fb13112 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
<packaging>pom</packaging>
- <version>5.0.0-beta-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<name>Apache Kylin</name>
<url>http://kylin.apache.org</url>
@@ -45,7 +45,7 @@
<!-- developerConnection is using in maven-release-plugin https://maven.apache.org/guides/mini/guide-releasing.html-->
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/kylin.git</developerConnection>
<url>scm:git:https://gitbox.apache.org/repos/asf/kylin.git</url>
- <tag>HEAD</tag>
+ <tag>kylin-5.0.0-alpha</tag>
</scm>
<issueManagement>
diff --git a/src/assembly/pom.xml b/src/assembly/pom.xml
index 1205fe9287..d66a732769 100644
--- a/src/assembly/pom.xml
+++ b/src/assembly/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-beta-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/common-booter/pom.xml b/src/common-booter/pom.xml
index 66490fc55f..d03425fdbc 100644
--- a/src/common-booter/pom.xml
+++ b/src/common-booter/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-beta-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/common-server/pom.xml b/src/common-server/pom.xml
index d85c09ad2c..59677a8f09 100644
--- a/src/common-server/pom.xml
+++ b/src/common-server/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-beta-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/common-service/pom.xml b/src/common-service/pom.xml
index e8f7040c16..d282cd897b 100644
--- a/src/common-service/pom.xml
+++ b/src/common-service/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>5.0.0-beta-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/core-common/pom.xml b/src/core-common/pom.xml
index f1069ff094..ef80be28f7 100644
--- a/src/core-common/pom.xml
+++ b/src/core-common/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>5.0.0-beta-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/src/core-job/pom.xml b/src/core-job/pom.xml
index 411fba7683..4a0d2f9a04 100644
--- a/src/core-job/pom.xml
+++ b/src/core-job/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>5.0.0-beta-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/src/core-metadata/pom.xml b/src/core-metadata/pom.xml
index 41aef82ee8..73500d323c 100644
--- a/src/core-metadata/pom.xml
+++ b/src/core-metadata/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>5.0.0-beta-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/src/core-metrics/pom.xml b/src/core-metrics/pom.xml
index 2094263787..904d490574 100644
--- a/src/core-metrics/pom.xml
+++ b/src/core-metrics/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-beta-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<name>Kylin - Core Metrics</name>
diff --git a/src/core-storage/pom.xml b/src/core-storage/pom.xml
index 78be4d11da..2c3a7836ed 100644
--- a/src/core-storage/pom.xml
+++ b/src/core-storage/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>5.0.0-beta-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/src/data-loading-booter/pom.xml b/src/data-loading-booter/pom.xml
index 4d12f10c6a..4bf75836e5 100644
--- a/src/data-loading-booter/pom.xml
+++ b/src/data-loading-booter/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-beta-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/data-loading-server/pom.xml b/src/data-loading-server/pom.xml
index d1b3a69c8c..08abccb76f 100644
--- a/src/data-loading-server/pom.xml
+++ b/src/data-loading-server/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-beta-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/data-loading-service/pom.xml b/src/data-loading-service/pom.xml
index aab8c449be..74f356edad 100644
--- a/src/data-loading-service/pom.xml
+++ b/src/data-loading-service/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-beta-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/datasource-sdk/pom.xml b/src/datasource-sdk/pom.xml
index 5bb1a9038a..bbbb2c8f88 100644
--- a/src/datasource-sdk/pom.xml
+++ b/src/datasource-sdk/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-beta-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/datasource-service/pom.xml b/src/datasource-service/pom.xml
index ed13b19273..50d2219113 100644
--- a/src/datasource-service/pom.xml
+++ b/src/datasource-service/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-beta-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/distributed-lock-ext/pom.xml b/src/distributed-lock-ext/pom.xml
index 2cf08f1634..723b161960 100644
--- a/src/distributed-lock-ext/pom.xml
+++ b/src/distributed-lock-ext/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-beta-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/jdbc/pom.xml b/src/jdbc/pom.xml
index 1d92744a46..05159b0b60 100644
--- a/src/jdbc/pom.xml
+++ b/src/jdbc/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-beta-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/job-service/pom.xml b/src/job-service/pom.xml
index 3508f3259d..18efc843cd 100644
--- a/src/job-service/pom.xml
+++ b/src/job-service/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-beta-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/kylin-it/pom.xml b/src/kylin-it/pom.xml
index 2ed10dc0ff..f65782ddc6 100644
--- a/src/kylin-it/pom.xml
+++ b/src/kylin-it/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-beta-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/metadata-server/pom.xml b/src/metadata-server/pom.xml
index 38ff80c59b..4b17c39ded 100644
--- a/src/metadata-server/pom.xml
+++ b/src/metadata-server/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-beta-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/modeling-service/pom.xml b/src/modeling-service/pom.xml
index c6c5a996f0..9ba94b83d3 100644
--- a/src/modeling-service/pom.xml
+++ b/src/modeling-service/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>5.0.0-beta-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/query-booter/pom.xml b/src/query-booter/pom.xml
index 2651a9aa28..ec9976704d 100644
--- a/src/query-booter/pom.xml
+++ b/src/query-booter/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-beta-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/query-common/pom.xml b/src/query-common/pom.xml
index 18a5e8e2c0..812b92e33c 100644
--- a/src/query-common/pom.xml
+++ b/src/query-common/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-beta-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/src/query-server/pom.xml b/src/query-server/pom.xml
index c1045d9614..6065205305 100644
--- a/src/query-server/pom.xml
+++ b/src/query-server/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-beta-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/query-service/pom.xml b/src/query-service/pom.xml
index 7f3301d207..2acf89b8a6 100644
--- a/src/query-service/pom.xml
+++ b/src/query-service/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-beta-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/query/pom.xml b/src/query/pom.xml
index ed43542bf9..3380cba019 100644
--- a/src/query/pom.xml
+++ b/src/query/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>5.0.0-beta-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/src/second-storage/clickhouse-it/pom.xml b/src/second-storage/clickhouse-it/pom.xml
index bf2a5cd262..8d0fd5d652 100644
--- a/src/second-storage/clickhouse-it/pom.xml
+++ b/src/second-storage/clickhouse-it/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-beta-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/second-storage/clickhouse/pom.xml b/src/second-storage/clickhouse/pom.xml
index e173d69cde..ff3ae14f97 100644
--- a/src/second-storage/clickhouse/pom.xml
+++ b/src/second-storage/clickhouse/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>5.0.0-beta-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/second-storage/core-ui/pom.xml b/src/second-storage/core-ui/pom.xml
index 33891070aa..0a20e5fda4 100644
--- a/src/second-storage/core-ui/pom.xml
+++ b/src/second-storage/core-ui/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-beta-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/second-storage/core/pom.xml b/src/second-storage/core/pom.xml
index 657e2df052..e1b0e56794 100644
--- a/src/second-storage/core/pom.xml
+++ b/src/second-storage/core/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-beta-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/src/server/pom.xml b/src/server/pom.xml
index 1b24a133b6..b1414ff8ae 100644
--- a/src/server/pom.xml
+++ b/src/server/pom.xml
@@ -27,7 +27,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-beta-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/src/source-hive/pom.xml b/src/source-hive/pom.xml
index 4831c23b15..0d457bf1b3 100644
--- a/src/source-hive/pom.xml
+++ b/src/source-hive/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>5.0.0-beta-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/src/spark-project/engine-build-sdk/pom.xml b/src/spark-project/engine-build-sdk/pom.xml
index 3eba2238dc..3c24c6d314 100644
--- a/src/spark-project/engine-build-sdk/pom.xml
+++ b/src/spark-project/engine-build-sdk/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>5.0.0-beta-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/spark-project/engine-spark/pom.xml b/src/spark-project/engine-spark/pom.xml
index b22aefa720..12eb543bc8 100644
--- a/src/spark-project/engine-spark/pom.xml
+++ b/src/spark-project/engine-spark/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>5.0.0-beta-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/src/spark-project/kylin-soft-affinity-cache/pom.xml b/src/spark-project/kylin-soft-affinity-cache/pom.xml
index b45cfd71ab..f4e7552c95 100644
--- a/src/spark-project/kylin-soft-affinity-cache/pom.xml
+++ b/src/spark-project/kylin-soft-affinity-cache/pom.xml
@@ -31,7 +31,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-beta-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/src/spark-project/source-jdbc/pom.xml b/src/spark-project/source-jdbc/pom.xml
index 0130a9cda2..523d5f1a63 100644
--- a/src/spark-project/source-jdbc/pom.xml
+++ b/src/spark-project/source-jdbc/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-beta-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/spark-project/sparder/pom.xml b/src/spark-project/sparder/pom.xml
index ee5c7bad54..ec5c590a7a 100644
--- a/src/spark-project/sparder/pom.xml
+++ b/src/spark-project/sparder/pom.xml
@@ -30,7 +30,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-beta-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/src/spark-project/spark-common/pom.xml b/src/spark-project/spark-common/pom.xml
index 98cf5f29cd..701dcaf11e 100644
--- a/src/spark-project/spark-common/pom.xml
+++ b/src/spark-project/spark-common/pom.xml
@@ -27,7 +27,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-beta-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/src/spark-project/spark-it/pom.xml b/src/spark-project/spark-it/pom.xml
index 4f9133858a..43f2837578 100644
--- a/src/spark-project/spark-it/pom.xml
+++ b/src/spark-project/spark-it/pom.xml
@@ -27,7 +27,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-beta-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/src/streaming-sdk/pom.xml b/src/streaming-sdk/pom.xml
index b542ea7637..43d3f81c05 100644
--- a/src/streaming-sdk/pom.xml
+++ b/src/streaming-sdk/pom.xml
@@ -18,7 +18,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-beta-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/streaming-service/pom.xml b/src/streaming-service/pom.xml
index 766f0ae85f..2870753b60 100644
--- a/src/streaming-service/pom.xml
+++ b/src/streaming-service/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-beta-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/src/streaming/pom.xml b/src/streaming/pom.xml
index 2008304b22..effce60b2d 100644
--- a/src/streaming/pom.xml
+++ b/src/streaming/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-beta-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<properties>
diff --git a/src/tool/pom.xml b/src/tool/pom.xml
index 719fefc22e..34bbd2808a 100644
--- a/src/tool/pom.xml
+++ b/src/tool/pom.xml
@@ -27,7 +27,7 @@
<parent>
<artifactId>kylin</artifactId>
<groupId>org.apache.kylin</groupId>
- <version>5.0.0-beta-SNAPSHOT</version>
+ <version>5.0.0-alpha</version>
<relativePath>../../pom.xml</relativePath>
</parent>
[kylin] 07/09: Fix NPE for six UTs
Posted by xx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xxyu pushed a commit to branch kylin5
in repository https://gitbox.apache.org/repos/asf/kylin.git
commit 35d5bcd33e6d56fd522263f14bc649cddce144ef
Author: XiaoxiangYu <xx...@apache.org>
AuthorDate: Wed Apr 19 17:54:36 2023 +0800
Fix NPE for six UTs
---
.../src/main/java/org/apache/kylin/common/util/DateFormat.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/core-common/src/main/java/org/apache/kylin/common/util/DateFormat.java b/src/core-common/src/main/java/org/apache/kylin/common/util/DateFormat.java
index f3d31dd835..c70edf46d2 100644
--- a/src/core-common/src/main/java/org/apache/kylin/common/util/DateFormat.java
+++ b/src/core-common/src/main/java/org/apache/kylin/common/util/DateFormat.java
@@ -131,6 +131,9 @@ public class DateFormat {
}
public static FastDateFormat getDateFormat(String datePattern, TimeZone timeZone) {
+ if(timeZone == null){
+ timeZone = TimeZone.getDefault();
+ }
String key = datePattern + timeZone.getID();
FastDateFormat r = formatMap.get(key);
if (r == null) {
@@ -179,7 +182,7 @@ public class DateFormat {
}
public static String castTimestampToString(long millis) {
- return castTimestampToString(millis, null);
+ return castTimestampToString(millis, TimeZone.getDefault());
}
public static String formatToTimeStr(long millis, String pattern) {
[kylin] 01/09: Create first release of Kylin 5.X
Posted by xx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xxyu pushed a commit to branch kylin5
in repository https://gitbox.apache.org/repos/asf/kylin.git
commit 57544d30db18f0b44a1a399c3ee58877c6e447a1
Author: XiaoxiangYu <xx...@apache.org>
AuthorDate: Fri Mar 24 10:29:13 2023 +0800
Create first release of Kylin 5.X
---
NOTICE | 3 +
build/bin/upgrade.sh | 10 +-
build/release/compress.sh | 13 +-
build/release/package.sh | 21 +--
build/release/prepare.sh | 2 +-
build/release/release-pipeline-docker/README.md | 91 ++++++++++
.../release-pipeline-docker/release-in-docker.sh | 39 +++++
.../release-machine/Dockerfile | 67 ++++++++
.../release-machine/conf/setenv.sh | 38 +++++
.../release-machine/conf/settings.xml | 101 +++++++++++
.../release-machine/create-release-machine.sh | 27 +++
.../release-machine/script/entrypoint.sh | 23 +++
.../release-machine/script/release-publish.sh | 188 +++++++++++++++++++++
build/release/release.sh | 6 +-
...influxdb.sh => disabled-check-1900-influxdb.sh} | 0
...khouse.sh => disabled-check-3000-clickhouse.sh} | 0
build/sbin/download-spark-user.sh | 69 ++++++++
build/sbin/prepare-hadoop-conf-dir.sh | 2 +-
dev-support/unit_testing.sh | 79 ++++-----
.../src/components/setting/SettingModel/locales.js | 2 +-
kystudio/src/components/user/login.vue | 14 +-
pom.xml | 64 +++----
src/assembly/source-assembly.xml | 121 +++++++++++++
.../src/main/resources/config/config_library.csv | 10 +-
.../org/apache/kylin/rest/cache/RedisCache.java | 2 +-
.../apache/kylin/tool/garbage/StorageCleaner.java | 2 +-
.../java/org/apache/kylin/common/KapConfig.java | 23 ---
.../java/org/apache/kylin/common/KylinVersion.java | 2 +-
.../org/apache/kylin/common/msg/CnMessage.java | 109 +-----------
.../java/org/apache/kylin/common/msg/Message.java | 73 +++-----
.../resources/kylin_error_msg_conf_cn.properties | 2 +-
.../resources/kylin_error_msg_conf_en.properties | 2 +-
.../org/apache/kylin/common/KapConfigTest.java | 10 --
.../kylin/common/exception/code/ErrorCodeTest.java | 6 +-
.../job/impl/threadpool/NDefaultScheduler.java | 3 -
.../org/apache/kylin/job/lock/ZookeeperUtil.java | 1 -
.../apache/kylin/measure/topn/TopNCounterTest.java | 2 +-
.../metadata/cube/model/NDataflowManagerTest.java | 1 -
.../cube/planner/CostBasePlannerUtilsTest.java | 17 ++
.../src/main/resources/config/config_library.csv | 10 +-
.../org/apache/kylin/rest/service/JobService.java | 2 +-
src/examples/LICENSE | 10 --
src/jdbc/pom.xml | 15 --
.../java/org/apache/kylin/jdbc/KylinClient.java | 2 +-
.../initialize/JobSchedulerListenerTest.java | 2 +-
.../apache/kylin/query/engine/QueryExecTest.java | 2 -
.../springframework/conf/applicationContext.xml | 12 +-
.../nmodel_test_expected.json | 2 +-
.../src/main/resources/config/config_library.csv | 10 +-
.../apache/kylin/query/relnode/ContextUtil.java | 1 -
.../service/QueryCompositeMemcachedCacheTest.java | 2 +
.../kap/query/optrule/ExtensionOlapJoinRule.java | 1 -
.../kyligence/kap/query/optrule/KapJoinRule.java | 2 +-
.../kap/query/optrule/SumBasicOperatorRule.java | 1 -
.../apache/kylin/query/engine/SQLConverter.java | 1 -
.../kylin/query/relnode/ContextUtilTest.java | 1 -
.../kylin/query/util/ExpressionComparatorTest.java | 1 -
.../org/apache/kylin/query/util/QueryUtilTest.java | 4 +-
.../org/apache/kylin/rest/BootstrapServer.java | 2 +-
.../org/apache/kylin/rest/InitConfiguration.java | 2 +-
.../apache/kylin/rest/config/SwaggerConfig.java | 2 +-
.../src/main/resources/config/config_library.csv | 10 +-
src/systools/pom.xml | 0
src/systools/src/test/resources/ehcache.xml | 0
.../org/apache/kylin/tool/util/ServerInfoUtil.java | 4 +-
.../kylin/tool/AbstractInfoExtractorToolTest.java | 4 +-
.../kylin/tool/upgrade/UpdateUserAclToolTest.java | 8 +-
.../apache/kylin/tool/util/ServerInfoUtilTest.java | 4 +-
src/tool/src/test/resources/diag/eventlog | 2 +-
69 files changed, 975 insertions(+), 389 deletions(-)
diff --git a/NOTICE b/NOTICE
index 8598ae92aa..dcad36662a 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,2 +1,5 @@
+Apache Kylin
+Copyright 2014-2023 The Apache Software Foundation
+
This product includes software developed by The Apache Software Foundation
(http://www.apache.org/).
\ No newline at end of file
diff --git a/build/bin/upgrade.sh b/build/bin/upgrade.sh
index 36c6ae0017..7a98a17d5a 100644
--- a/build/bin/upgrade.sh
+++ b/build/bin/upgrade.sh
@@ -20,7 +20,7 @@
function help() {
echo "Usage: upgrade.sh <OLD_KYLIN_HOME> [--silent]"
echo
- echo "<OLD_KYLIN_HOME> Specify the old version of the Kyligence Enterprise"
+ echo "<OLD_KYLIN_HOME> Specify the old version of the Kylin 5.0"
echo " installation directory."
echo
echo "--silent Optional, don't enter interactive mode, automatically complete the upgrade."
@@ -52,7 +52,7 @@ function logging() {
function fail() {
error "...................................................[FAIL]"
- error "Upgrade Kyligence Enterprise failed."
+ error "Upgrade Kylin 5.0 failed."
recordKylinUpgradeResult "${START_TIME}" "false" "${NEW_KYLIN_HOME}"
exit 1
}
@@ -94,7 +94,7 @@ function upgrade() {
if [[ -f ${OLD_KYLIN_HOME}/pid ]]; then
PID=`cat ${OLD_KYLIN_HOME}/pid`
if ps -p $PID > /dev/null; then
- error "Please stop the Kyligence Enterprise during the upgrade process."
+ error "Please stop the Kylin 5.0 during the upgrade process."
exit 1
fi
fi
@@ -111,7 +111,7 @@ function upgrade() {
origin_version=$(awk '{print $NF}' ${OLD_KYLIN_HOME}/VERSION)
target_version=$(awk '{print $NF}' ${NEW_KYLIN_HOME}/VERSION)
echo
- logging "warn" "Upgrade Kyligence Enterprise from ${origin_version} to ${target_version}"
+ logging "warn" "Upgrade Kylin 5.0 from ${origin_version} to ${target_version}"
warn "Old KYLIN_HOME is ${OLD_KYLIN_HOME}, log is at ${upgrade_log}"
echo
@@ -307,7 +307,7 @@ if [[ -z $OLD_KYLIN_HOME ]] || [[ ! -d $OLD_KYLIN_HOME ]]; then
fi
if [[ $OLD_KYLIN_HOME == $NEW_KYLIN_HOME ]]; then
- error "Please specify the old version of the Kyligence Enterprise installation directory."
+ error "Please specify the old version of the Kylin 5.0 installation directory."
help
fi
diff --git a/build/release/compress.sh b/build/release/compress.sh
index bf9d584b92..71c5ad3978 100755
--- a/build/release/compress.sh
+++ b/build/release/compress.sh
@@ -30,10 +30,13 @@ rm -rf ${package_name}
mkdir ${package_name}
cp -rf VERSION commit_SHA1 lib ${package_name}/
+cp ../LICENSE ${package_name}/
+cp ../NOTICE ${package_name}/
mkdir -p ${package_name}/lib/ext
-cp -rf spark ${package_name}/
+# Spark binary won't be distributed into Kylin binary due to size limit
+# cp -rf spark ${package_name}/
cp -rf sample_project ${package_name}/
cp -rf samples ${package_name}/
@@ -76,13 +79,17 @@ cp -rf conf/setenv.sh ${package_name}/conf/setenv.sh.template
cp -rf bin/ ${package_name}/bin/
cp -rf sbin/ ${package_name}/sbin/
+spark_version_pom=`mvn -f ../pom.xml help:evaluate -Dexpression=spark.version | grep -E '^[0-9]+\.[0-9]+\.[0-9]+' `
+echo "Prepare download spark scripts for end user with version ${spark_version_pom}."
+sed -i "s/SPARK_VERSION_IN_BINARY/${spark_version_pom}/g" ../build/sbin/download-spark-user.sh
+
rm -rf ext lib commit_SHA1 VERSION # keep the spark folder on purpose
cp -rf server/webapp/dist ${package_name}/server/public
cp -rf server/newten.jar ${package_name}/server/
cp -rf server/jars ${package_name}/server/
cp -rf deploy/.keystore ${package_name}/server/
-mv ${package_name}/server/jars/log4j* ${package_name}/spark/jars/
+# mv ${package_name}/server/jars/log4j* ${package_name}/spark/jars/
rm -rf server/
## comment all default properties, and append them to the user visible kylin.properties
@@ -92,7 +99,7 @@ sed '1,21d' ../src/core-common/src/main/resources/kylin-defaults0.properties | a
find ${package_name} -type d -exec chmod 755 {} \;
find ${package_name} -type f -exec chmod 644 {} \;
find ${package_name} -type f -name "*.sh" -exec chmod 755 {} \;
-find ${package_name}/spark -type f -exec chmod 755 {} \;
+# find ${package_name}/spark -type f -exec chmod 755 {} \;
if [[ -d "${package_name}/postgresql" ]]; then
find ${package_name}/influxdb -type f -exec chmod 755 {} \;
diff --git a/build/release/package.sh b/build/release/package.sh
index 758ab0f490..a9e8d2f581 100755
--- a/build/release/package.sh
+++ b/build/release/package.sh
@@ -38,10 +38,11 @@ if [[ "${current_branch}" = "" ]]; then
current_branch=$(git branch | sed -n -e 's/^\* \(.*\)/\1/p')
fi
echo "${kylin_commit_sha1}@${current_branch}" > build/commit_SHA1
-if [ -z "$BUILD_SYSTEM" ]; then
- BUILD_SYSTEM="MANUAL"
+if [ -z "$ASF_USERNAME" ]; then
+ ASF_USERNAME="SOMEONE"
fi
-echo "Build with ${BUILD_SYSTEM} at" `date "+%Y-%m-%d %H:%M:%S"` >> build/commit_SHA1
+echo "Build by ${ASF_USERNAME} at" `date "+%Y-%m-%d %H:%M:%S"` >> build/commit_SHA1
+echo "OS : `uname -a`" >> build/commit_SHA1
KYLIN_VERSION_NAME="Apache Kylin ${release_version}"
@@ -49,24 +50,24 @@ echo "${KYLIN_VERSION_NAME}" > build/VERSION
echo "VERSION file content:" ${KYLIN_VERSION_NAME}
echo "BUILD STAGE 2 - Build binaries..."
-sh build/release/build.sh $@ || { exit 1; }
+bash build/release/build.sh $@ || { exit 1; }
if [[ "${WITH_SPARK}" = "1" ]]; then
echo "BUILD STAGE 3 - Prepare spark..."
- sh -x build/release/download-spark.sh || { exit 1; }
+ bash -x build/release/download-spark.sh || { exit 1; }
else
rm -rf build/spark
fi
if [[ "${WITH_THIRDPARTY}" = "1" ]]; then
echo "BUILD STAGE 4 - Prepare influxdb..."
- sh build/release/download-influxdb.sh || { exit 1; }
+ bash build/release/download-influxdb.sh || { exit 1; }
echo "BUILD STAGE 5 - Prepare grafana..."
- sh build/release/download-grafana.sh || { exit 1; }
+ bash build/release/download-grafana.sh || { exit 1; }
echo "BUILD STAGE 6 - Prepare postgresql..."
- sh build/release/download-postgresql.sh || { exit 1; }
+ bash build/release/download-postgresql.sh || { exit 1; }
else
echo "BUILD STAGE 4-6 is skipped ..."
rm -rf build/influxdb
@@ -75,8 +76,8 @@ else
fi
echo "BUILD STAGE 7 - Prepare and compress package..."
-sh build/release/prepare.sh || { exit 1; }
-sh build/release/compress.sh || { exit 1; }
+bash build/release/prepare.sh || { exit 1; }
+bash build/release/compress.sh || { exit 1; }
echo "BUILD STAGE 8 - Clean up..."
diff --git a/build/release/prepare.sh b/build/release/prepare.sh
index 77093bc98e..08129bcc5c 100755
--- a/build/release/prepare.sh
+++ b/build/release/prepare.sh
@@ -24,7 +24,7 @@ cd ${dir}/../..
source build/release/functions.sh
exportProjectVersions
-sh build/release/prepare-libs.sh || { exit 1; }
+bash build/release/prepare-libs.sh || { exit 1; }
#create ext dir
mkdir -p build/ext
diff --git a/build/release/release-pipeline-docker/README.md b/build/release/release-pipeline-docker/README.md
new file mode 100644
index 0000000000..c8913c41e5
--- /dev/null
+++ b/build/release/release-pipeline-docker/README.md
@@ -0,0 +1,91 @@
+## Background
+
+These scripts and docker image are used to provide an **easy and standard way** for release manager to complete [apache release process](https://www.apache.org/legal/release-policy.html) .
+
+Some source code are modified from [apache spark release](https://github.com/apache/spark/tree/master/dev/create-release) scripts.
+
+## How to release
+
+### What you need to prepare
+
+| Item | Used for | Reference |
+|--------------------------------------------------------------------------|----------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------|
+| Apache Account<br/>(Should belongs to PMC member) <br> (id and password) | 1. Write access to ASF's Gitbox service and SVN service <br> 2. Send email | https://id.apache.org |
+| GPG Key <br> (key files and GPG_PASSPHRASE) | Sign your released files(binary and compressed source files) | https://infra.apache.org/release-signing.html <br> https://infra.apache.org/release-distribution.html |
+| Laptop which installed Docker | The place you run release scripts | N/A |
+
+- Update `CURRENT_KYLIN_VERSION` in `KylinVersion.java` .
+
+### Step 1 : Configure Basic Info and Copy GPG Private Key
+
+- Start docker container
+
+```bash
+docker run --name release-machine --hostname release-machine -i -t apachekylin/release-machine:5-alpha bash
+# docker ps -f name=release-machine
+```
+
+- Copy GPG Private Key from your laptop into container
+
+```bash
+docker cp ~/XXX.private.key release-machine:/root
+```
+
+### Step 2 : Configure setenv.sh
+
+- Set correct values for all variables in `/root/scripts/setenv.sh`, such as **ASF_PASSWORD** and **GPG_PASSPHRASE**.
+
+#### Variables in setenv.sh
+
+| Name | Comment |
+|-----------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| ASF_USERNAME | ID of Apache Account |
+| ASF_PASSWORD | (**Never leak this**)Password of Apache Account |
+| GPG_PASSPHRASE | (**Never leak this**)PASSPHRASE of GPG Key |
+| GIT_BRANCH | Branch which you used to release, default is **kylin5** |
+| RELEASE_VERSION | Which version you want to release, default is **kylin5.0.0-alpha** |
+| NEXT_VERSION | Next version you want to use after released, default is **kylin5.0.0-beta** |
+| RELEASE_STEP | (default is **publish-rc**)<br/>Legal values are <br/> publish-rc : upload binary to release candidate folder <br> publish : publish release binary officially after vote passed |
+
+
+
+#### Set user and password in **servers** of `~/.m2/settings.xml`
+
+Otherwise, you will fail in maven-deploy-plugin with http 401 error.
+
+### Step 3 : Install GPG Private Key
+
+```bash
+gpg --import XXX.private.key
+```
+
+```bash
+gpg --list-sigs {NAME of Your Key}
+```
+
+### Step 4 : Publish Release Candidate
+
+```bash
+export RELEASE_STEP=publish-rc
+bash release-publish.sh
+```
+
+### Step 5 : Vote for Release Candidate
+
+- Prepare vote template for voting
+
+### Step 6 : Publish Release Candidate
+
+```bash
+export RELEASE_STEP=publish
+bash release-publish.sh
+```
+
+- Prepare vote template for announcement
+- Close maven repository
+
+### Step 7 : Remove Docker container
+
+```bash
+docker rm release-machine
+```
\ No newline at end of file
diff --git a/build/release/release-pipeline-docker/release-in-docker.sh b/build/release/release-pipeline-docker/release-in-docker.sh
new file mode 100644
index 0000000000..e16d3230d4
--- /dev/null
+++ b/build/release/release-pipeline-docker/release-in-docker.sh
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+#
+# /*
+# * 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.
+# */
+#
+
+ENVFILE="env.list"
+cat > $ENVFILE <<EOF
+DRY_RUN=$DRY_RUN
+GIT_BRANCH=$GIT_BRANCH
+NEXT_RELEASE_VERSION=$NEXT_RELEASE_VERSION
+RELEASE_VERSION=$RELEASE_VERSION
+RELEASE_TAG=$RELEASE_TAG
+GIT_REF=$GIT_REF
+GIT_REPO_URL=$GIT_REPO_URL
+GIT_NAME=$GIT_NAME
+GIT_EMAIL=$GIT_EMAIL
+GPG_KEY=$GPG_KEY
+ASF_USERNAME=$ASF_USERNAME
+ASF_PASSWORD=$ASF_PASSWORD
+GPG_PASSPHRASE=$GPG_PASSPHRASE
+USER=$USER
+EOF
\ No newline at end of file
diff --git a/build/release/release-pipeline-docker/release-machine/Dockerfile b/build/release/release-pipeline-docker/release-machine/Dockerfile
new file mode 100644
index 0000000000..355925443d
--- /dev/null
+++ b/build/release/release-pipeline-docker/release-machine/Dockerfile
@@ -0,0 +1,67 @@
+#
+# 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.
+#
+
+# Docker image for Kylin 5.X release
+FROM openjdk:8-slim
+
+ENV M2_HOME /root/apache-maven-3.8.8
+ENV PATH $PATH:$M2_HOME/bin
+USER root
+
+WORKDIR /root
+
+# install tools
+RUN set -eux; \
+ apt-get update; \
+ apt-get install -y --no-install-recommends lsof wget tar
+
+RUN set -eux; \
+ apt-get update; \
+ apt-get install -y --no-install-recommends git unzip subversion
+
+RUN set -eux; \
+ apt-get update; \
+ apt-get install -y --no-install-recommends curl vim ssh
+
+RUN set -eux; \
+ apt-get update; \
+ apt-get install -y --no-install-recommends gcc g++ make bzip2
+
+# install Node JS
+RUN curl -sL https://deb.nodesource.com/setup_12.x | bash - \
+ && apt-get update \
+ && apt-get install -y --no-install-recommends nodejs
+
+## =====================================
+
+# install maven
+RUN wget https://archive.apache.org/dist/maven/maven-3/3.8.8/binaries/apache-maven-3.8.8-bin.tar.gz \
+ && tar -zxvf apache-maven-3.8.8-bin.tar.gz \
+ && rm -f apache-maven-3.8.8-bin.tar.gz
+
+RUN mkdir /root/.m2
+COPY conf/settings.xml /root/.m2/settings.xml
+
+COPY script/entrypoint.sh /root/scripts/entrypoint.sh
+RUN chmod u+x /root/scripts/entrypoint.sh
+
+COPY script/release-publish.sh /root/release-publish.sh
+RUN chmod u+x /root/release-publish.sh
+
+COPY conf/setenv.sh /root/scripts/setenv.sh
+
+#ENTRYPOINT ["/root/scripts/entrypoint.sh"]
\ No newline at end of file
diff --git a/build/release/release-pipeline-docker/release-machine/conf/setenv.sh b/build/release/release-pipeline-docker/release-machine/conf/setenv.sh
new file mode 100644
index 0000000000..a032e32b47
--- /dev/null
+++ b/build/release/release-pipeline-docker/release-machine/conf/setenv.sh
@@ -0,0 +1,38 @@
+#
+# /*
+# * 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.
+# */
+#
+
+## Basic Info
+export DRY_RUN=0 # use in maven-release-plugin
+export RELEASE_VERSION=5.0.0-alpha
+export NEXT_VERSION=5.0.0-beta
+export GIT_BRANCH=kylin5
+export GIT_USERNAME=XiaoxiangYu
+export RC_NAME=rc1
+# publish-rc / publish
+export RELEASE_STEP=publish-rc
+
+## Confidential Info
+export ASF_USERNAME=
+export ASF_PASSWORD=
+export GPG_PASSPHRASE=
+
+# https://stackoverflow.com/questions/57591432/gpg-signing-failed-inappropriate-ioctl-for-device-on-macos-with-maven
+GPG_TTY=$(tty)
+export GPG_TTY
\ No newline at end of file
diff --git a/build/release/release-pipeline-docker/release-machine/conf/settings.xml b/build/release/release-pipeline-docker/release-machine/conf/settings.xml
new file mode 100644
index 0000000000..9241afee93
--- /dev/null
+++ b/build/release/release-pipeline-docker/release-machine/conf/settings.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ /*
+ ~ * 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.
+ ~ */
+ -->
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
+
+ <mirrors>
+ <mirror>
+ <id>nexus-aliyun</id>
+ <mirrorOf>central</mirrorOf>
+ <name>Nexus Aliyun</name>
+ <url>http://maven.aliyun.com/nexus/content/groups/public/</url>
+ </mirror>
+ </mirrors>
+
+ <servers>
+ <!-- To publish a snapshot of some part of Maven -->
+ <server>
+ <id>apache.snapshots.https</id>
+ <username>APACHE_ID</username>
+ <password>APACHE_PASSWORD</password>
+ </server>
+ <!-- To stage a release of some part of Maven -->
+ <server>
+ <id>apache.releases.https</id>
+ <username>APACHE_ID</username>
+ <password>APACHE_PASSWORD</password>
+ </server>
+
+ <!-- To publish a website of some part of Maven -->
+ <server>
+ <id>apache.website</id>
+ <username>APACHE_ID</username>
+ <password>APACHE_PASSWORD</password>
+ <filePermissions>664</filePermissions>
+ <directoryPermissions>775</directoryPermissions>
+ </server>
+
+ <!-- To stage a website of some part of Maven -->
+ <server>
+ <id>stagingSite</id>
+ <!-- must match hard-coded repository identifier in site:stage-deploy -->
+ <username>APACHE_ID</username>
+ <filePermissions>664</filePermissions>
+ <directoryPermissions>775</directoryPermissions>
+ </server>
+ <server>
+ <id>gpg.passphrase</id>
+ <passphrase>SOME_PASSPHRASE</passphrase>
+ </server>
+ </servers>
+
+ <profiles>
+ <profile>
+ <repositories>
+ <repository>
+ <id>nexus</id>
+ <name>local private nexus</name>
+ <url>http://maven.aliyun.com/nexus/content/groups/public/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>nexus</id>
+ <name>local private nexus</name>
+ <url>http://maven.aliyun.com/nexus/content/groups/public/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+ </profile>
+ </profiles>
+</settings>
\ No newline at end of file
diff --git a/build/release/release-pipeline-docker/release-machine/create-release-machine.sh b/build/release/release-pipeline-docker/release-machine/create-release-machine.sh
new file mode 100644
index 0000000000..1305e0eb13
--- /dev/null
+++ b/build/release/release-pipeline-docker/release-machine/create-release-machine.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+#
+# /*
+# * 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.
+# */
+#
+
+docker build -f Dockerfile -t release-machine:5-alpha .
+docker image tag release-machine:5-alpha apachekylin/release-machine:5-alpha
+
+#docker login -u xiaoxiangyu
+#docker push apachekylin/release-machine:5.0
\ No newline at end of file
diff --git a/build/release/release-pipeline-docker/release-machine/script/entrypoint.sh b/build/release/release-pipeline-docker/release-machine/script/entrypoint.sh
new file mode 100644
index 0000000000..28c867fb18
--- /dev/null
+++ b/build/release/release-pipeline-docker/release-machine/script/entrypoint.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+#
+# /*
+# * 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.
+# */
+#
+
+# Run release-publish.sh instead.
\ No newline at end of file
diff --git a/build/release/release-pipeline-docker/release-machine/script/release-publish.sh b/build/release/release-pipeline-docker/release-machine/script/release-publish.sh
new file mode 100644
index 0000000000..d868e7e772
--- /dev/null
+++ b/build/release/release-pipeline-docker/release-machine/script/release-publish.sh
@@ -0,0 +1,188 @@
+#!/bin/bash
+
+#
+# /*
+# * 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.
+# */
+#
+
+export LC_ALL=C.UTF-8
+export LANG=C.UTF-8
+set -e
+
+function run_command {
+ local BANNER="$1"
+ shift 1
+
+ echo "========================"
+ echo "==> $BANNER"
+ echo "Command: $@"
+
+ "$@" 2>&1
+
+ local EC=$?
+ if [ $EC != 0 ]; then
+ echo "Command FAILED : $@, please check!!!"
+ exit $EC
+ fi
+}
+
+####################################################
+####################################################
+#### Release Configuration
+
+source /root/scripts/setenv.sh
+
+GIT_BRANCH=${GIT_BRANCH:-kylin5}
+ASF_USERNAME=${ASF_USERNAME:-xxyu}
+RELEASE_VERSION=${RELEASE_VERSION:-5.0.0-alpha}
+NEXT_RELEASE_VERSION=${NEXT_RELEASE_VERSION:-5.0.0-beta}
+
+export working_dir=/root/kylin-release-folder
+export source_code_folder=$working_dir/kylin
+export packaging_folder=$source_code_folder/target/checkout
+export svn_folder=$working_dir/svn
+export rc_name=apache-kylin-"${RELEASE_VERSION}"-${RC_NAME}
+export release_candidate_folder=$svn_folder/$rc_name
+
+export ASF_KYLIN_REPO="gitbox.apache.org/repos/asf/kylin.git"
+# GITHUB_REPO_URL=${GIT_REPO_URL:-https://github.com/apache/kylin.git}
+export RELEASE_STAGING_LOCATION="https://dist.apache.org/repos/dist/dev/kylin"
+export RELEASE_LOCATION="https://dist.apache.org/repos/dist/release/kylin"
+
+####################################################
+####################################################
+#### ASF Confidential
+
+echo "==> Check ASF confidential"
+
+if [[ -z "$ASF_PASSWORD" ]]; then
+ echo 'The environment variable ASF_PASSWORD is not set. Enter the password.'
+ echo
+ stty -echo && printf "ASF password: " && read ASF_PASSWORD && printf '\n' && stty echo
+fi
+
+if [[ -z "$GPG_PASSPHRASE" ]]; then
+ echo 'The environment variable GPG_PASSPHRASE is not set. Enter the passphrase to'
+ echo 'unlock the GPG signing key that will be used to sign the release!'
+ echo
+ stty -echo && printf "GPG passphrase: " && read GPG_PASSPHRASE && printf '\n' && stty echo
+fi
+
+echo "==> Init Git Configuration"
+mkdir -p $working_dir
+git config --global user.name "${GIT_USERNAME}"
+git config --global user.email "${ASF_USERNAME}"@apache.org
+git config --global user.password ${ASF_PASSWORD}
+
+####################################################
+####################################################
+#### Prepare source code
+
+if [[ "$RELEASE_STEP" == "publish-rc" ]]; then
+ echo "==> Clone kylin source for $RELEASE_VERSION"
+
+ cd $working_dir
+
+ if [ ! -d "${source_code_folder}" ]
+ then
+ echo "Clone source code to ${source_code_folder} ."
+ run_command "Clone Gitbox" git clone "https://$ASF_USERNAME:$ASF_PASSWORD@$ASF_KYLIN_REPO" -b "$GIT_BRANCH"
+ fi
+
+ if [ ! -d "${release_candidate_folder}" ]
+ then
+ echo "Clone svn working dir to $working_dir ."
+ run_command "Clone ASF SVN" svn co $RELEASE_STAGING_LOCATION $svn_folder
+ fi
+fi
+
+####################################################
+####################################################
+#### Publish maven artifact and source package
+
+if [[ "$RELEASE_STEP" == "publish-rc" ]]; then
+ echo "==> publish-release-candidate source code"
+ # Go to source directory
+ cd ${source_code_folder}
+
+ tag_exist=`git tag --list | grep kylin-"${RELEASE_VERSION}" | wc -l`
+ if [[ $tag_exist != 0 ]]; then
+ echo "Delete local tag"
+ git tag --delete kylin-"${RELEASE_VERSION}"
+ fi
+
+ ## Prepare tag & source tarball & upload maven artifact
+ # Use release-plugin to check license & build source package & build and upload maven artifact
+ # https://maven.apache.org/maven-release/maven-release-plugin/examples/prepare-release.html
+ # https://infra.apache.org/publishing-maven-artifacts.html
+ # Use `mvn release:clean` if you want to prepare again
+ run_command "Maven Release Prepare" mvn -DskipTests -DreleaseVersion="${RELEASE_VERSION}" \
+ -DdevelopmentVersion="${NEXT_RELEASE_VERSION}"-SNAPSHOT -Papache-release,nexus -DdryRun=${DRY_RUN} \
+ -Darguments="-Dmaven.javadoc.skip=true -Dgpg.passphrase=${GPG_PASSPHRASE} -DskipTests" \
+ release:prepare
+ run_command "Maven Release Perform" mvn -DskipTests -Papache-release,nexus \
+ -Darguments="-Dmaven.javadoc.skip=true -Dgpg.passphrase=${GPG_PASSPHRASE} -DskipTests" \
+ release:perform
+
+ # Create a directory for this release candidate
+ mkdir -p ${release_candidate_folder}
+ # rm -rf target/apache-kylin-*ource-release.zip.asc.sha256
+
+ # Move source code and signture of source code to release candidate directory
+ cp target/apache-kylin-*source-release.zip* "${release_candidate_folder}"
+fi
+
+####################################################
+####################################################
+#### Build Binary
+
+if [[ "$RELEASE_STEP" == "publish-rc" ]]; then
+ echo "==> Building kylin binary for $RELEASE_VERSION"
+ cd ${packaging_folder}
+
+ export release_version=$RELEASE_VERSION
+ run_command "Build binary" bash build/release/release.sh -official -noSpark
+
+ cp dist/apache-kylin-*.tar.gz "${release_candidate_folder}"
+fi
+
+####################################################
+####################################################
+#### Publish binary to release candidate folder
+
+if [[ "$RELEASE_STEP" == "publish-rc" ]]; then
+ ## Sign binary
+ echo "==> publish-release-candidate binary"
+ cd "${release_candidate_folder}"
+ run_command "Sign binary" gpg --armor --output apache-kylin-"${RELEASE_VERSION}"-bin.tar.gz.asc --detach-sig apache-kylin-${RELEASE_VERSION}-bin.tar.gz
+ shasum -a 256 apache-kylin-"${RELEASE_VERSION}"-bin.tar.gz > apache-kylin-${RELEASE_VERSION}-bin.tar.gz.sha256
+
+ ## Upload to svn repository
+ cd ${svn_folder}
+ svn add ${rc_name}
+ run_command "Publish release candidate dir" svn commit -m 'Check in release artifacts for '${rc_name}
+fi
+
+####################################################
+####################################################
+#### Publish binary to release folder after vote passed
+
+if [[ "$RELEASE_STEP" == "publish-release" ]]; then
+ echo "==> publish-release"
+ # todo
+fi
\ No newline at end of file
diff --git a/build/release/release.sh b/build/release/release.sh
index 9ddd41d35c..b2277becb6 100755
--- a/build/release/release.sh
+++ b/build/release/release.sh
@@ -76,13 +76,13 @@ if [[ "${PACKAGE_OFFICIAL}" = "0" ]]; then
timestamp=`date '+%Y%m%d%H%M%S'`
export release_version=${release_version}.${timestamp}
fi
-export package_name="apache-kylin-${release_version}"
+export package_name="apache-kylin-${release_version}-bin"
-sh build/release/package.sh $@ || { echo "package failed!"; exit 1; }
+bash build/release/package.sh $@ || { echo "package failed!"; exit 1; }
echo "Release Version: ${release_version}"
-package_name="apache-kylin-${release_version}.tar.gz"
+package_name="apache-kylin-${release_version}-bin.tar.gz"
sha256sum dist/$package_name > dist/${package_name}.sha256sum
echo "sha256: `cat dist/${package_name}.sha256sum`"
diff --git a/build/sbin/check-1900-influxdb.sh b/build/sbin/disabled-check-1900-influxdb.sh
similarity index 100%
rename from build/sbin/check-1900-influxdb.sh
rename to build/sbin/disabled-check-1900-influxdb.sh
diff --git a/build/sbin/check-3000-clickhouse.sh b/build/sbin/disabled-check-3000-clickhouse.sh
similarity index 100%
rename from build/sbin/check-3000-clickhouse.sh
rename to build/sbin/disabled-check-3000-clickhouse.sh
diff --git a/build/sbin/download-spark-user.sh b/build/sbin/download-spark-user.sh
new file mode 100755
index 0000000000..7cf1eb1631
--- /dev/null
+++ b/build/sbin/download-spark-user.sh
@@ -0,0 +1,69 @@
+#!/bin/bash
+
+#
+# /*
+# * 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.
+# */
+#
+
+## Because Apache Infra has limit size of a single file for download site,
+## current the limit is 650MB. The release manager have to remove spark binary,
+## so Kylin end user should execute this script to download and unzip Spark binary.
+## After remove spark binary, Kylin binary is 476MB in 2023/03/09.
+## Check details at https://issues.apache.org/jira/browse/INFRA-24053
+
+source $(cd -P -- "$(dirname -- "$0")" && pwd -P)/header.sh
+
+if [[ -d ${KYLIN_HOME}/spark ]]; then
+ echo "Spark already exists, please check."
+ exit 1
+fi
+
+spark_version_in_binary=3.2.0-4.6.3.0
+spark_pkg_name=spark-newten-"`echo ${spark_version_in_binary}| sed "s/-kylin//g"`"
+spark_pkg_file_name="${spark_pkg_name}.tgz"
+
+echo "spark_pkg_file_name : "${spark_pkg_file_name}
+wget --directory-prefix=${KYLIN_HOME} https://s3.cn-north-1.amazonaws.com.cn/download-resource/kyspark/${spark_pkg_file_name} || echo "Download spark failed"
+
+mkdir -p ${KYLIN_HOME}/${spark_pkg_name}
+tar -zxf ${spark_pkg_file_name} -C ${spark_pkg_name} --strip-components 1 || { exit 1; }
+mv ${spark_pkg_name} spark
+
+# Remove unused components in Spark
+rm -rf ${KYLIN_HOME}/spark/lib/spark-examples-*
+rm -rf ${KYLIN_HOME}/spark/examples
+rm -rf ${KYLIN_HOME}/spark/data
+rm -rf ${KYLIN_HOME}/spark/R
+rm -rf ${KYLIN_HOME}/spark/hive_1_2_2
+
+# Temp fix of "Cannot find catalog plugin class for catalog 'spark_catalog': org.apache.spark.sql.delta.catalog.DeltaCatalog"
+cp ${KYLIN_HOME}/server/jars/delta-core_2.12-1.2.1.jar ${KYLIN_HOME}/spark/jars/
+
+if [ ! -f ${KYLIN_HOME}/"hive_1_2_2.tar.gz" ]
+then
+ echo "no binary file found"
+ wget --directory-prefix=${KYLIN_HOME} https://s3.cn-north-1.amazonaws.com.cn/download-resource/kyspark/hive_1_2_2.tar.gz || echo "Download hive1 failed"
+else
+ if [ `calMd5 ${KYLIN_HOME}/hive_1_2_2.tar.gz | awk '{print $1}'` != "e8e86e086fb7e821d724ad0c19457a36" ]
+ then
+ echo "md5 check failed"
+ rm ${KYLIN_HOME}/hive_1_2_2.tar.gz
+ wget --directory-prefix=${KYLIN_HOME} https://s3.cn-north-1.amazonaws.com.cn/download-resource/kyspark/hive_1_2_2.tar.gz || echo "Download hive1 failed"
+ fi
+fi
+tar -zxf hive_1_2_2.tar.gz -C ${KYLIN_HOME}/spark/ || { exit 1; }
diff --git a/build/sbin/prepare-hadoop-conf-dir.sh b/build/sbin/prepare-hadoop-conf-dir.sh
index fa35b5a587..d6f3418ab9 100755
--- a/build/sbin/prepare-hadoop-conf-dir.sh
+++ b/build/sbin/prepare-hadoop-conf-dir.sh
@@ -155,7 +155,7 @@ function fetchKylinHadoopConf() {
then
echo "Hadoop conf directory currently generated based on manual mode."
else
- echo "Missing hadoop conf files. Please contact Kyligence technical support for more details."
+ echo "Missing hadoop conf files. Please contact Community support for more details."
exit 1
fi
fi
diff --git a/dev-support/unit_testing.sh b/dev-support/unit_testing.sh
index 2f18be307b..7598e5ad68 100644
--- a/dev-support/unit_testing.sh
+++ b/dev-support/unit_testing.sh
@@ -17,49 +17,50 @@
# limitations under the License.
#
-ci_output=ut-results-`date +"%Y-%m-%d"`.txt
+ci_output=ci-results-`date +"%Y-%m-%d"`.txt
mvn -U clean install -T 2C -Dmaven.compile.fork=true -DskipTests
echo "----------- Kylin Install Success -----------"
-mvn clean test -X --fail-at-end -pl src/assembly -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
-mvn clean test -X --fail-at-end -pl src/common-booter -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
-mvn clean test -X --fail-at-end -pl src/common-server -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
-mvn clean test -X --fail-at-end -pl src/common-service -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
-mvn clean test -X --fail-at-end -pl src/core-common -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
-mvn clean test -X --fail-at-end -pl src/core-job -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
-mvn clean test -X --fail-at-end -pl src/core-metadata -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
-mvn clean test -X --fail-at-end -pl src/core-storage -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
-mvn clean test -X --fail-at-end -pl src/data-loading-booter -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
-mvn clean test -X --fail-at-end -pl src/data-loading-server -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
-mvn clean test -X --fail-at-end -pl src/data-loading-service -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
-mvn clean test -X --fail-at-end -pl src/datasource-sdk -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
-mvn clean test -X --fail-at-end -pl src/datasource-service -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
-mvn clean test -X --fail-at-end -pl src/external -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
-mvn clean test -X --fail-at-end -pl src/external-catalog -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
-mvn clean test -X --fail-at-end -pl src/integration-service -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
-mvn clean test -X --fail-at-end -pl src/job-service -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
-mvn clean test -X --fail-at-end -pl src/metadata-server -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
-mvn clean test -X --fail-at-end -pl src/modeling-service -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
-mvn clean test -X --fail-at-end -pl src/query -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
-mvn clean test -X --fail-at-end -pl src/query-booter -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
-mvn clean test -X --fail-at-end -pl src/query-common -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
-mvn clean test -X --fail-at-end -pl src/query-server -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
-mvn clean test -X --fail-at-end -pl src/query-service -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
-# TODO Ignore second-storage at the moment
-# mvn clean test -X --fail-at-end -pl src/second-storage -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
-mvn clean test -X --fail-at-end -pl src/server -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
-mvn clean test -X --fail-at-end -pl src/server-base -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
-mvn clean test -X --fail-at-end -pl src/source-hive -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
-mvn clean test -X --fail-at-end -pl src/spark-project/engine-build-sdk -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
-mvn clean test -X --fail-at-end -pl src/spark-project/engine-spark -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
-mvn clean test -X --fail-at-end -pl src/spark-project/source-jdbc -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
-mvn clean test -X --fail-at-end -pl src/spark-project/sparder -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
-mvn clean test -X --fail-at-end -pl src/spark-project/spark-common -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
-mvn clean test -X --fail-at-end -pl src/streaming -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
-mvn clean test -X --fail-at-end -pl src/streaming-service -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
-mvn clean test -X --fail-at-end -pl src/systools -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
-mvn clean test -X --fail-at-end -pl src/tool -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
+mvn clean test --fail-at-end -pl src/assembly -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
+mvn clean test --fail-at-end -pl src/common-booter -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
+mvn clean test --fail-at-end -pl src/common-server -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
+mvn clean test --fail-at-end -pl src/common-service -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
+mvn clean test --fail-at-end -pl src/core-common -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
+mvn clean test --fail-at-end -pl src/core-job -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
+mvn clean test --fail-at-end -pl src/core-metadata -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
+mvn clean test --fail-at-end -pl src/core-metrics -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
+mvn clean test --fail-at-end -pl src/core-storage -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
+mvn clean test --fail-at-end -pl src/data-loading-booter -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
+mvn clean test --fail-at-end -pl src/data-loading-server -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
+mvn clean test --fail-at-end -pl src/data-loading-service -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
+mvn clean test --fail-at-end -pl src/datasource-sdk -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
+mvn clean test --fail-at-end -pl src/datasource-service -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
+mvn clean test --fail-at-end -pl src/distributed-lock-ext -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
+mvn clean test --fail-at-end -pl src/jdbc -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
+mvn clean test --fail-at-end -pl src/job-service -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
+mvn clean test --fail-at-end -pl src/kylin-it -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
+mvn clean test --fail-at-end -pl src/metadata-server -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
+mvn clean test --fail-at-end -pl src/modeling-service -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
+mvn clean test --fail-at-end -pl src/query -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
+mvn clean test --fail-at-end -pl src/query-booter -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
+mvn clean test --fail-at-end -pl src/query-common -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
+mvn clean test --fail-at-end -pl src/query-server -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
+mvn clean test --fail-at-end -pl src/query-service -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
+mvn clean test --fail-at-end -pl src/server -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
+mvn clean test --fail-at-end -pl src/source-hive -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
+mvn clean test --fail-at-end -pl src/streaming -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
+mvn clean test --fail-at-end -pl src/streaming-sdk -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
+mvn clean test --fail-at-end -pl src/streaming-service -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
+mvn clean test --fail-at-end -pl src/tool -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
+mvn clean test --fail-at-end -pl src/spark-project/ -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
+mvn clean test --fail-at-end -pl src/spark-project/engine-build-sdk -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
+mvn clean test --fail-at-end -pl src/spark-project/engine-spark -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
+mvn clean test --fail-at-end -pl src/spark-project/kylin-soft-affinity-cache -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
+mvn clean test --fail-at-end -pl src/spark-project/source-jdbc -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
+mvn clean test --fail-at-end -pl src/spark-project/sparder -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
+mvn clean test --fail-at-end -pl src/spark-project/spark-common -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
+mvn clean test --fail-at-end -pl src/spark-project/spark-it -DfailIfNoTests=false -Duser.timezone=GMT+8 >>${ci_output} 2>&1
echo "----------- Kylin Test Completed -----------"
diff --git a/kystudio/src/components/setting/SettingModel/locales.js b/kystudio/src/components/setting/SettingModel/locales.js
index 5391bd8455..59f49b4008 100644
--- a/kystudio/src/components/setting/SettingModel/locales.js
+++ b/kystudio/src/components/setting/SettingModel/locales.js
@@ -52,7 +52,7 @@ export default {
sparkShuffle: 'The number of partitions to use when shuffling data for joins or aggregations.',
baseCuboidConfig: 'According to your business scenario, you can decide whether to add an index that contains dimensions and measures defined in all aggregate groups. The index can answer queries across multiple aggregate groups, but this will impact query performance. In addition to this, there are some storage and building costs by adding this index.',
customSettings: 'Custom Settings',
- customOptions: 'Besides the defined configurations, you can also add some advanced settings.<br/><i class="el-icon-ksd-alert"></i>Note: It\'s highly recommended to use this feature with the support of Kyligence Service Team.',
+ customOptions: 'Besides the defined configurations, you can also add some advanced settings.<br/><i class="el-icon-ksd-alert"></i>Note: It\'s highly recommended to use this feature with the support of Kylin 5 Team.',
customSettingKeyPlaceholder: 'Configuration Name',
customSettingValuePlaceholder: 'Value',
delCustomConfigTip: 'Are you sure you want to delete custom setting item {name}？'
diff --git a/kystudio/src/components/user/login.vue b/kystudio/src/components/user/login.vue
index f3c6186145..e4e8e0e60c 100644
--- a/kystudio/src/components/user/login.vue
+++ b/kystudio/src/components/user/login.vue
@@ -19,7 +19,7 @@
<div class="ky-line"></div>
<ul>
<li><i class="el-icon-ksd-login_intro ksd-fs-12"></i><a :href="$t('introductionUrl')" target="_blank">{{$t('introduction')}}</a></li>
- <li><i class="el-icon-ksd-details ksd-fs-12"></i><a :href="'https://kylin.apache.org/docs/'" target="_blank">{{$t('manual')}}</a></li>
+ <li><i class="el-icon-ksd-details ksd-fs-12"></i><a :href="'https://kylin.apache.org/5.0/docs/quickstart/overview'" target="_blank">{{$t('manual')}}</a></li>
<li><i class="el-icon-ksd-login_email ksd-fs-12"></i><a href="mailto:user@kylin.apache.org">{{$t('contactKylin')}}</a></li>
</ul>
</div>
@@ -53,8 +53,8 @@
<p class="text">{{$t('accessForbidden')}}</p>
</div>
<p class="login-footer">
- <a href="http://kylin.apache.org" style="color:#808080;">Apache Kylin</a> |
- <a href="http://kylin.apache.org/community/" style="color:#808080;"> Apache Kylin Community</a>
+ <a href="http://kylin.apache.org/5.0" style="color:#808080;">Apache Kylin 5.0</a> |
+ <a href="http://kylin.apache.org/5.0/community/" style="color:#808080;">Apache Kylin Community</a>
</p>
</div>
</template>
@@ -117,7 +117,7 @@ import { Base64 } from 'js-base64'
},
locales: {
'en': {
- welcome: 'Welcome to Kylin',
+ welcome: 'Welcome to Kylin 5.0',
kylinMsg: 'Analytic Data Warehouse for Big Data',
loginIn: 'Login',
userName: 'Username',
@@ -126,8 +126,8 @@ import { Base64 } from 'js-base64'
noUserName: 'Please enter your username.',
noUserPwd: 'Please enter your password.',
adminTip: 'Please run the reset password command "bin/admin-tool.sh admin-password-reset" under the "$KYLIN_HOME", <br/>After that, the ADMIN password will be reset to the default password, <br/>and the other accounts will not be influenced.',
- introduction: 'Introduction',
- introductionUrl: 'https://kylin.apache.org/',
+ introduction: 'Tutorial',
+ introductionUrl: 'https://kylin.apache.org/5.0/docs/quickstart/tutorial',
manual: 'Manual',
contactKylin: 'Contact Kylin',
accessForbidden: 'Access denied'
@@ -247,7 +247,7 @@ export default class Login extends Vue {
a:hover {
color: @base-color-1;
}
- }
+ }
li:hover {
color: @base-color-1;
}
diff --git a/pom.xml b/pom.xml
index 516eae722b..4dfba2dd28 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,6 +17,14 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <parent>
+ <!-- https://infra.apache.org/publishing-maven-artifacts.html -->
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>23</version>
+ </parent>
+
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.kylin</groupId>
@@ -35,10 +43,10 @@
</organization>
<scm>
- <connection>scm:git:git://github.com/apache/kylin.git</connection>
- <developerConnection>scm:git:ssh://git@github.com/apache/kylin.git
- </developerConnection>
- <url>https://github.com/apache/kylin</url>
+ <connection>scm:git:https://gitbox.apache.org/repos/asf/kylin.git</connection>
+ <!-- developerConnection is using in maven-release-plugin https://maven.apache.org/guides/mini/guide-releasing.html-->
+ <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/kylin.git</developerConnection>
+ <url>scm:git:https://gitbox.apache.org/repos/asf/kylin.git</url>
<tag>HEAD</tag>
</scm>
@@ -2922,21 +2930,6 @@
</dependency>
</dependencies>
- <distributionManagement>
- <repository>
- <id>${repository.id}</id>
- <url>${repository.url}</url>
- <name>${repository.name}</name>
- <layout>default</layout>
- </repository>
- <snapshotRepository>
- <id>${repository.id.snapshots}</id>
- <url>${repository.url.snapshots}</url>
- <name>${repository.name.snapshots}</name>
- <layout>default</layout>
- </snapshotRepository>
- </distributionManagement>
-
<build>
<pluginManagement>
<plugins>
@@ -3067,17 +3060,17 @@
<includePom>true</includePom>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>3.3.2</version>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <phase>deploy</phase>
- </execution>
- </executions>
- </plugin>
+<!-- <plugin>-->
+<!-- <groupId>org.apache.maven.plugins</groupId>-->
+<!-- <artifactId>maven-javadoc-plugin</artifactId>-->
+<!-- <version>3.3.2</version>-->
+<!-- <executions>-->
+<!-- <execution>-->
+<!-- <id>attach-javadocs</id>-->
+<!-- <phase>deploy</phase>-->
+<!-- </execution>-->
+<!-- </executions>-->
+<!-- </plugin>-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
@@ -3560,6 +3553,13 @@
</activation>
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <dryRun>false</dryRun>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
@@ -3579,12 +3579,12 @@
<goal>single</goal>
</goals>
<configuration>
- <tarLongFileMode>posix</tarLongFileMode>
+ <tarLongFileMode>gnu</tarLongFileMode>
<runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
<appendAssemblyId>true</appendAssemblyId>
<descriptors>
<descriptor>
- assembly/src/main/config/assemblies/source-assembly.xml
+ src/assembly/source-assembly.xml
</descriptor>
</descriptors>
<finalName>apache-kylin-${project.version}</finalName>
diff --git a/src/assembly/source-assembly.xml b/src/assembly/source-assembly.xml
new file mode 100644
index 0000000000..aefbf9ffd1
--- /dev/null
+++ b/src/assembly/source-assembly.xml
@@ -0,0 +1,121 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--
+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.
+-->
+<assembly>
+ <id>src</id>
+ <formats>
+ <format>zip</format>
+ <format>tar.gz</format>
+ </formats>
+
+ <fileSets>
+ <!-- main project directory structure -->
+ <fileSet>
+ <directory>.</directory>
+ <outputDirectory>.</outputDirectory>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <excludes>
+ <!-- build output -->
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/).*${project.build.directory}.*]
+ </exclude>
+
+ <!-- NOTE: Most of the following excludes should not be required
+ if the standard release process is followed. This is because the release
+ plugin checks out project sources into a location like target/checkout, then
+ runs the build from there. The result is a source-release archive that comes
+ from a pretty clean directory structure. HOWEVER, if the release plugin is
+ configured to run extra goals or generate a project website, it's definitely
+ possible that some of these files will be present. So, it's safer to exclude
+ them. -->
+
+ <!-- IDEs -->
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?maven-eclipse\.xml]
+ </exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.project]
+ </exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.classpath]
+ </exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.iws]
+ </exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.idea(/.*)?]
+ </exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?out(/.*)?]
+ </exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.ipr]
+ </exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.iml]
+ </exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.settings(/.*)?]
+ </exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.externalToolBuilders(/.*)?]
+ </exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.deployables(/.*)?]
+ </exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.wtpmodules(/.*)?]
+ </exclude>
+
+
+ <!-- scm -->
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.gitignore(/.*)?]
+ </exclude>
+
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?docs/website(/.*)?]
+ </exclude>
+
+ <!-- release-plugin temp files -->
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?pom\.xml\.releaseBackup]
+ </exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?pom\.xml\.next]
+ </exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?pom\.xml\.tag]
+ </exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?release\.properties]
+ </exclude>
+
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?release\.properties]
+ </exclude>
+
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?dist(/.*)?]
+ </exclude>
+
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?lib(/.*)?]
+ </exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?docs(/.*)?]
+ </exclude>
+
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?target(/.*)?]
+ </exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?src/tpcds(/.*)?]
+ </exclude>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?src/examples(/.*)?]
+ </exclude>
+
+ </excludes>
+ </fileSet>
+ <!-- LICENSE, NOTICE, DEPENDENCIES, git.properties, etc. calculated at build time -->
+ <fileSet>
+ <directory>${project.build.directory}/maven-shared-archive-resources/META-INF
+ </directory>
+ <outputDirectory>.</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>${project.build.directory}</directory>
+ <includes>
+ <include>git.properties</include>
+ </includes>
+ <outputDirectory>.</outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
diff --git a/src/common-booter/src/main/resources/config/config_library.csv b/src/common-booter/src/main/resources/config/config_library.csv
index 5f9429c661..631c673653 100644
--- a/src/common-booter/src/main/resources/config/config_library.csv
+++ b/src/common-booter/src/main/resources/config/config_library.csv
@@ -120,7 +120,7 @@ kylin.engine.streaming-segment-merge-ratio,Double,流式 segment 合并比率,St
kylin.engine.streaming-segment-merge-threshold,Int,实时OLAP构建触发合并segment的条件,Real -time OLAP constructs the condition for triggering the combination of segment,TRUE,TRUE
kylin.engine.streaming-trigger-once,boolean,实时OLAP构建仅触发一次,Real -time OLAP construction only triggers once,TRUE,TRUE
kylin.engine.submit-hadoop-conf-dir,String,hadoop conf 目录,Hadoop Conf directory,TRUE,TRUE
-kylin.env,String,Kyligence Enterprise 部署模式,Kyligence Enterprise deployment mode,TRUE,TRUE
+kylin.env,String,Kylin 5.0 部署模式,Kylin 5.0 deployment mode,TRUE,TRUE
kylin.env.channel,String,判断当前部署环境,Determine the current deployment environment,TRUE,TRUE
kylin.env.engine-write-fs,String,配置构建写集群,Configuration Construction Writing Cluster,TRUE,TRUE
kylin.env.hdfs-data-working-dir,String,数据存储路径，可以和working-dir分开,Data storage paths can be separated from Working-DIR,TRUE,TRUE
@@ -256,7 +256,7 @@ kylin.metadata.key-case-insensitive,boolean,当本地用户、用户组较多影
kylin.metadata.ops-cron,boolean,定时备份元数据、垃圾清理的定时任务 cron 表达式，默认值是 0 0 0 * * *,"Timing backup metad data, the timing task of garbage clearance CRON expression, the default value is 0 0 0 * * * *",TRUE,TRUE
kylin.metadata.random-admin-password.enabled,boolean,admin使用随机密码,admin uses random passwords,TRUE,TRUE
kylin.metadata.semi-automatic-mode,boolean,前端：当前project 是否含有半自动的标志；后端：是否默认使用半自动档,Front end: whether the current Project contains semi -automatic signs; back -end: Whether the semi -automatic file is used by default,TRUE,TRUE
-kylin.metadata.url,String,Kyligence Enterprise 元数据库路径。,Kyligence Enterprise metad database path.,TRUE,TRUE
+kylin.metadata.url,String,Kylin 5.0 元数据库路径。,Kylin 5.0 metad database path.,TRUE,TRUE
kylin.metadata.validate-computed-column,boolean,是否检验可计算列,Whether to test can be calculated,TRUE,TRUE
kylin.metrics.daily-influx-db,String,按天归档influxdb数据的数据库,Database of InfluxDB data by the day,TRUE,TRUE
kylin.metrics.daily-max-retry-times,Int,按天归档influxdb数据时异常后重试次数,Archive by the day when INFLUXDB data is abnormal,TRUE,TRUE
@@ -323,7 +323,7 @@ kylin.query.engine.sparder-enabled,boolean,是否启用sparder引擎,Whether to
kylin.query.engine.spark-scheduler-mode,String,spark 调度模式,spark scheduling mode,TRUE,TRUE
kylin.query.engine.spark-sql-shuffle-partitions,Int,spark sql 中 join 或 aggregations 时的分区数,The number of partitions in spark sql when join or aggregations,TRUE,TRUE
kylin.query.engine.split-group-sets-into-union,boolean,是否对 grouping sets 进行拆开处理,Whether the Grouping Sets is disassembled and processed,TRUE,TRUE
-kylin.query.escape-default-keyword,boolean,"Kyligence Enterprise 会自动为 default 转为""DEFAULT""。","Kyligence Enterprise will automatically convert to ""Default"" for Default.",TRUE,TRUE
+kylin.query.escape-default-keyword,boolean,"Kylin 5.0 会自动为 default 转为""DEFAULT""。","Kylin 5.0 will automatically convert to ""Default"" for Default.",TRUE,TRUE
kylin.query.exception-cache-enabled,boolean,是否缓存失败的查询,Whether to cache failure query,TRUE,TRUE
kylin.query.exception-cache-threshold-duration,Int,需要缓存异常查询的最小查询时间,The minimum query time that needs to be cached abnormal query,TRUE,TRUE
kylin.query.exception-cache-threshold-times,Int,需要缓存异常查询的最大失败次数,The maximum failure of cache abnormal query,TRUE,TRUE
@@ -447,7 +447,7 @@ kylin.server.https.port,Int,https端口号,https port number,TRUE,TRUE
kylin.server.leader-race.enabled,boolean,是否打开HA开关,Whether to turn on the HA switch,TRUE,TRUE
kylin.server.leader-race.heart-beat-interval,Int,HA更新心跳频率，单位s,"HA update heartbeat frequency, unit S",TRUE,TRUE
kylin.server.leader-race.heart-beat-timeout,Int,HA心跳超时时长，单位s,"HA's heartbeat time timeout, unit S",TRUE,TRUE
-kylin.server.mode,String,Kyligence Enterprise 实例的运行模式，参数值可以是 all 或 query 中的一个，默认值为 all。,"The running mode of the Kyligence Enterprise instance can be one of the parameter values in ALL or Query, and the default value is ALL.",TRUE,TRUE
+kylin.server.mode,String,Kylin 5.0 实例的运行模式，参数值可以是 all 或 query 中的一个，默认值为 all。,"The running mode of the Kylin 5.0 instance can be one of the parameter values in ALL or Query, and the default value is ALL.",TRUE,TRUE
kylin.server.renew-batch-size,Int,epoch renew批量更新一次最多更新的个数,EPOCH Renew Batch Update Most Updated Number,TRUE,TRUE
kylin.server.renew-epoch-pool-size,Int,renew epoch 的线程池大小,Renew epoch's thread pool size,TRUE,TRUE
kylin.server.streaming-change-meta,boolean,流式事务可以修改元数据,Streaming transactions can modify metadata data,TRUE,TRUE
@@ -540,7 +540,7 @@ kylin.web.export-allow-other,boolean,是否允许非 Admin 用户导出查询结
kylin.web.properties.whitelist,String,提供给前端使用的配置项列表,Configuration items provided to the front -end use,TRUE,TRUE
kylin.web.session.jdbc-encode-enabled,boolean,session id存入数据库中是否加密,Session ID is encrypted into the database,TRUE,TRUE
kylin.web.session.secure-random-create-enabled,boolean,session id存入数据库中是否加密,Session ID is encrypted into the database,TRUE,TRUE
-kylin.web.timezone,String,Kyligence Enterprise 的 REST 服务所使用的时区。默认值为本地机器的系统的时区。,The time zone used by Kyligence Enterprise's REST service. The default value is the time zone of the system of the local machine.,TRUE,TRUE
+kylin.web.timezone,String,Kylin 5.0 的 REST 服务所使用的时区。默认值为本地机器的系统的时区。,The time zone used by Kylin 5.0's REST service. The default value is the time zone of the system of the local machine.,TRUE,TRUE
server.port,Int,服务启动的端口,The port of the service start,TRUE,TRUE
spring.session.store-type,String,spring session 存储类型,Spring session storage type,TRUE,TRUE
kylin.engine.dynamic-resource-plan-enabled,boolean,在FI平台使用动态资源计划时候，有可能导致无法分配资源，从而构建失败,"When using a dynamic resource plan on the FI platform, it may lead to the failure to allocate resources and build a failure",TRUE,TRUE
diff --git a/src/common-service/src/main/java/org/apache/kylin/rest/cache/RedisCache.java b/src/common-service/src/main/java/org/apache/kylin/rest/cache/RedisCache.java
index e2f9a48e70..9cb2e43b8c 100644
--- a/src/common-service/src/main/java/org/apache/kylin/rest/cache/RedisCache.java
+++ b/src/common-service/src/main/java/org/apache/kylin/rest/cache/RedisCache.java
@@ -64,7 +64,7 @@ public class RedisCache implements KylinCache {
private static final String NX = "NX";
private static final String XX = "XX";
- private static final String PREFIX = "Kyligence-";
+ private static final String PREFIX = "Kylin5-";
private static final String CHARSET_NAME = "UTF-8";
private static final Charset CHARSET = StandardCharsets.UTF_8;
private static final String SCAN_POINTER_START_STR = new String(ScanParams.SCAN_POINTER_START_BINARY, CHARSET);
diff --git a/src/common-service/src/main/java/org/apache/kylin/tool/garbage/StorageCleaner.java b/src/common-service/src/main/java/org/apache/kylin/tool/garbage/StorageCleaner.java
index ff8e833bcf..2452305000 100644
--- a/src/common-service/src/main/java/org/apache/kylin/tool/garbage/StorageCleaner.java
+++ b/src/common-service/src/main/java/org/apache/kylin/tool/garbage/StorageCleaner.java
@@ -205,7 +205,7 @@ public class StorageCleaner {
}
public void printConsole(boolean success, long duration) {
- System.out.println(ANSI_BLUE + "Kyligence Enterprise garbage report: (cleanup=" + cleanup + ")" + ANSI_RESET);
+ System.out.println(ANSI_BLUE + "Kylin 5.0 garbage report: (cleanup=" + cleanup + ")" + ANSI_RESET);
for (StorageItem item : outdatedItems) {
System.out.println(" Storage File: " + item.getPath());
}
diff --git a/src/core-common/src/main/java/org/apache/kylin/common/KapConfig.java b/src/core-common/src/main/java/org/apache/kylin/common/KapConfig.java
index 830f4a877d..c8aae82ddd 100644
--- a/src/core-common/src/main/java/org/apache/kylin/common/KapConfig.java
+++ b/src/core-common/src/main/java/org/apache/kylin/common/KapConfig.java
@@ -203,29 +203,6 @@ public class KapConfig {
return Integer.parseInt(config.getOptional("kylin.diag.extraction.start-time-days", "3"));
}
- /**
- * Online service
- */
- public String getKyAccountUsename() {
- return config.getOptional("kylin.kyaccount.username");
- }
-
- public String getKyAccountPassword() {
- return config.getOptional("kylin.kyaccount.password");
- }
-
- public String getKyAccountToken() {
- return config.getOptional("kylin.kyaccount.token");
- }
-
- public String getKyAccountSSOUrl() {
- return config.getOptional("kylin.kyaccount.url", "https://sso.kyligence.com");
- }
-
- public String getKyAccountSiteUrl() {
- return config.getOptional("kylin.kyaccount.site-url", "https://account.kyligence.io");
- }
-
public String getChannelUser() {
return config.getOptional("kylin.env.channel", "on-premises");
}
diff --git a/src/core-common/src/main/java/org/apache/kylin/common/KylinVersion.java b/src/core-common/src/main/java/org/apache/kylin/common/KylinVersion.java
index d2a577cbdc..48461e155e 100644
--- a/src/core-common/src/main/java/org/apache/kylin/common/KylinVersion.java
+++ b/src/core-common/src/main/java/org/apache/kylin/common/KylinVersion.java
@@ -92,7 +92,7 @@ public class KylinVersion implements Comparable {
/**
* Require MANUAL updating kylin version per ANY upgrading.
*/
- private static final KylinVersion CURRENT_KYLIN_VERSION = new KylinVersion("4.0.0");
+ private static final KylinVersion CURRENT_KYLIN_VERSION = new KylinVersion("5.0.0");
private static final KylinVersion VERSION_200 = new KylinVersion("2.0.0");
diff --git a/src/core-common/src/main/java/org/apache/kylin/common/msg/CnMessage.java b/src/core-common/src/main/java/org/apache/kylin/common/msg/CnMessage.java
index 1f7923622b..8403f70fa5 100644
--- a/src/core-common/src/main/java/org/apache/kylin/common/msg/CnMessage.java
+++ b/src/core-common/src/main/java/org/apache/kylin/common/msg/CnMessage.java
@@ -540,96 +540,6 @@ public class CnMessage extends Message {
return "配置列表不能为空。请检查后重试。";
}
- // Query statistics
-
- //license
- @Override
- public String getLicenseErrorPre() {
- return "无法更新许可证：\n";
- }
-
- @Override
- public String getLicenseErrorSuff() {
- return "\n请重新上传新的许可证或联系 Kyligence 销售人员。";
- }
-
- @Override
- public String getLicenseOverdueTrial() {
- return "许可证已过期，当前有效期为[%s - %s]。请重新上传新的许可证或联系 Kyligence 销售人员。";
- }
-
- @Override
- public String getLicenseNodesExceed() {
- return "您使用的节点数已超过许可证范围，请联系您的客户经理。";
- }
-
- @Override
- public String getLicenseNodesNotMatch() {
- return "当前许可证的节点数与集群信息不匹配，请重新上传新的许可证或联系 Kyligence 销售人员。";
- }
-
- @Override
- public String getlicenseWrongCategory() {
- return "当前许可证的版本与产品不匹配，请重新上传新的许可证或联系 Kyligence 销售人员。";
- }
-
- @Override
- public String getLicenseNoLicense() {
- return "没有许可证文件。请联系 Kyligence 销售人员。";
- }
-
- @Override
- public String getLicenseMismatchLicense() {
- return "该许可证适用的集群信息与当前不符。请上传新的许可证或联系 Kyligence 销售人员。";
- }
-
- @Override
- public String getLicenseNotEffective() {
- return "许可证尚未生效，请重新申请。";
- }
-
- @Override
- public String getLicenseExpired() {
- return "该许可证已过期。请上传新的许可证或联系 Kyligence 销售人员。";
- }
-
- @Override
- public String getLicenseOverVolume() {
- return "当前系统已使用容量超过该许可证允许的容量。请上传新的许可证或联系 Kyligence 销售人员。";
- }
-
- @Override
- public String getLicenseInvalidLicense() {
- return "无效许可证。请上传新的许可证或联系 Kyligence 销售人员。";
- }
-
- @Override
- public String getLicenseSourceOverCapacity() {
- return "当前已使用数据量（%s/%s）超过许可证上限。系统无法进行构建或数据加载任务。\n" + "请联系 Kyligence 销售人员，或尝试删除一些 Segment 以解除限制。";
- }
-
- @Override
- public String getLicenseProjectSourceOverCapacity() {
- return "当前项目已使用数据量（%s/%s）超过配置上限。系统无法进行构建或数据加载任务。\n" + "请联系 Kyligence 销售人员，或尝试删除一些 Segment 以解除限制。";
- }
-
- @Override
- public String getLicenseNodesOverCapacity() {
- return "当前已使用节点数（%s/%s）超过许可证上限。系统无法进行构建或数据加载任务。\n" + "请联系 Kyligence 销售人员，或尝试停止部分节点以解除限制。";
- }
-
- @Override
- public String getLicenseSourceNodesOverCapacity() {
- return "当前已使用数据量（%s/%s）和节点数（%s/%s）均超过许可证上限。\n" + "系统无法进行构建或数据加载任务。\n"
- + "请联系 Kyligence 销售人员，或尝试删除一些 segments 并停止部分节点以解除限制。";
- }
-
- @Override
- public String getlicenseProjectSourceNodesOverCapacity() {
- return "当前项目已使用数据量（%s/%s）和节点数（%s/%s）均超过配置上限。\n" + "系统无法进行构建或数据加载任务。\n"
- + "请联系 Kyligence 销售人员，或尝试删除一些 segments 并停止部分节点以解除限制。";
- }
-
@Override
public String saveModelFail() {
return "模型 “%s” 保存失败。请确保模型中使用的列 “%s” 在源表 “%s” 中存在。";
@@ -915,21 +825,6 @@ public class CnMessage extends Message {
return "请输入 Segment ID 或名称。";
}
- @Override
- public String getContentIsEmpty() {
- return "许可证内容为空";
- }
-
- @Override
- public String getIllegalEmail() {
- return "不允许使用个人电子邮件或非法电子邮件";
- }
-
- @Override
- public String getLicenseError() {
- return "获取许可证失败";
- }
-
@Override
public String getEmailUsernameCompanyCanNotEmpty() {
return "邮箱, 用户名, 公司不能为空";
@@ -1067,7 +962,7 @@ public class CnMessage extends Message {
@Override
public String getDefaultSuggest() {
- return "更多详情请联系 Kyligence 技术支持。";
+ return "更多详情请联系 Kylin 5 技术支持。";
}
@Override
@@ -1551,7 +1446,7 @@ public class CnMessage extends Message {
@Override
public String getStreamingDisabled() {
- return "只有 Kyligence 高级版才能使用批流一体功能，请联系 Kyligence 客户经理升级 License。";
+ return "开发中。";
}
@Override
diff --git a/src/core-common/src/main/java/org/apache/kylin/common/msg/Message.java b/src/core-common/src/main/java/org/apache/kylin/common/msg/Message.java
index 805caa5688..98bd73637f 100644
--- a/src/core-common/src/main/java/org/apache/kylin/common/msg/Message.java
+++ b/src/core-common/src/main/java/org/apache/kylin/common/msg/Message.java
@@ -22,10 +22,9 @@ import java.util.List;
import java.util.Locale;
import org.apache.kylin.common.Singletons;
-import org.apache.kylin.common.annotation.Clarification;
-@Clarification(priority = Clarification.Priority.MAJOR, msg = "Part message is for enterprise.")
public class Message {
+ private static final String UNKNOWN_ERROR = "UNKNOWN ERROR";
private static final String SECOND_STORAGE_PROJECT_ENABLED = "The project %s does not have tiered storage enabled.";
private static final String SECOND_STORAGE_MODEL_ENABLED = "The model %s does not have tiered storage enabled.";
private static final String SECOND_STORAGE_SEGMENT_WITHOUT_BASE_INDEX = "The base table index is missing in the segments, please add and try again.";
@@ -48,18 +47,6 @@ public class Message {
private static final String PROFILING_COLLECT_TIMEOUT = "Async profiler timeout";
private static final String PARAMETER_EMPTY = "Please enter the value for the parameter '%s'.";
-
- private static final String LICENSE_ERROR_PRE = "The license couldn’t be updated:\n";
- private static final String LICENSE_ERROR_SUFF = "\nPlease upload a new license, or contact Kyligence.";
- private static final String LICENSE_OVERDUE_TRIAL = "The license has expired and the validity period is [%s - %s]. Please upload a new license or contact Kyligence.";
- private static final String LICENSE_NODES_EXCEED = "The number of nodes which you are using is higher than the allowable number. Please contact your Kyligence account manager.";
- private static final String LICENSE_NODES_NOT_MATCH = "The cluster information dose not match the license. Please upload a new license or contact Kyligence.";
- private static final String LICENSE_OVER_VOLUME = "The current used system capacity exceeds the license’s limit. Please upload a new license, or contact Kyligence.";
- private static final String LICENSE_NO_LICENSE = "No license file. Please contact Kyligence.";
- private static final String LICENSE_WRONG_CATEGORY = "The current version of Kyligence Enterprise does not match the license. Please upload a new license or contact Kyligence.";
- private static final String LICENSE_MISMATCH_LICENSE = "The license doesn’t match the current cluster information. Please upload a new license, or contact Kyligence.";
- private static final String LICENSE_NOT_EFFECTIVE = "License is not effective yet, please apply for a new license.";
- private static final String LICENSE_EXPIRED = "The license has expired. Please upload a new license, or contact Kyligence.";
private static final String DDL_UNSUPPORTED = "Unsupported DDL syntax, only support single `create view`, `drop view`, `alter view`, `show create table`";
private static final String DDL_VIEW_NAME_ERROR = "View names need to start with KE_";
private static final String DDL_VIEW_NAME_DUPLICATE_ERROR = "Logical View names is duplicate";
@@ -574,78 +561,71 @@ public class Message {
// License
public String getLicenseErrorPre() {
- return LICENSE_ERROR_PRE;
+ return UNKNOWN_ERROR;
}
public String getLicenseErrorSuff() {
- return LICENSE_ERROR_SUFF;
+ return UNKNOWN_ERROR;
}
public String getLicenseOverdueTrial() {
- return LICENSE_OVERDUE_TRIAL;
+ return UNKNOWN_ERROR;
}
public String getLicenseNodesExceed() {
- return LICENSE_NODES_EXCEED;
+ return UNKNOWN_ERROR;
}
public String getLicenseNodesNotMatch() {
- return LICENSE_NODES_NOT_MATCH;
+ return UNKNOWN_ERROR;
}
public String getLicenseOverVolume() {
- return LICENSE_OVER_VOLUME;
+ return UNKNOWN_ERROR;
}
public String getLicenseNoLicense() {
- return LICENSE_NO_LICENSE;
+ return UNKNOWN_ERROR;
}
public String getlicenseWrongCategory() {
- return LICENSE_WRONG_CATEGORY;
+ return UNKNOWN_ERROR;
}
public String getLicenseInvalidLicense() {
- return "The license is invalid. Please upload a new license, or contact Kyligence.";
+ return UNKNOWN_ERROR;
}
public String getLicenseMismatchLicense() {
- return LICENSE_MISMATCH_LICENSE;
+ return UNKNOWN_ERROR;
}
public String getLicenseNotEffective() {
- return LICENSE_NOT_EFFECTIVE;
+ return UNKNOWN_ERROR;
}
public String getLicenseExpired() {
- return LICENSE_EXPIRED;
+ return UNKNOWN_ERROR;
}
public String getLicenseSourceOverCapacity() {
- return "The amount of data volume used（%s/%s) exceeds the license’s limit. Build index and load data is unavailable.\n"
- + "Please contact Kyligence, or try deleting some segments.";
+ return UNKNOWN_ERROR;
}
public String getLicenseProjectSourceOverCapacity() {
- return "The amount of data volume used（%s/%s) exceeds the project’s limit. Build index and load data is unavailable.\n"
- + "Please contact Kyligence, or try deleting some segments.";
+ return UNKNOWN_ERROR;
}
public String getLicenseNodesOverCapacity() {
- return "The amount of nodes used (%s/%s) exceeds the license’s limit. Build index and load data is unavailable.\n"
- + "Please contact Kyligence, or try stopping some nodes.";
+ return UNKNOWN_ERROR;
}
public String getLicenseSourceNodesOverCapacity() {
- return "The amount of data volume used (%s/%s) and nodes used (%s/%s) exceeds license’s limit.\n"
- + "Build index and load data is unavailable.\n"
- + "Please contact Kyligence, or try deleting some segments and stopping some nodes.";
+ return UNKNOWN_ERROR;
}
public String getlicenseProjectSourceNodesOverCapacity() {
- return "The amount of data volume used (%s/%s) and nodes used (%s/%s) exceeds project’s limit.\n"
- + "Build index and load data is unavailable.\n"
- + "Please contact Kyligence, or try deleting some segments and stopping some nodes.";
+ return UNKNOWN_ERROR;
}
public String saveModelFail() {
@@ -846,18 +826,6 @@ public class Message {
return "Please enter segment ID or name.";
}
- public String getContentIsEmpty() {
- return "license content is empty";
- }
-
- public String getIllegalEmail() {
- return "A personal email or illegal email is not allowed";
- }
-
- public String getLicenseError() {
- return "Get license error";
- }
-
public String getEmailUsernameCompanyCanNotEmpty() {
return "Email, username, company can not be empty";
}
@@ -961,7 +929,7 @@ public class Message {
}
public String getDefaultSuggest() {
- return "Please contact Kyligence technical support for more details.";
+ return "Please contact Community support for more details.";
}
public String getUnexpectedToken() {
@@ -1417,8 +1385,7 @@ public class Message {
}
public String getStreamingDisabled() {
- return "The Real-time functions can only be used under Kyligence Premium Version, "
- + "please contact Kyligence customer manager to upgrade your license.";
+ return "The Real-time functions is under development.";
}
public String getNoStreamingModelFound() {
diff --git a/src/core-common/src/main/resources/kylin_error_msg_conf_cn.properties b/src/core-common/src/main/resources/kylin_error_msg_conf_cn.properties
index 77070d8924..11f10b5af9 100644
--- a/src/core-common/src/main/resources/kylin_error_msg_conf_cn.properties
+++ b/src/core-common/src/main/resources/kylin_error_msg_conf_cn.properties
@@ -212,4 +212,4 @@ KE-050041202=该路径已存在：%s。
# Common
## KE-060100201
-KE-060100201=Kyligence Enterprise 外部发生异常。
+KE-060100201=Kylin 5.0 外部发生异常。
diff --git a/src/core-common/src/main/resources/kylin_error_msg_conf_en.properties b/src/core-common/src/main/resources/kylin_error_msg_conf_en.properties
index 7c67ccdae4..028f593bce 100644
--- a/src/core-common/src/main/resources/kylin_error_msg_conf_en.properties
+++ b/src/core-common/src/main/resources/kylin_error_msg_conf_en.properties
@@ -211,4 +211,4 @@ KE-050041202=The path already exists: %s.
# Common
## KE-060100201
-KE-060100201=An Exception occurred outside Kyligence Enterprise.
+KE-060100201=An Exception occurred outside Kylin 5.0.
diff --git a/src/core-common/src/test/java/org/apache/kylin/common/KapConfigTest.java b/src/core-common/src/test/java/org/apache/kylin/common/KapConfigTest.java
index 1f930a8272..ba98e66eab 100644
--- a/src/core-common/src/test/java/org/apache/kylin/common/KapConfigTest.java
+++ b/src/core-common/src/test/java/org/apache/kylin/common/KapConfigTest.java
@@ -68,16 +68,6 @@ public class KapConfigTest {
map.put("getExtractionStartTimeDays", new PropertiesEntity("kylin.diag.extraction.start-time-days", "3", 3));
- map.put("getKyAccountUsename", new PropertiesEntity("kylin.kyaccount.username", "ADMIN", "ADMIN"));
- map.put("getKyAccountPassword", new PropertiesEntity("kylin.kyaccount.password", "KYLIN", "KYLIN"));
- map.put("getKyAccountToken", new PropertiesEntity("kylin.kyaccount.token", "ADMIN", "ADMIN"));
-
- map.put("getKyAccountSSOUrl",
- new PropertiesEntity("kylin.kyaccount.url", "https://sso.kyligence.com", "https://sso.kyligence.com"));
-
- map.put("getKyAccountSiteUrl", new PropertiesEntity("kylin.kyaccount.site-url", "https://account.kyligence.io",
- "https://account.kyligence.io"));
-
map.put("getChannelUser", new PropertiesEntity("kylin.env.channel", "on-premises", "on-premises"));
map.put("isImplicitComputedColumnConvertEnabled",
diff --git a/src/core-common/src/test/java/org/apache/kylin/common/exception/code/ErrorCodeTest.java b/src/core-common/src/test/java/org/apache/kylin/common/exception/code/ErrorCodeTest.java
index 0da0fc095c..476f1d4b13 100644
--- a/src/core-common/src/test/java/org/apache/kylin/common/exception/code/ErrorCodeTest.java
+++ b/src/core-common/src/test/java/org/apache/kylin/common/exception/code/ErrorCodeTest.java
@@ -29,12 +29,12 @@ public class ErrorCodeTest {
Assert.assertEquals("KE-060100201", nonKeException.getErrorCode().getCode());
Assert.assertEquals("Please check whether the external environment(other systems, components, etc.) is normal.",
nonKeException.getErrorSuggest().getLocalizedString());
- Assert.assertEquals("An Exception occurred outside Kyligence Enterprise.", nonKeException.getMsg());
- Assert.assertEquals("An Exception occurred outside Kyligence Enterprise.",
+ Assert.assertEquals("An Exception occurred outside Kylin 5.0.", nonKeException.getMsg());
+ Assert.assertEquals("An Exception occurred outside Kylin 5.0.",
nonKeException.getErrorMsg().getLocalizedString());
Assert.assertEquals("Please check whether the external environment(other systems, components, etc.) is normal.",
nonKeException.getErrorSuggestion().getLocalizedString());
- Assert.assertEquals("KE-060100201: An Exception occurred outside Kyligence Enterprise.",
+ Assert.assertEquals("KE-060100201: An Exception occurred outside Kylin 5.0.",
nonKeException.getCodeMsg());
}
}
diff --git a/src/core-job/src/main/java/org/apache/kylin/job/impl/threadpool/NDefaultScheduler.java b/src/core-job/src/main/java/org/apache/kylin/job/impl/threadpool/NDefaultScheduler.java
index bcac0074f6..c574b649c6 100644
--- a/src/core-job/src/main/java/org/apache/kylin/job/impl/threadpool/NDefaultScheduler.java
+++ b/src/core-job/src/main/java/org/apache/kylin/job/impl/threadpool/NDefaultScheduler.java
@@ -43,7 +43,6 @@ import org.apache.kylin.job.execution.ExecutableContext;
import org.apache.kylin.job.execution.NExecutableManager;
import org.apache.kylin.job.runners.FetcherRunner;
import org.apache.kylin.job.runners.JobCheckRunner;
-import org.apache.kylin.job.runners.LicenseCapacityCheckRunner;
import org.apache.kylin.job.runners.QuotaStorageCheckRunner;
import org.apache.kylin.metadata.project.NProjectManager;
import org.apache.kylin.metadata.project.ProjectInstance;
@@ -186,8 +185,6 @@ public class NDefaultScheduler implements Scheduler<AbstractExecutable> {
fetcherPool.scheduleWithFixedDelay(new JobCheckRunner(this), RandomUtils.nextInt(0, pollSecond), pollSecond,
TimeUnit.SECONDS);
- fetcherPool.scheduleWithFixedDelay(new LicenseCapacityCheckRunner(this), RandomUtils.nextInt(0, pollSecond),
- pollSecond, TimeUnit.SECONDS);
fetcherPool.scheduleWithFixedDelay(fetcher, RandomUtils.nextInt(0, pollSecond), pollSecond, TimeUnit.SECONDS);
hasStarted.set(true);
}
diff --git a/src/core-job/src/main/java/org/apache/kylin/job/lock/ZookeeperUtil.java b/src/core-job/src/main/java/org/apache/kylin/job/lock/ZookeeperUtil.java
index 6f3722fbda..42d5f90b71 100644
--- a/src/core-job/src/main/java/org/apache/kylin/job/lock/ZookeeperUtil.java
+++ b/src/core-job/src/main/java/org/apache/kylin/job/lock/ZookeeperUtil.java
@@ -24,7 +24,6 @@ import org.apache.kylin.common.annotation.ThirdPartyDependencies;
/**
* DO NOT DELETE.
*
- * Used By Kyligence Cloud.
*/
@ThirdPartyDependencies({ @ThirdPartyDependencies.ThirdPartyDependent(repository = "static-user-manager", classes = {
"AuthenticationClient" }) })
diff --git a/src/core-metadata/src/test/java/org/apache/kylin/measure/topn/TopNCounterTest.java b/src/core-metadata/src/test/java/org/apache/kylin/measure/topn/TopNCounterTest.java
index e641a9847a..be87df121b 100644
--- a/src/core-metadata/src/test/java/org/apache/kylin/measure/topn/TopNCounterTest.java
+++ b/src/core-metadata/src/test/java/org/apache/kylin/measure/topn/TopNCounterTest.java
@@ -196,7 +196,7 @@ public class TopNCounterTest {
}
/**
- * https://github.com/Kyligence/KAP/issues/16933
+ *
*
* the error of “Comparison method violates its general contract!”
* are deep in the timsort algorithm and there are two necessary
diff --git a/src/core-metadata/src/test/java/org/apache/kylin/metadata/cube/model/NDataflowManagerTest.java b/src/core-metadata/src/test/java/org/apache/kylin/metadata/cube/model/NDataflowManagerTest.java
index 67796a1eb5..015cc06c23 100644
--- a/src/core-metadata/src/test/java/org/apache/kylin/metadata/cube/model/NDataflowManagerTest.java
+++ b/src/core-metadata/src/test/java/org/apache/kylin/metadata/cube/model/NDataflowManagerTest.java
@@ -558,7 +558,6 @@ public class NDataflowManagerTest extends NLocalFileMetadataTestCase {
@Test
@Ignore
public void testConcurrency() throws IOException, InterruptedException {
- // this test case merge from PR <https://github.com/Kyligence/KAP/pull/4744>
final KylinConfig testConfig = getTestConfig();
final NDataflowManager mgr = NDataflowManager.getInstance(testConfig, projectDefault);
NIndexPlanManager indePlanMgr = NIndexPlanManager.getInstance(testConfig, projectDefault);
diff --git a/src/core-metadata/src/test/java/org/apache/kylin/metadata/cube/planner/CostBasePlannerUtilsTest.java b/src/core-metadata/src/test/java/org/apache/kylin/metadata/cube/planner/CostBasePlannerUtilsTest.java
index 647d43ef7c..c9d461643d 100644
--- a/src/core-metadata/src/test/java/org/apache/kylin/metadata/cube/planner/CostBasePlannerUtilsTest.java
+++ b/src/core-metadata/src/test/java/org/apache/kylin/metadata/cube/planner/CostBasePlannerUtilsTest.java
@@ -1,3 +1,20 @@
+/*
+ * 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.
+ */
package org.apache.kylin.metadata.cube.planner;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/src/data-loading-booter/src/main/resources/config/config_library.csv b/src/data-loading-booter/src/main/resources/config/config_library.csv
index 5f9429c661..631c673653 100644
--- a/src/data-loading-booter/src/main/resources/config/config_library.csv
+++ b/src/data-loading-booter/src/main/resources/config/config_library.csv
@@ -120,7 +120,7 @@ kylin.engine.streaming-segment-merge-ratio,Double,流式 segment 合并比率,St
kylin.engine.streaming-segment-merge-threshold,Int,实时OLAP构建触发合并segment的条件,Real -time OLAP constructs the condition for triggering the combination of segment,TRUE,TRUE
kylin.engine.streaming-trigger-once,boolean,实时OLAP构建仅触发一次,Real -time OLAP construction only triggers once,TRUE,TRUE
kylin.engine.submit-hadoop-conf-dir,String,hadoop conf 目录,Hadoop Conf directory,TRUE,TRUE
-kylin.env,String,Kyligence Enterprise 部署模式,Kyligence Enterprise deployment mode,TRUE,TRUE
+kylin.env,String,Kylin 5.0 部署模式,Kylin 5.0 deployment mode,TRUE,TRUE
kylin.env.channel,String,判断当前部署环境,Determine the current deployment environment,TRUE,TRUE
kylin.env.engine-write-fs,String,配置构建写集群,Configuration Construction Writing Cluster,TRUE,TRUE
kylin.env.hdfs-data-working-dir,String,数据存储路径，可以和working-dir分开,Data storage paths can be separated from Working-DIR,TRUE,TRUE
@@ -256,7 +256,7 @@ kylin.metadata.key-case-insensitive,boolean,当本地用户、用户组较多影
kylin.metadata.ops-cron,boolean,定时备份元数据、垃圾清理的定时任务 cron 表达式，默认值是 0 0 0 * * *,"Timing backup metad data, the timing task of garbage clearance CRON expression, the default value is 0 0 0 * * * *",TRUE,TRUE
kylin.metadata.random-admin-password.enabled,boolean,admin使用随机密码,admin uses random passwords,TRUE,TRUE
kylin.metadata.semi-automatic-mode,boolean,前端：当前project 是否含有半自动的标志；后端：是否默认使用半自动档,Front end: whether the current Project contains semi -automatic signs; back -end: Whether the semi -automatic file is used by default,TRUE,TRUE
-kylin.metadata.url,String,Kyligence Enterprise 元数据库路径。,Kyligence Enterprise metad database path.,TRUE,TRUE
+kylin.metadata.url,String,Kylin 5.0 元数据库路径。,Kylin 5.0 metad database path.,TRUE,TRUE
kylin.metadata.validate-computed-column,boolean,是否检验可计算列,Whether to test can be calculated,TRUE,TRUE
kylin.metrics.daily-influx-db,String,按天归档influxdb数据的数据库,Database of InfluxDB data by the day,TRUE,TRUE
kylin.metrics.daily-max-retry-times,Int,按天归档influxdb数据时异常后重试次数,Archive by the day when INFLUXDB data is abnormal,TRUE,TRUE
@@ -323,7 +323,7 @@ kylin.query.engine.sparder-enabled,boolean,是否启用sparder引擎,Whether to
kylin.query.engine.spark-scheduler-mode,String,spark 调度模式,spark scheduling mode,TRUE,TRUE
kylin.query.engine.spark-sql-shuffle-partitions,Int,spark sql 中 join 或 aggregations 时的分区数,The number of partitions in spark sql when join or aggregations,TRUE,TRUE
kylin.query.engine.split-group-sets-into-union,boolean,是否对 grouping sets 进行拆开处理,Whether the Grouping Sets is disassembled and processed,TRUE,TRUE
-kylin.query.escape-default-keyword,boolean,"Kyligence Enterprise 会自动为 default 转为""DEFAULT""。","Kyligence Enterprise will automatically convert to ""Default"" for Default.",TRUE,TRUE
+kylin.query.escape-default-keyword,boolean,"Kylin 5.0 会自动为 default 转为""DEFAULT""。","Kylin 5.0 will automatically convert to ""Default"" for Default.",TRUE,TRUE
kylin.query.exception-cache-enabled,boolean,是否缓存失败的查询,Whether to cache failure query,TRUE,TRUE
kylin.query.exception-cache-threshold-duration,Int,需要缓存异常查询的最小查询时间,The minimum query time that needs to be cached abnormal query,TRUE,TRUE
kylin.query.exception-cache-threshold-times,Int,需要缓存异常查询的最大失败次数,The maximum failure of cache abnormal query,TRUE,TRUE
@@ -447,7 +447,7 @@ kylin.server.https.port,Int,https端口号,https port number,TRUE,TRUE
kylin.server.leader-race.enabled,boolean,是否打开HA开关,Whether to turn on the HA switch,TRUE,TRUE
kylin.server.leader-race.heart-beat-interval,Int,HA更新心跳频率，单位s,"HA update heartbeat frequency, unit S",TRUE,TRUE
kylin.server.leader-race.heart-beat-timeout,Int,HA心跳超时时长，单位s,"HA's heartbeat time timeout, unit S",TRUE,TRUE
-kylin.server.mode,String,Kyligence Enterprise 实例的运行模式，参数值可以是 all 或 query 中的一个，默认值为 all。,"The running mode of the Kyligence Enterprise instance can be one of the parameter values in ALL or Query, and the default value is ALL.",TRUE,TRUE
+kylin.server.mode,String,Kylin 5.0 实例的运行模式，参数值可以是 all 或 query 中的一个，默认值为 all。,"The running mode of the Kylin 5.0 instance can be one of the parameter values in ALL or Query, and the default value is ALL.",TRUE,TRUE
kylin.server.renew-batch-size,Int,epoch renew批量更新一次最多更新的个数,EPOCH Renew Batch Update Most Updated Number,TRUE,TRUE
kylin.server.renew-epoch-pool-size,Int,renew epoch 的线程池大小,Renew epoch's thread pool size,TRUE,TRUE
kylin.server.streaming-change-meta,boolean,流式事务可以修改元数据,Streaming transactions can modify metadata data,TRUE,TRUE
@@ -540,7 +540,7 @@ kylin.web.export-allow-other,boolean,是否允许非 Admin 用户导出查询结
kylin.web.properties.whitelist,String,提供给前端使用的配置项列表,Configuration items provided to the front -end use,TRUE,TRUE
kylin.web.session.jdbc-encode-enabled,boolean,session id存入数据库中是否加密,Session ID is encrypted into the database,TRUE,TRUE
kylin.web.session.secure-random-create-enabled,boolean,session id存入数据库中是否加密,Session ID is encrypted into the database,TRUE,TRUE
-kylin.web.timezone,String,Kyligence Enterprise 的 REST 服务所使用的时区。默认值为本地机器的系统的时区。,The time zone used by Kyligence Enterprise's REST service. The default value is the time zone of the system of the local machine.,TRUE,TRUE
+kylin.web.timezone,String,Kylin 5.0 的 REST 服务所使用的时区。默认值为本地机器的系统的时区。,The time zone used by Kylin 5.0's REST service. The default value is the time zone of the system of the local machine.,TRUE,TRUE
server.port,Int,服务启动的端口,The port of the service start,TRUE,TRUE
spring.session.store-type,String,spring session 存储类型,Spring session storage type,TRUE,TRUE
kylin.engine.dynamic-resource-plan-enabled,boolean,在FI平台使用动态资源计划时候，有可能导致无法分配资源，从而构建失败,"When using a dynamic resource plan on the FI platform, it may lead to the failure to allocate resources and build a failure",TRUE,TRUE
diff --git a/src/data-loading-service/src/main/java/org/apache/kylin/rest/service/JobService.java b/src/data-loading-service/src/main/java/org/apache/kylin/rest/service/JobService.java
index b3b902b4b6..2a97510c86 100644
--- a/src/data-loading-service/src/main/java/org/apache/kylin/rest/service/JobService.java
+++ b/src/data-loading-service/src/main/java/org/apache/kylin/rest/service/JobService.java
@@ -1381,7 +1381,7 @@ public class JobService extends BasicService implements JobSupporter, ISmartAppl
public void onApplicationEvent(ApplicationEvent event) {
if (event instanceof ContextClosedEvent) {
try (SetLogCategory ignored = new SetLogCategory(LogConstant.BUILD_CATEGORY)) {
- logger.info("Stop kyligence node, kill job on yarn for yarn cluster mode");
+ logger.info("Stop Kylin node, kill job on yarn for yarn cluster mode");
}
EpochManager epochManager = EpochManager.getInstance();
KylinConfig kylinConfig = KylinConfig.getInstanceFromEnv();
diff --git a/src/examples/LICENSE b/src/examples/LICENSE
deleted file mode 100644
index e2652ae583..0000000000
--- a/src/examples/LICENSE
+++ /dev/null
@@ -1,10 +0,0 @@
-Evaluation license for Kyligence Enterprise
-Category: 4.x
-SLA Service: NO
-Volume: 1
-Level: professional
-Insight License: 5 users; evaluation; 2019-06-01,2019-07-30
-====
-Kyligence Enterprise
-2019-06-01,2019-07-30
-19d4801b6dardchr83bp3i7wadbdvycs8ay7ibicu2msfogl6kiwz7z3dmdizepmicl3bgqznn34794jt5g51sutofcfpn9jeiw5k3cvt2750faxw7ip1fp08mt3og6xijt4x02euf1zkrn5m7huwal8lqms3gmn0d5i8y2dqlvkvpqtwz3m9tqcnq6n4lznthbdtfncdqsly7a8v9pndh1cav2tdcczzs17ns6e0d4izeatwybr25lir5f5s6qe4ry10x2fkqco7unb4h4ivx8jo6vdb5sp3r4738zhlvrbdwfa38s3wh82lrnugrhxq8eap3rebq9dz8xka713aui4v2acquulicdadt63cv0biz7y7eccfh1tri60526b2bmon71k29n6p29tsbhyl2wdx5hsjuxg2wd993hcndot1fc5oz8kebopqrudyf4o7tjc5ca0bvtysnw3gn64c1sd2iw2rlhlxk7c5szp6kde [...]
\ No newline at end of file
diff --git a/src/jdbc/pom.xml b/src/jdbc/pom.xml
index be5048b52c..979fa50454 100644
--- a/src/jdbc/pom.xml
+++ b/src/jdbc/pom.xml
@@ -237,19 +237,4 @@
</plugins>
</build>
- <distributionManagement>
- <repository>
- <id>${repository.id}</id>
- <url>${repository.url}</url>
- <name>${repository.name}</name>
- <layout>default</layout>
- </repository>
- <snapshotRepository>
- <id>${repository.id.snapshots}</id>
- <url>${repository.url.snapshots}</url>
- <name>${repository.name.snapshots}</name>
- <layout>default</layout>
- </snapshotRepository>
- </distributionManagement>
-
</project>
diff --git a/src/jdbc/src/main/java/org/apache/kylin/jdbc/KylinClient.java b/src/jdbc/src/main/java/org/apache/kylin/jdbc/KylinClient.java
index f211d960f0..57e1fc120b 100644
--- a/src/jdbc/src/main/java/org/apache/kylin/jdbc/KylinClient.java
+++ b/src/jdbc/src/main/java/org/apache/kylin/jdbc/KylinClient.java
@@ -633,7 +633,7 @@ public class KylinClient implements IRemoteClient {
String responseStr = EntityUtils.toString(response.getEntity());
if (responseStr.contains("Error occured while trying to proxy to")) {
return new IOException("FAILED!\n"
- + "[Kyligence][JDBCDriver] Unsupported Apache Kylin instance, please contact Apache Kylin Community.");
+ + "[Kylin 5][JDBCDriver] Unsupported Apache Kylin instance, please contact Apache Kylin Community.");
} else {
return new IOException(
request.getMethod() + " failed, error code " + statusCode + " and response: " + responseStr);
diff --git a/src/job-service/src/test/java/org/apache/kylin/rest/config/initialize/JobSchedulerListenerTest.java b/src/job-service/src/test/java/org/apache/kylin/rest/config/initialize/JobSchedulerListenerTest.java
index f64e878136..ce0f57f526 100644
--- a/src/job-service/src/test/java/org/apache/kylin/rest/config/initialize/JobSchedulerListenerTest.java
+++ b/src/job-service/src/test/java/org/apache/kylin/rest/config/initialize/JobSchedulerListenerTest.java
@@ -430,7 +430,7 @@ public class JobSchedulerListenerTest extends NLocalFileMetadataTestCase {
Assert.assertEquals("KE-060100201", jobInfo.getErrorCode());
Assert.assertEquals("Please check whether the external environment(other systems, components, etc.) is normal.",
jobInfo.getSuggestion());
- Assert.assertEquals("KE-060100201: An Exception occurred outside Kyligence Enterprise.", jobInfo.getMsg());
+ Assert.assertEquals("KE-060100201: An Exception occurred outside Kylin 5.0.", jobInfo.getMsg());
Assert.assertTrue(jobInfo.getStacktrace().startsWith("java.lang.RuntimeException"));
}
diff --git a/src/kylin-it/src/test/java/org/apache/kylin/query/engine/QueryExecTest.java b/src/kylin-it/src/test/java/org/apache/kylin/query/engine/QueryExecTest.java
index 7d7fcaba7c..a13cd7fb6a 100644
--- a/src/kylin-it/src/test/java/org/apache/kylin/query/engine/QueryExecTest.java
+++ b/src/kylin-it/src/test/java/org/apache/kylin/query/engine/QueryExecTest.java
@@ -75,8 +75,6 @@ public class QueryExecTest extends NLocalFileMetadataTestCase {
*/
@Test
public void testWorkWithoutKapAggregateReduceFunctionsRule() throws SQLException {
- // Can not reproduce https://github.com/Kyligence/KAP/issues/15261 at 4.x
- // we needn't introduce KapAggregateReduceFunctionsRule as we did in 3.x
overwriteSystemProp("kylin.query.convert-sum-expression-enabled", "true");
String SQL = "select sum(t.a1 * 2) from ("
+ "select sum(price/2) as a1, sum(ITEM_COUNT) as a2 from TEST_KYLIN_FACT group by LSTG_FORMAT_NAME"
diff --git a/src/kylin-it/src/test/resources/springframework/conf/applicationContext.xml b/src/kylin-it/src/test/resources/springframework/conf/applicationContext.xml
index 9f24b882db..90b372bc37 100644
--- a/src/kylin-it/src/test/resources/springframework/conf/applicationContext.xml
+++ b/src/kylin-it/src/test/resources/springframework/conf/applicationContext.xml
@@ -34,12 +34,12 @@
<context:component-scan base-package="org.apache.kylin">
<!--
WORKAROUND: KY-1265 introduced SecurityConfig which will cause test case failure:
- * io.kyligence.kap.rest.controller.NModelControllerTest
- * io.kyligence.kap.server.NModelControllerWithRealServiceTest
- * io.kyligence.kap.rest.controller.NProjectControllerTest
- * io.kyligence.kap.rest.controller.NQueryControllerTest
- * io.kyligence.kap.rest.controller.NUserControllerTest
- * io.kyligence.kap.event.ModelSemanticTest
+ * org.apache.kylin.rest.controller.NModelControllerTest
+ * org.apache.kylin.server.NModelControllerWithRealServiceTest
+ * org.apache.kylin.rest.controller.NProjectControllerTest
+ * org.apache.kylin.rest.controller.NQueryControllerTest
+ * org.apache.kylin.rest.controller.NUserControllerTest
+ * org.apache.kylin.event.ModelSemanticTest
-->
<context:exclude-filter type="aspectj" expression="org.apache.kylin.rest.config.SecurityConfig"/>
</context:component-scan>
diff --git a/src/modeling-service/src/test/resources/ut_meta/internal_measure.model_desc/nmodel_test_expected.json b/src/modeling-service/src/test/resources/ut_meta/internal_measure.model_desc/nmodel_test_expected.json
index e412c43f77..7a0920b2e6 100644
--- a/src/modeling-service/src/test/resources/ut_meta/internal_measure.model_desc/nmodel_test_expected.json
+++ b/src/modeling-service/src/test/resources/ut_meta/internal_measure.model_desc/nmodel_test_expected.json
@@ -1 +1 @@
-{"uuid":"","last_modified":0,"create_time":0,"version":"4.0.0.0","alias":null,"owner":null,"config_last_modifier":null,"config_last_modified":0,"description":null,"fact_table":null,"fact_table_alias":null,"management_type":"TABLE_ORIENTED","filter_condition":null,"partition_desc":null,"capacity":"MEDIUM","segment_config":{"auto_merge_enabled":null,"auto_merge_time_ranges":null,"volatile_range":null,"retention_range":null,"create_empty_segment_enabled":false},"data_check_desc":null,"seman [...]
\ No newline at end of file
+{"uuid":"","last_modified":0,"create_time":0,"version":"5.0.0.0","alias":null,"owner":null,"config_last_modifier":null,"config_last_modified":0,"description":null,"fact_table":null,"fact_table_alias":null,"management_type":"TABLE_ORIENTED","filter_condition":null,"partition_desc":null,"capacity":"MEDIUM","segment_config":{"auto_merge_enabled":null,"auto_merge_time_ranges":null,"volatile_range":null,"retention_range":null,"create_empty_segment_enabled":false},"data_check_desc":null,"seman [...]
\ No newline at end of file
diff --git a/src/query-booter/src/main/resources/config/config_library.csv b/src/query-booter/src/main/resources/config/config_library.csv
index 5f9429c661..631c673653 100644
--- a/src/query-booter/src/main/resources/config/config_library.csv
+++ b/src/query-booter/src/main/resources/config/config_library.csv
@@ -120,7 +120,7 @@ kylin.engine.streaming-segment-merge-ratio,Double,流式 segment 合并比率,St
kylin.engine.streaming-segment-merge-threshold,Int,实时OLAP构建触发合并segment的条件,Real -time OLAP constructs the condition for triggering the combination of segment,TRUE,TRUE
kylin.engine.streaming-trigger-once,boolean,实时OLAP构建仅触发一次,Real -time OLAP construction only triggers once,TRUE,TRUE
kylin.engine.submit-hadoop-conf-dir,String,hadoop conf 目录,Hadoop Conf directory,TRUE,TRUE
-kylin.env,String,Kyligence Enterprise 部署模式,Kyligence Enterprise deployment mode,TRUE,TRUE
+kylin.env,String,Kylin 5.0 部署模式,Kylin 5.0 deployment mode,TRUE,TRUE
kylin.env.channel,String,判断当前部署环境,Determine the current deployment environment,TRUE,TRUE
kylin.env.engine-write-fs,String,配置构建写集群,Configuration Construction Writing Cluster,TRUE,TRUE
kylin.env.hdfs-data-working-dir,String,数据存储路径，可以和working-dir分开,Data storage paths can be separated from Working-DIR,TRUE,TRUE
@@ -256,7 +256,7 @@ kylin.metadata.key-case-insensitive,boolean,当本地用户、用户组较多影
kylin.metadata.ops-cron,boolean,定时备份元数据、垃圾清理的定时任务 cron 表达式，默认值是 0 0 0 * * *,"Timing backup metad data, the timing task of garbage clearance CRON expression, the default value is 0 0 0 * * * *",TRUE,TRUE
kylin.metadata.random-admin-password.enabled,boolean,admin使用随机密码,admin uses random passwords,TRUE,TRUE
kylin.metadata.semi-automatic-mode,boolean,前端：当前project 是否含有半自动的标志；后端：是否默认使用半自动档,Front end: whether the current Project contains semi -automatic signs; back -end: Whether the semi -automatic file is used by default,TRUE,TRUE
-kylin.metadata.url,String,Kyligence Enterprise 元数据库路径。,Kyligence Enterprise metad database path.,TRUE,TRUE
+kylin.metadata.url,String,Kylin 5.0 元数据库路径。,Kylin 5.0 metad database path.,TRUE,TRUE
kylin.metadata.validate-computed-column,boolean,是否检验可计算列,Whether to test can be calculated,TRUE,TRUE
kylin.metrics.daily-influx-db,String,按天归档influxdb数据的数据库,Database of InfluxDB data by the day,TRUE,TRUE
kylin.metrics.daily-max-retry-times,Int,按天归档influxdb数据时异常后重试次数,Archive by the day when INFLUXDB data is abnormal,TRUE,TRUE
@@ -323,7 +323,7 @@ kylin.query.engine.sparder-enabled,boolean,是否启用sparder引擎,Whether to
kylin.query.engine.spark-scheduler-mode,String,spark 调度模式,spark scheduling mode,TRUE,TRUE
kylin.query.engine.spark-sql-shuffle-partitions,Int,spark sql 中 join 或 aggregations 时的分区数,The number of partitions in spark sql when join or aggregations,TRUE,TRUE
kylin.query.engine.split-group-sets-into-union,boolean,是否对 grouping sets 进行拆开处理,Whether the Grouping Sets is disassembled and processed,TRUE,TRUE
-kylin.query.escape-default-keyword,boolean,"Kyligence Enterprise 会自动为 default 转为""DEFAULT""。","Kyligence Enterprise will automatically convert to ""Default"" for Default.",TRUE,TRUE
+kylin.query.escape-default-keyword,boolean,"Kylin 5.0 会自动为 default 转为""DEFAULT""。","Kylin 5.0 will automatically convert to ""Default"" for Default.",TRUE,TRUE
kylin.query.exception-cache-enabled,boolean,是否缓存失败的查询,Whether to cache failure query,TRUE,TRUE
kylin.query.exception-cache-threshold-duration,Int,需要缓存异常查询的最小查询时间,The minimum query time that needs to be cached abnormal query,TRUE,TRUE
kylin.query.exception-cache-threshold-times,Int,需要缓存异常查询的最大失败次数,The maximum failure of cache abnormal query,TRUE,TRUE
@@ -447,7 +447,7 @@ kylin.server.https.port,Int,https端口号,https port number,TRUE,TRUE
kylin.server.leader-race.enabled,boolean,是否打开HA开关,Whether to turn on the HA switch,TRUE,TRUE
kylin.server.leader-race.heart-beat-interval,Int,HA更新心跳频率，单位s,"HA update heartbeat frequency, unit S",TRUE,TRUE
kylin.server.leader-race.heart-beat-timeout,Int,HA心跳超时时长，单位s,"HA's heartbeat time timeout, unit S",TRUE,TRUE
-kylin.server.mode,String,Kyligence Enterprise 实例的运行模式，参数值可以是 all 或 query 中的一个，默认值为 all。,"The running mode of the Kyligence Enterprise instance can be one of the parameter values in ALL or Query, and the default value is ALL.",TRUE,TRUE
+kylin.server.mode,String,Kylin 5.0 实例的运行模式，参数值可以是 all 或 query 中的一个，默认值为 all。,"The running mode of the Kylin 5.0 instance can be one of the parameter values in ALL or Query, and the default value is ALL.",TRUE,TRUE
kylin.server.renew-batch-size,Int,epoch renew批量更新一次最多更新的个数,EPOCH Renew Batch Update Most Updated Number,TRUE,TRUE
kylin.server.renew-epoch-pool-size,Int,renew epoch 的线程池大小,Renew epoch's thread pool size,TRUE,TRUE
kylin.server.streaming-change-meta,boolean,流式事务可以修改元数据,Streaming transactions can modify metadata data,TRUE,TRUE
@@ -540,7 +540,7 @@ kylin.web.export-allow-other,boolean,是否允许非 Admin 用户导出查询结
kylin.web.properties.whitelist,String,提供给前端使用的配置项列表,Configuration items provided to the front -end use,TRUE,TRUE
kylin.web.session.jdbc-encode-enabled,boolean,session id存入数据库中是否加密,Session ID is encrypted into the database,TRUE,TRUE
kylin.web.session.secure-random-create-enabled,boolean,session id存入数据库中是否加密,Session ID is encrypted into the database,TRUE,TRUE
-kylin.web.timezone,String,Kyligence Enterprise 的 REST 服务所使用的时区。默认值为本地机器的系统的时区。,The time zone used by Kyligence Enterprise's REST service. The default value is the time zone of the system of the local machine.,TRUE,TRUE
+kylin.web.timezone,String,Kylin 5.0 的 REST 服务所使用的时区。默认值为本地机器的系统的时区。,The time zone used by Kylin 5.0's REST service. The default value is the time zone of the system of the local machine.,TRUE,TRUE
server.port,Int,服务启动的端口,The port of the service start,TRUE,TRUE
spring.session.store-type,String,spring session 存储类型,Spring session storage type,TRUE,TRUE
kylin.engine.dynamic-resource-plan-enabled,boolean,在FI平台使用动态资源计划时候，有可能导致无法分配资源，从而构建失败,"When using a dynamic resource plan on the FI platform, it may lead to the failure to allocate resources and build a failure",TRUE,TRUE
diff --git a/src/query-common/src/main/java/org/apache/kylin/query/relnode/ContextUtil.java b/src/query-common/src/main/java/org/apache/kylin/query/relnode/ContextUtil.java
index 766335ce7a..ea7c417d2b 100644
--- a/src/query-common/src/main/java/org/apache/kylin/query/relnode/ContextUtil.java
+++ b/src/query-common/src/main/java/org/apache/kylin/query/relnode/ContextUtil.java
@@ -149,7 +149,6 @@ public class ContextUtil {
hasCountConstant);
} else {
- //https://github.com/Kyligence/KAP/issues/9952
//do not support agg pushdown if WindowRel, SortRel, LimitRel, ValueRel is met
return false;
}
diff --git a/src/query-service/src/test/java/org/apache/kylin/rest/service/QueryCompositeMemcachedCacheTest.java b/src/query-service/src/test/java/org/apache/kylin/rest/service/QueryCompositeMemcachedCacheTest.java
index 2c97ac37e6..a94628ea5f 100644
--- a/src/query-service/src/test/java/org/apache/kylin/rest/service/QueryCompositeMemcachedCacheTest.java
+++ b/src/query-service/src/test/java/org/apache/kylin/rest/service/QueryCompositeMemcachedCacheTest.java
@@ -52,6 +52,7 @@ import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
+import org.junit.Ignore;
import org.junit.Test;
import org.mockito.InjectMocks;
import org.mockito.Mockito;
@@ -61,6 +62,7 @@ import org.mockito.Spy;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+@Ignore
public class QueryCompositeMemcachedCacheTest extends LocalFileMetadataTestCase {
static {
diff --git a/src/query/src/main/java/io/kyligence/kap/query/optrule/ExtensionOlapJoinRule.java b/src/query/src/main/java/io/kyligence/kap/query/optrule/ExtensionOlapJoinRule.java
index 6732429376..6264572b08 100644
--- a/src/query/src/main/java/io/kyligence/kap/query/optrule/ExtensionOlapJoinRule.java
+++ b/src/query/src/main/java/io/kyligence/kap/query/optrule/ExtensionOlapJoinRule.java
@@ -66,7 +66,6 @@ public class ExtensionOlapJoinRule extends ConverterRule {
final JoinInfo info = JoinInfo.of(left, right, join.getCondition());
- // handle powerbi inner join, see https://github.com/Kyligence/KAP/issues/1823
Join tmpJoin = transformJoinCondition(join, info, traitSet, left, right);
if (tmpJoin instanceof OLAPJoinRel) {
return tmpJoin;
diff --git a/src/query/src/main/java/io/kyligence/kap/query/optrule/KapJoinRule.java b/src/query/src/main/java/io/kyligence/kap/query/optrule/KapJoinRule.java
index 8e82375827..5b364b3663 100644
--- a/src/query/src/main/java/io/kyligence/kap/query/optrule/KapJoinRule.java
+++ b/src/query/src/main/java/io/kyligence/kap/query/optrule/KapJoinRule.java
@@ -81,7 +81,7 @@ public class KapJoinRule extends ConverterRule {
final JoinInfo info = JoinInfo.of(left, right, join.getCondition());
- // handle powerbi inner join, see https://github.com/Kyligence/KAP/issues/1823
+ // handle powerbi inner join
Join tmpJoin = transformJoinCondition(join, info, traitSet, left, right);
if (tmpJoin instanceof KapJoinRel) {
return tmpJoin;
diff --git a/src/query/src/main/java/io/kyligence/kap/query/optrule/SumBasicOperatorRule.java b/src/query/src/main/java/io/kyligence/kap/query/optrule/SumBasicOperatorRule.java
index 8671b0d805..e3570cb730 100644
--- a/src/query/src/main/java/io/kyligence/kap/query/optrule/SumBasicOperatorRule.java
+++ b/src/query/src/main/java/io/kyligence/kap/query/optrule/SumBasicOperatorRule.java
@@ -361,7 +361,6 @@ public class SumBasicOperatorRule extends RelOptRule {
private void verifyPlusOrMinus(RexCall exprCall) {
// plus or minus does not support SUM EXPRESSION caused by null values
- // please see https://github.com/Kyligence/KAP/issues/14627
throw new SumExprUnSupportException("That PLUS/MINUS of the columns is not supported for sum expression");
}
diff --git a/src/query/src/main/java/org/apache/kylin/query/engine/SQLConverter.java b/src/query/src/main/java/org/apache/kylin/query/engine/SQLConverter.java
index 201bd469b8..e80bdfbb83 100644
--- a/src/query/src/main/java/org/apache/kylin/query/engine/SQLConverter.java
+++ b/src/query/src/main/java/org/apache/kylin/query/engine/SQLConverter.java
@@ -184,7 +184,6 @@ public class SQLConverter {
}
/* OVERRIDE POINT */
- // https://github.com/Kyligence/KAP/issues/10964
RelNode rel = root.rel;
if (connectionConfig.projectUnderRelRoot() && !root.isRefTrivial()) {
final List<RexNode> projects = new ArrayList<>();
diff --git a/src/query/src/test/java/org/apache/kylin/query/relnode/ContextUtilTest.java b/src/query/src/test/java/org/apache/kylin/query/relnode/ContextUtilTest.java
index 11608c5827..85859077ae 100644
--- a/src/query/src/test/java/org/apache/kylin/query/relnode/ContextUtilTest.java
+++ b/src/query/src/test/java/org/apache/kylin/query/relnode/ContextUtilTest.java
@@ -30,7 +30,6 @@ import org.mockito.Mockito;
public class ContextUtilTest {
- //https://github.com/Kyligence/KAP/issues/9952
//do not support agg pushdown if WindowRel, SortRel, LimitRel, ValueRel is met
@Test
public void testDerivedFromSameContextWhenMetWindowOrSort() throws Exception {
diff --git a/src/query/src/test/java/org/apache/kylin/query/util/ExpressionComparatorTest.java b/src/query/src/test/java/org/apache/kylin/query/util/ExpressionComparatorTest.java
index 60fedb60a3..b7be5e5aba 100644
--- a/src/query/src/test/java/org/apache/kylin/query/util/ExpressionComparatorTest.java
+++ b/src/query/src/test/java/org/apache/kylin/query/util/ExpressionComparatorTest.java
@@ -139,7 +139,6 @@ class ExpressionComparatorTest {
@Test
void testNoNPE() {
- //https://github.com/Kyligence/KAP/issues/10934
String sql0 = "select a.a + a.b + a.c from t as a";
String sql1 = "select a.a + a.b + a.c from t as a";
String sql2 = "select 1";
diff --git a/src/query/src/test/java/org/apache/kylin/query/util/QueryUtilTest.java b/src/query/src/test/java/org/apache/kylin/query/util/QueryUtilTest.java
index 8a703d262a..3d0ac0f1c5 100644
--- a/src/query/src/test/java/org/apache/kylin/query/util/QueryUtilTest.java
+++ b/src/query/src/test/java/org/apache/kylin/query/util/QueryUtilTest.java
@@ -264,10 +264,10 @@ public class QueryUtilTest extends NLocalFileMetadataTestCase {
final Exception exception = new IllegalStateException(
"\tThere is no column\t'age' in table 'test_kylin_fact'.\n"
- + "Please contact Kyligence Enterprise technical support for more details.\n");
+ + "Please contact Kylin 5.0 technical support for more details.\n");
final String errorMsg = QueryUtil.makeErrorMsgUserFriendly(exception);
Assert.assertEquals("There is no column\t'age' in table 'test_kylin_fact'.\n"
- + "Please contact Kyligence Enterprise technical support for more details.", errorMsg);
+ + "Please contact Kylin 5.0 technical support for more details.", errorMsg);
}
@Test
diff --git a/src/server/src/main/java/org/apache/kylin/rest/BootstrapServer.java b/src/server/src/main/java/org/apache/kylin/rest/BootstrapServer.java
index 474ccad787..fd436c4c73 100644
--- a/src/server/src/main/java/org/apache/kylin/rest/BootstrapServer.java
+++ b/src/server/src/main/java/org/apache/kylin/rest/BootstrapServer.java
@@ -130,7 +130,7 @@ public class BootstrapServer implements ISmartApplicationListenerForSystem {
if (event instanceof ApplicationReadyEvent) {
logger.info("init backend end...");
} else if (event instanceof ContextClosedEvent) {
- logger.info("Stop Kyligence node...");
+ logger.info("Stop Kylin 5 node...");
EpochManager.getInstance().releaseOwnedEpochs();
}
}
diff --git a/src/server/src/main/java/org/apache/kylin/rest/InitConfiguration.java b/src/server/src/main/java/org/apache/kylin/rest/InitConfiguration.java
index e1fa6928aa..99e675154c 100644
--- a/src/server/src/main/java/org/apache/kylin/rest/InitConfiguration.java
+++ b/src/server/src/main/java/org/apache/kylin/rest/InitConfiguration.java
@@ -46,7 +46,7 @@ public class InitConfiguration {
public void init() {
if (KylinConfig.getInstanceFromEnv().isCheckHostname() && hostInfoFetcher.getHostname().indexOf("_") != -1) {
throw new KylinRuntimeException("The hostname does not support containing '_' characters,"
- + " please modify the hostname of Kyligence Enterprise nodes.");
+ + " please modify the hostname of Kylin 5.0 nodes.");
}
}
diff --git a/src/server/src/main/java/org/apache/kylin/rest/config/SwaggerConfig.java b/src/server/src/main/java/org/apache/kylin/rest/config/SwaggerConfig.java
index c153787696..a9270561b0 100644
--- a/src/server/src/main/java/org/apache/kylin/rest/config/SwaggerConfig.java
+++ b/src/server/src/main/java/org/apache/kylin/rest/config/SwaggerConfig.java
@@ -37,7 +37,7 @@ public class SwaggerConfig {
public static final String LICENSE = "Apache 2.0";
public static final String SWAGGER_LICENSE_URL = "http://www.apache.org/licenses/LICENSE-2.0.html";
- public static final String TITLE = "Kyligence Enterprise API";
+ public static final String TITLE = "Kylin 5.0 API";
@Order(2)
@Bean(value = "v4 public")
diff --git a/src/server/src/main/resources/config/config_library.csv b/src/server/src/main/resources/config/config_library.csv
index 5f9429c661..631c673653 100644
--- a/src/server/src/main/resources/config/config_library.csv
+++ b/src/server/src/main/resources/config/config_library.csv
@@ -120,7 +120,7 @@ kylin.engine.streaming-segment-merge-ratio,Double,流式 segment 合并比率,St
kylin.engine.streaming-segment-merge-threshold,Int,实时OLAP构建触发合并segment的条件,Real -time OLAP constructs the condition for triggering the combination of segment,TRUE,TRUE
kylin.engine.streaming-trigger-once,boolean,实时OLAP构建仅触发一次,Real -time OLAP construction only triggers once,TRUE,TRUE
kylin.engine.submit-hadoop-conf-dir,String,hadoop conf 目录,Hadoop Conf directory,TRUE,TRUE
-kylin.env,String,Kyligence Enterprise 部署模式,Kyligence Enterprise deployment mode,TRUE,TRUE
+kylin.env,String,Kylin 5.0 部署模式,Kylin 5.0 deployment mode,TRUE,TRUE
kylin.env.channel,String,判断当前部署环境,Determine the current deployment environment,TRUE,TRUE
kylin.env.engine-write-fs,String,配置构建写集群,Configuration Construction Writing Cluster,TRUE,TRUE
kylin.env.hdfs-data-working-dir,String,数据存储路径，可以和working-dir分开,Data storage paths can be separated from Working-DIR,TRUE,TRUE
@@ -256,7 +256,7 @@ kylin.metadata.key-case-insensitive,boolean,当本地用户、用户组较多影
kylin.metadata.ops-cron,boolean,定时备份元数据、垃圾清理的定时任务 cron 表达式，默认值是 0 0 0 * * *,"Timing backup metad data, the timing task of garbage clearance CRON expression, the default value is 0 0 0 * * * *",TRUE,TRUE
kylin.metadata.random-admin-password.enabled,boolean,admin使用随机密码,admin uses random passwords,TRUE,TRUE
kylin.metadata.semi-automatic-mode,boolean,前端：当前project 是否含有半自动的标志；后端：是否默认使用半自动档,Front end: whether the current Project contains semi -automatic signs; back -end: Whether the semi -automatic file is used by default,TRUE,TRUE
-kylin.metadata.url,String,Kyligence Enterprise 元数据库路径。,Kyligence Enterprise metad database path.,TRUE,TRUE
+kylin.metadata.url,String,Kylin 5.0 元数据库路径。,Kylin 5.0 metad database path.,TRUE,TRUE
kylin.metadata.validate-computed-column,boolean,是否检验可计算列,Whether to test can be calculated,TRUE,TRUE
kylin.metrics.daily-influx-db,String,按天归档influxdb数据的数据库,Database of InfluxDB data by the day,TRUE,TRUE
kylin.metrics.daily-max-retry-times,Int,按天归档influxdb数据时异常后重试次数,Archive by the day when INFLUXDB data is abnormal,TRUE,TRUE
@@ -323,7 +323,7 @@ kylin.query.engine.sparder-enabled,boolean,是否启用sparder引擎,Whether to
kylin.query.engine.spark-scheduler-mode,String,spark 调度模式,spark scheduling mode,TRUE,TRUE
kylin.query.engine.spark-sql-shuffle-partitions,Int,spark sql 中 join 或 aggregations 时的分区数,The number of partitions in spark sql when join or aggregations,TRUE,TRUE
kylin.query.engine.split-group-sets-into-union,boolean,是否对 grouping sets 进行拆开处理,Whether the Grouping Sets is disassembled and processed,TRUE,TRUE
-kylin.query.escape-default-keyword,boolean,"Kyligence Enterprise 会自动为 default 转为""DEFAULT""。","Kyligence Enterprise will automatically convert to ""Default"" for Default.",TRUE,TRUE
+kylin.query.escape-default-keyword,boolean,"Kylin 5.0 会自动为 default 转为""DEFAULT""。","Kylin 5.0 will automatically convert to ""Default"" for Default.",TRUE,TRUE
kylin.query.exception-cache-enabled,boolean,是否缓存失败的查询,Whether to cache failure query,TRUE,TRUE
kylin.query.exception-cache-threshold-duration,Int,需要缓存异常查询的最小查询时间,The minimum query time that needs to be cached abnormal query,TRUE,TRUE
kylin.query.exception-cache-threshold-times,Int,需要缓存异常查询的最大失败次数,The maximum failure of cache abnormal query,TRUE,TRUE
@@ -447,7 +447,7 @@ kylin.server.https.port,Int,https端口号,https port number,TRUE,TRUE
kylin.server.leader-race.enabled,boolean,是否打开HA开关,Whether to turn on the HA switch,TRUE,TRUE
kylin.server.leader-race.heart-beat-interval,Int,HA更新心跳频率，单位s,"HA update heartbeat frequency, unit S",TRUE,TRUE
kylin.server.leader-race.heart-beat-timeout,Int,HA心跳超时时长，单位s,"HA's heartbeat time timeout, unit S",TRUE,TRUE
-kylin.server.mode,String,Kyligence Enterprise 实例的运行模式，参数值可以是 all 或 query 中的一个，默认值为 all。,"The running mode of the Kyligence Enterprise instance can be one of the parameter values in ALL or Query, and the default value is ALL.",TRUE,TRUE
+kylin.server.mode,String,Kylin 5.0 实例的运行模式，参数值可以是 all 或 query 中的一个，默认值为 all。,"The running mode of the Kylin 5.0 instance can be one of the parameter values in ALL or Query, and the default value is ALL.",TRUE,TRUE
kylin.server.renew-batch-size,Int,epoch renew批量更新一次最多更新的个数,EPOCH Renew Batch Update Most Updated Number,TRUE,TRUE
kylin.server.renew-epoch-pool-size,Int,renew epoch 的线程池大小,Renew epoch's thread pool size,TRUE,TRUE
kylin.server.streaming-change-meta,boolean,流式事务可以修改元数据,Streaming transactions can modify metadata data,TRUE,TRUE
@@ -540,7 +540,7 @@ kylin.web.export-allow-other,boolean,是否允许非 Admin 用户导出查询结
kylin.web.properties.whitelist,String,提供给前端使用的配置项列表,Configuration items provided to the front -end use,TRUE,TRUE
kylin.web.session.jdbc-encode-enabled,boolean,session id存入数据库中是否加密,Session ID is encrypted into the database,TRUE,TRUE
kylin.web.session.secure-random-create-enabled,boolean,session id存入数据库中是否加密,Session ID is encrypted into the database,TRUE,TRUE
-kylin.web.timezone,String,Kyligence Enterprise 的 REST 服务所使用的时区。默认值为本地机器的系统的时区。,The time zone used by Kyligence Enterprise's REST service. The default value is the time zone of the system of the local machine.,TRUE,TRUE
+kylin.web.timezone,String,Kylin 5.0 的 REST 服务所使用的时区。默认值为本地机器的系统的时区。,The time zone used by Kylin 5.0's REST service. The default value is the time zone of the system of the local machine.,TRUE,TRUE
server.port,Int,服务启动的端口,The port of the service start,TRUE,TRUE
spring.session.store-type,String,spring session 存储类型,Spring session storage type,TRUE,TRUE
kylin.engine.dynamic-resource-plan-enabled,boolean,在FI平台使用动态资源计划时候，有可能导致无法分配资源，从而构建失败,"When using a dynamic resource plan on the FI platform, it may lead to the failure to allocate resources and build a failure",TRUE,TRUE
diff --git a/src/systools/pom.xml b/src/systools/pom.xml
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/systools/src/test/resources/ehcache.xml b/src/systools/src/test/resources/ehcache.xml
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/tool/src/main/java/org/apache/kylin/tool/util/ServerInfoUtil.java b/src/tool/src/main/java/org/apache/kylin/tool/util/ServerInfoUtil.java
index d78b76203d..6a250bfddc 100644
--- a/src/tool/src/main/java/org/apache/kylin/tool/util/ServerInfoUtil.java
+++ b/src/tool/src/main/java/org/apache/kylin/tool/util/ServerInfoUtil.java
@@ -51,9 +51,9 @@ public class ServerInfoUtil {
kapVersion = FileUtils.readFileToString(versionFile).trim();
}
} catch (Exception e) {
- logger.error("Failed to get kap.version. ", e);
+ logger.error("Failed to get kylin.version. ", e);
}
- buf.append("kap.version:").append(kapVersion == null ? UNKNOWN : kapVersion).append("\n");
+ buf.append("kylin.version:").append(kapVersion == null ? UNKNOWN : kapVersion).append("\n");
// others
buf.append("commit:").append(gitCommit).append("\n");
diff --git a/src/tool/src/test/java/org/apache/kylin/tool/AbstractInfoExtractorToolTest.java b/src/tool/src/test/java/org/apache/kylin/tool/AbstractInfoExtractorToolTest.java
index 641bed2d75..ac18d5b841 100644
--- a/src/tool/src/test/java/org/apache/kylin/tool/AbstractInfoExtractorToolTest.java
+++ b/src/tool/src/test/java/org/apache/kylin/tool/AbstractInfoExtractorToolTest.java
@@ -102,9 +102,9 @@ public class AbstractInfoExtractorToolTest extends NLocalFileMetadataTestCase {
MockInfoExtractorTool mock = new MockInfoExtractorTool();
File license = new File(ToolUtil.getKylinHome(), "LICENSE");
- String licenseInfo = "Evaluation license for Kyligence Enterprise\n" + "Category: 4.x\n" + "SLA Service: NO\n"
+ String licenseInfo = "Evaluation license for Kylin 5.0\n" + "Category: 4.x\n" + "SLA Service: NO\n"
+ "Volume: 1\n" + "Level: professional\n"
- + "Insight License: 5 users; evaluation; 2019-06-01,2019-07-30\n" + "====\n" + "Kyligence Enterprise\n"
+ + "Insight License: 5 users; evaluation; 2019-06-01,2019-07-30\n" + "====\n" + "Kylin 5.0\n"
+ "2019-06-01,2019-07-30\n"
+ "19d4801b6dardchr83bp3i7wadbdvycs8ay7ibicu2msfogl6kiwz7z3dmdizepmicl3bgqznn34794jt5g51sutofcfpn9jeiw5k3cvt2750faxw7ip1fp08mt3og6xijt4x02euf1zkrn5m7huwal8lqms3gmn0d5i8y2dqlvkvpqtwz3m9tqcnq6n4lznthbdtfncdqsly7a8v9pndh1cav2tdcczzs17ns6e0d4izeatwybr25lir5f5s6qe4ry10x2fkqco7unb4h4ivx8jo6vdb5sp3r4738zhlvrbdwfa38s3wh82lrnugrhxq8eap3rebq9dz8xka713aui4v2acquulicdadt63cv0biz7y7eccfh1tri60526b2bmon71k29n6p29tsbhyl2wdx5hsjuxg2wd993hcndot1fc5oz8kebopqrudyf4o7tjc5ca0bvtysnw3gn64c1sd2 [...]
FileUtils.writeStringToFile(license, licenseInfo);
diff --git a/src/tool/src/test/java/org/apache/kylin/tool/upgrade/UpdateUserAclToolTest.java b/src/tool/src/test/java/org/apache/kylin/tool/upgrade/UpdateUserAclToolTest.java
index eec36ce0f3..a82b34cde4 100644
--- a/src/tool/src/test/java/org/apache/kylin/tool/upgrade/UpdateUserAclToolTest.java
+++ b/src/tool/src/test/java/org/apache/kylin/tool/upgrade/UpdateUserAclToolTest.java
@@ -117,10 +117,10 @@ public class UpdateUserAclToolTest extends NLocalFileMetadataTestCase {
@Test
public void testParseVersion() {
- Assert.assertEquals("4.5.9", tool.parseVersion("Kyligence Enterprise 4.5.9"));
- Assert.assertEquals("4.5.9", tool.parseVersion("Kyligence Enterprise 4.5.9-dev"));
- Assert.assertEquals("4.5.9.0", tool.parseVersion("Kyligence Enterprise 4.5.9.0"));
- Assert.assertEquals("4.5.9.3299", tool.parseVersion("Kyligence Enterprise 4.5.9.3299"));
+ Assert.assertEquals("4.5.9", tool.parseVersion("Kylin 5.0 4.5.9"));
+ Assert.assertEquals("4.5.9", tool.parseVersion("Kylin 5.0 4.5.9-dev"));
+ Assert.assertEquals("4.5.9.0", tool.parseVersion("Kylin 5.0 4.5.9.0"));
+ Assert.assertEquals("4.5.9.3299", tool.parseVersion("Kylin 5.0 4.5.9.3299"));
}
@Test
diff --git a/src/tool/src/test/java/org/apache/kylin/tool/util/ServerInfoUtilTest.java b/src/tool/src/test/java/org/apache/kylin/tool/util/ServerInfoUtilTest.java
index 7022338e10..fb0cb5b7d3 100644
--- a/src/tool/src/test/java/org/apache/kylin/tool/util/ServerInfoUtilTest.java
+++ b/src/tool/src/test/java/org/apache/kylin/tool/util/ServerInfoUtilTest.java
@@ -54,7 +54,7 @@ public class ServerInfoUtilTest extends NLocalFileMetadataTestCase {
clearFileList.add(sha1File);
}
- String version = "Kyligence Enterprise 4.0.0-SNAPSHOT";
+ String version = "Kylin 5.0 4.0.0-SNAPSHOT";
File versionFile = new File(KylinConfig.getKylinHome(), "VERSION");
if (!versionFile.exists()) {
FileUtils.writeStringToFile(versionFile, version);
@@ -68,6 +68,6 @@ public class ServerInfoUtilTest extends NLocalFileMetadataTestCase {
}
Assert.assertTrue(buf.contains("commit:" + sha1.replace('\n', ';')));
- Assert.assertTrue(buf.contains("kap.version:" + version));
+ Assert.assertTrue(buf.contains("kylin.version:" + version));
}
}
diff --git a/src/tool/src/test/resources/diag/eventlog b/src/tool/src/test/resources/diag/eventlog
index f3c39b9851..20faf87073 100644
--- a/src/tool/src/test/resources/diag/eventlog
+++ b/src/tool/src/test/resources/diag/eventlog
@@ -1,5 +1,5 @@
{"Event":"SparkListenerLogStart","Spark Version":"3.1.1-kylin-4.x-r21"}
{"Event":"SparkListenerResourceProfileAdded","Resource Profile Id":0,"Executor Resource Requests":{"memoryOverhead":{"Resource Name":"memoryOverhead","Amount":512,"Discovery Script":"","Vendor":""},"cores":{"Resource Name":"cores","Amount":1,"Discovery Script":"","Vendor":""},"memory":{"Resource Name":"memory","Amount":512,"Discovery Script":"","Vendor":""},"offHeap":{"Resource Name":"offHeap","Amount":0,"Discovery Script":"","Vendor":""}},"Task Resource Requests":{"cpus":{"Resource Name [...]
{"Event":"SparkListenerBlockManagerAdded","Block Manager ID":{"Executor ID":"driver","Host":"sandbox.hortonworks.com","Port":42844},"Maximum Memory":4965217075,"Timestamp":1617822026015,"Maximum Onheap Memory":4965217075,"Maximum Offheap Memory":0}
-{"Event":"SparkListenerEnvironmentUpdate","JVM Information":{"Java Home":"/usr/lib/jvm/jdk1.8.0_171/jre","Java Version":"1.8.0_171 (Oracle Corporation)","Scala Version":"version 2.12.10"},"Spark Properties":{"spark.port.maxRetries":"128","spark.yarn.dist.files":"/root/zhoujiazhi/test/server/conf/spark-executor-log4j.xml,/root/zhoujiazhi/test/server/conf/spark-appmaster-log4j.xml","spark.scheduler.allocation.file":"/root/zhoujiazhi/test/conf/fairscheduler.xml","spark.executor.extraJavaOpt [...]
+{"Event":"SparkListenerEnvironmentUpdate","JVM Information":{"Java Home":"/usr/lib/jvm/jdk1.8.0_171/jre","Java Version":"1.8.0_171 (Oracle Corporation)","Scala Version":"version 2.12.10"},"Spark Properties":{"spark.port.maxRetries":"128","spark.yarn.dist.files":"/root/zhoujiazhi/test/server/conf/spark-executor-log4j.xml,/root/zhoujiazhi/test/server/conf/spark-appmaster-log4j.xml","spark.scheduler.allocation.file":"/root/zhoujiazhi/test/conf/fairscheduler.xml","spark.executor.extraJavaOpt [...]
{"Event":"SparkListenerApplicationStart","App Name":"sparder-root-sandbox.hortonworks.com","App ID":"application_1617666536623_0144","Timestamp":1617822012674,"User":"root"}
[kylin] 06/09: KYLIN-5519 DateFormatTest shouldn't rely on user's timezone
Posted by xx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xxyu pushed a commit to branch kylin5
in repository https://gitbox.apache.org/repos/asf/kylin.git
commit e5a526ee1ede46f50059ac2e730d818efa283b94
Author: Shaofeng Shi <sh...@apache.org>
AuthorDate: Wed Apr 19 15:51:45 2023 +0800
KYLIN-5519 DateFormatTest shouldn't rely on user's timezone
---
.../org/apache/kylin/common/util/DateFormat.java | 29 +++++++---
.../apache/kylin/common/util/DateFormatTest.java | 65 +++++++++++-----------
2 files changed, 54 insertions(+), 40 deletions(-)
diff --git a/src/core-common/src/main/java/org/apache/kylin/common/util/DateFormat.java b/src/core-common/src/main/java/org/apache/kylin/common/util/DateFormat.java
index f94cf91213..f3d31dd835 100644
--- a/src/core-common/src/main/java/org/apache/kylin/common/util/DateFormat.java
+++ b/src/core-common/src/main/java/org/apache/kylin/common/util/DateFormat.java
@@ -127,16 +127,17 @@ public class DateFormat {
}
public static FastDateFormat getDateFormat(String datePattern) {
- FastDateFormat r = formatMap.get(datePattern);
- if (r == null) {
- r = FastDateFormat.getInstance(datePattern, TimeZone.getDefault());
- formatMap.put(datePattern, r);
- }
- return r;
+ return getDateFormat(datePattern, TimeZone.getDefault());
}
public static FastDateFormat getDateFormat(String datePattern, TimeZone timeZone) {
- return FastDateFormat.getInstance(datePattern, timeZone);
+ String key = datePattern + timeZone.getID();
+ FastDateFormat r = formatMap.get(key);
+ if (r == null) {
+ r = FastDateFormat.getInstance(datePattern, timeZone);
+ formatMap.put(key, r);
+ }
+ return r;
}
public static String formatToCompactDateStr(long millis) {
@@ -197,20 +198,30 @@ public class DateFormat {
return stringToDate(str, DEFAULT_DATE_PATTERN);
}
+
public static Date stringToDate(String str, String pattern) {
+ return stringToDate(str, pattern, TimeZone.getDefault());
+ }
+
+ public static Date stringToDate(String str, String pattern, TimeZone timeZone) {
Date date;
try {
- date = getDateFormat(pattern).parse(str);
+ date = getDateFormat(pattern, timeZone).parse(str);
} catch (ParseException e) {
throw new IllegalArgumentException("'" + str + "' is not a valid date of pattern '" + pattern + "'", e);
}
return date;
}
+
public static long stringToMillis(String str) {
+ return stringToMillis(str, TimeZone.getDefault());
+ }
+
+ public static long stringToMillis(String str, TimeZone timeZone) {
for (Map.Entry<String, String> regexToPattern : dateFormatRegex.entrySet()) {
if (str.matches(regexToPattern.getKey()))
- return stringToDate(str, regexToPattern.getValue()).getTime();
+ return stringToDate(str, regexToPattern.getValue(), timeZone).getTime();
}
try {
diff --git a/src/core-common/src/test/java/org/apache/kylin/common/util/DateFormatTest.java b/src/core-common/src/test/java/org/apache/kylin/common/util/DateFormatTest.java
index 0387906235..df723d624a 100644
--- a/src/core-common/src/test/java/org/apache/kylin/common/util/DateFormatTest.java
+++ b/src/core-common/src/test/java/org/apache/kylin/common/util/DateFormatTest.java
@@ -23,6 +23,7 @@ import java.time.ZoneId;
import java.time.format.DateTimeParseException;
import java.util.Arrays;
import java.util.Date;
+import java.util.TimeZone;
import org.apache.kylin.common.exception.KylinException;
import org.apache.kylin.junit.annotation.MultiTimezoneTest;
@@ -196,43 +197,45 @@ public class DateFormatTest {
public void testStringToMillis() {
// 2022-12-01 00:00:00
long expectedMillis = 1669824000000L;
-
- Assert.assertEquals(expectedMillis, DateFormat.stringToMillis("2022.12.01 00:00"));
- Assert.assertEquals(expectedMillis, DateFormat.stringToMillis("202212"));
- Assert.assertEquals(expectedMillis, DateFormat.stringToMillis("2022.12.01 00:00:00"));
- Assert.assertEquals(expectedMillis, DateFormat.stringToMillis("2022-12-01 00:00:00:000"));
- Assert.assertEquals(expectedMillis, DateFormat.stringToMillis("20221201"));
- Assert.assertEquals(expectedMillis, DateFormat.stringToMillis("2022.12.01 00:00:00:000"));
- Assert.assertEquals(expectedMillis, DateFormat.stringToMillis("2022.12.01"));
- Assert.assertEquals(expectedMillis, DateFormat.stringToMillis("2022/12/01 00:00"));
- Assert.assertEquals(expectedMillis, DateFormat.stringToMillis("2022-12-01 00:00:00.000"));
- Assert.assertEquals(expectedMillis, DateFormat.stringToMillis("2022/12/01 00:00:00:000"));
- Assert.assertEquals(expectedMillis, DateFormat.stringToMillis("20221201 00:00"));
- Assert.assertEquals(expectedMillis, DateFormat.stringToMillis("2022-12-01 00:00"));
- Assert.assertEquals(expectedMillis, DateFormat.stringToMillis("20221201 00:00:00:000"));
- Assert.assertEquals(expectedMillis, DateFormat.stringToMillis("20221201 00:00:00"));
+ TimeZone timeZone = TimeZone.getTimeZone("GMT+8");
+
+ Assert.assertEquals(expectedMillis, DateFormat.stringToMillis("2022.12.01 00:00", timeZone));
+ Assert.assertEquals(expectedMillis, DateFormat.stringToMillis("202212", timeZone));
+ Assert.assertEquals(expectedMillis, DateFormat.stringToMillis("2022.12.01 00:00:00", timeZone));
+ Assert.assertEquals(expectedMillis, DateFormat.stringToMillis("2022-12-01 00:00:00:000", timeZone));
+ Assert.assertEquals(expectedMillis, DateFormat.stringToMillis("20221201", timeZone));
+ Assert.assertEquals(expectedMillis, DateFormat.stringToMillis("2022.12.01 00:00:00:000", timeZone));
+ Assert.assertEquals(expectedMillis, DateFormat.stringToMillis("2022.12.01", timeZone));
+ Assert.assertEquals(expectedMillis, DateFormat.stringToMillis("2022/12/01 00:00", timeZone));
+ Assert.assertEquals(expectedMillis, DateFormat.stringToMillis("2022-12-01 00:00:00.000", timeZone));
+ Assert.assertEquals(expectedMillis, DateFormat.stringToMillis("2022/12/01 00:00:00:000", timeZone));
+ Assert.assertEquals(expectedMillis, DateFormat.stringToMillis("20221201 00:00", timeZone));
+ Assert.assertEquals(expectedMillis, DateFormat.stringToMillis("2022-12-01 00:00", timeZone));
+ Assert.assertEquals(expectedMillis, DateFormat.stringToMillis("20221201 00:00:00:000", timeZone));
+ Assert.assertEquals(expectedMillis, DateFormat.stringToMillis("20221201 00:00:00", timeZone));
}
@Test
public void testStringToMillisSupplement() {
long expectedMillis = 1669824000000L;
- Assert.assertEquals(expectedMillis, DateFormat.stringToMillis("2022/12/01 00:00:00"));
- Assert.assertEquals(expectedMillis, DateFormat.stringToMillis("20221201T00:00:00.000Z"));
- Assert.assertEquals(expectedMillis, DateFormat.stringToMillis("2022-12"));
- Assert.assertEquals(expectedMillis, DateFormat.stringToMillis("2022.12.01T00:00:00.000Z"));
- Assert.assertEquals(expectedMillis, DateFormat.stringToMillis("2022-12-01"));
- Assert.assertEquals(expectedMillis, DateFormat.stringToMillis("2022-12-01 00:00:00"));
- Assert.assertEquals(expectedMillis, DateFormat.stringToMillis("2022/12/01"));
- Assert.assertEquals(expectedMillis, DateFormat.stringToMillis("20221201 00:00:00.000"));
- Assert.assertEquals(expectedMillis, DateFormat.stringToMillis("2022-12-01T00:00:00.000Z"));
- Assert.assertEquals(expectedMillis, DateFormat.stringToMillis("2022/12/01T00:00:00.000Z"));
- Assert.assertEquals(expectedMillis, DateFormat.stringToMillis("2022.12.01 00:00:00.000"));
- Assert.assertEquals(expectedMillis, DateFormat.stringToMillis("2022-12-01T00:00:00.000+08:00"));
- Assert.assertEquals(expectedMillis, DateFormat.stringToMillis("2022/12/01 00:00:00.000"));
- Assert.assertEquals(expectedMillis, DateFormat.stringToMillis("1669824000000000"));
- Assert.assertEquals(expectedMillis, DateFormat.stringToMillis("1669824000000"));
- Assert.assertEquals(expectedMillis, DateFormat.stringToMillis("1669824000"));
+ TimeZone timeZone = TimeZone.getTimeZone("GMT+8");
+ Assert.assertEquals(expectedMillis, DateFormat.stringToMillis("2022/12/01 00:00:00", timeZone));
+ Assert.assertEquals(expectedMillis, DateFormat.stringToMillis("20221201T00:00:00.000Z", timeZone));
+ Assert.assertEquals(expectedMillis, DateFormat.stringToMillis("2022-12", timeZone));
+ Assert.assertEquals(expectedMillis, DateFormat.stringToMillis("2022.12.01T00:00:00.000Z", timeZone));
+ Assert.assertEquals(expectedMillis, DateFormat.stringToMillis("2022-12-01", timeZone));
+ Assert.assertEquals(expectedMillis, DateFormat.stringToMillis("2022-12-01 00:00:00", timeZone));
+ Assert.assertEquals(expectedMillis, DateFormat.stringToMillis("2022/12/01", timeZone));
+ Assert.assertEquals(expectedMillis, DateFormat.stringToMillis("20221201 00:00:00.000", timeZone));
+ Assert.assertEquals(expectedMillis, DateFormat.stringToMillis("2022-12-01T00:00:00.000Z", timeZone));
+ Assert.assertEquals(expectedMillis, DateFormat.stringToMillis("2022/12/01T00:00:00.000Z", timeZone));
+ Assert.assertEquals(expectedMillis, DateFormat.stringToMillis("2022.12.01 00:00:00.000", timeZone));
+ Assert.assertEquals(expectedMillis, DateFormat.stringToMillis("2022-12-01T00:00:00.000+08:00", timeZone));
+ Assert.assertEquals(expectedMillis, DateFormat.stringToMillis("2022/12/01 00:00:00.000", timeZone));
+ Assert.assertEquals(expectedMillis, DateFormat.stringToMillis("1669824000000000", timeZone));
+ Assert.assertEquals(expectedMillis, DateFormat.stringToMillis("1669824000000", timeZone));
+ Assert.assertEquals(expectedMillis, DateFormat.stringToMillis("1669824000", timeZone));
}
@Test