This is an automated email from the ASF dual-hosted git repository. xxyu pushed a commit to branch kylin-on-parquet-v2 in repository https://gitbox.apache.org/repos/asf/kylin.git
commit db1eba82b3c6a538f9b12f814e77f410157e3a83 Author: XiaoxiangYu <hit_la...@126.com> AuthorDate: Mon Jul 27 23:39:39 2020 +0800 KYLIN-4660 remove some useless modules --- assembly/pom.xml | 10 +- engine-flink/pom.xml | 10 +- engine-mr/pom.xml | 21 +-- engine-spark/pom.xml | 10 +- .../kylin-spark-classloader/pom.xml | 2 +- kylin-spark-project/kylin-spark-engine/pom.xml | 22 +-- kylin-spark-project/kylin-spark-metadata/pom.xml | 2 +- kylin-spark-project/kylin-spark-query/pom.xml | 50 +----- kylin-spark-project/kylin-spark-test/pom.xml | 35 ++-- kylin-spark-project/pom.xml | 2 +- metrics-reporter-hive/pom.xml | 5 +- parquet-assembly/pom.xml | 28 ++-- pom.xml | 185 +++++++++++---------- server-base/pom.xml | 79 +++++---- server/pom.xml | 3 +- source-hive/pom.xml | 10 +- source-jdbc/pom.xml | 10 +- source-kafka/pom.xml | 10 +- storage-hbase/pom.xml | 25 +-- storage-stream/pom.xml | 10 +- stream-coordinator/pom.xml | 10 +- stream-core/pom.xml | 10 +- stream-receiver/pom.xml | 10 +- stream-source-kafka/pom.xml | 10 +- tool/pom.xml | 19 ++- 25 files changed, 260 insertions(+), 328 deletions(-) diff --git a/assembly/pom.xml b/assembly/pom.xml index 4934308..041b2c2 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -23,11 +23,11 @@ <artifactId>kylin-assembly</artifactId> <name>Apache Kylin - Assembly</name> - <parent> - <artifactId>kylin</artifactId> - <groupId>org.apache.kylin</groupId> - <version>4.0.0-SNAPSHOT</version> - </parent> +<!-- <parent>--> +<!-- <artifactId>kylin</artifactId>--> +<!-- <groupId>org.apache.kylin</groupId>--> +<!-- <version>4.0.0-SNAPSHOT</version>--> +<!-- </parent>--> <properties> <shadeBase>org.apache.kylin.job.shaded</shadeBase> diff --git a/engine-flink/pom.xml b/engine-flink/pom.xml index 40cff3c..b10f3e5 100644 --- a/engine-flink/pom.xml +++ b/engine-flink/pom.xml @@ -27,11 +27,11 @@ <name>Apache Kylin - Flink Engine</name> <description>Apache Kylin - Flink Engine</description> - <parent> - <artifactId>kylin</artifactId> - <groupId>org.apache.kylin</groupId> - <version>4.0.0-SNAPSHOT</version> - </parent> +<!-- <parent>--> +<!-- <artifactId>kylin</artifactId>--> +<!-- <groupId>org.apache.kylin</groupId>--> +<!-- <version>4.0.0-SNAPSHOT</version>--> +<!-- </parent>--> <dependencies> diff --git a/engine-mr/pom.xml b/engine-mr/pom.xml index 69ab4ab..44b77fa 100644 --- a/engine-mr/pom.xml +++ b/engine-mr/pom.xml @@ -25,11 +25,11 @@ <name>Apache Kylin - MapReduce Engine</name> <description>Apache Kylin - MapReduce Engine</description> - <parent> - <groupId>org.apache.kylin</groupId> - <artifactId>kylin</artifactId> - <version>4.0.0-SNAPSHOT</version> - </parent> +<!-- <parent>--> +<!-- <groupId>org.apache.kylin</groupId>--> +<!-- <artifactId>kylin</artifactId>--> +<!-- <version>4.0.0-SNAPSHOT</version>--> +<!-- </parent>--> <dependencies> <dependency> @@ -54,10 +54,6 @@ <groupId>org.apache.kylin</groupId> <artifactId>kylin-core-metrics</artifactId> </dependency> - <dependency> - <groupId>org.apache.kylin</groupId> - <artifactId>kylin-stream-core</artifactId> - </dependency> <!-- Env & Test --> <dependency> @@ -113,13 +109,6 @@ <artifactId>junit</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.kylin</groupId> - <artifactId>kylin-stream-core</artifactId> - <type>test-jar</type> - <version>${project.parent.version}</version> - <scope>test</scope> - </dependency> </dependencies> </project> diff --git a/engine-spark/pom.xml b/engine-spark/pom.xml index 33d9351..cc1d9d6 100644 --- a/engine-spark/pom.xml +++ b/engine-spark/pom.xml @@ -25,11 +25,11 @@ <name>Apache Kylin - Spark Engine</name> <description>Apache Kylin - Spark Engine</description> - <parent> - <groupId>org.apache.kylin</groupId> - <artifactId>kylin</artifactId> - <version>4.0.0-SNAPSHOT</version> - </parent> +<!-- <parent>--> +<!-- <groupId>org.apache.kylin</groupId>--> +<!-- <artifactId>kylin</artifactId>--> +<!-- <version>4.0.0-SNAPSHOT</version>--> +<!-- </parent>--> <dependencies> diff --git a/kylin-spark-project/kylin-spark-classloader/pom.xml b/kylin-spark-project/kylin-spark-classloader/pom.xml index 668d872..db06413 100644 --- a/kylin-spark-project/kylin-spark-classloader/pom.xml +++ b/kylin-spark-project/kylin-spark-classloader/pom.xml @@ -22,7 +22,7 @@ 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>Apche Kylin on parquet - Classloader</name> + <name>Apache Kylin 4.X - Classloader</name> <packaging>jar</packaging> <artifactId>kylin-spark-classloader</artifactId> <version>4.0.0-SNAPSHOT</version> diff --git a/kylin-spark-project/kylin-spark-engine/pom.xml b/kylin-spark-project/kylin-spark-engine/pom.xml index 21aab31..c0a1ad2 100644 --- a/kylin-spark-project/kylin-spark-engine/pom.xml +++ b/kylin-spark-project/kylin-spark-engine/pom.xml @@ -24,7 +24,7 @@ <artifactId>kylin-spark-engine</artifactId> <packaging>jar</packaging> - <name>Apche Kylin on parquet - Spark Engine</name> + <name>Apache Kylin 4.X - Spark Engine</name> <parent> <groupId>org.apache.kylin</groupId> @@ -70,17 +70,6 @@ </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <scope>test</scope> - <version>${mockito.version}</version> - </dependency> - <dependency> <groupId>org.springframework</groupId> <artifactId>spring-test</artifactId> <scope>test</scope> @@ -92,13 +81,6 @@ </dependency> <dependency> - <groupId>org.scalatest</groupId> - <artifactId>scalatest_2.11</artifactId> - <version>3.0.0</version> - <scope>test</scope> - </dependency> - - <dependency> <groupId>org.apache.spark</groupId> <artifactId>spark-core_2.11</artifactId> <version>${spark.version}</version> @@ -129,7 +111,7 @@ </dependency> <dependency> <groupId>org.apache.kylin</groupId> - <artifactId>kylin-engine-mr</artifactId> + <artifactId>kylin-build-engine</artifactId> <exclusions> <exclusion> <groupId>org.apache.kylin</groupId> diff --git a/kylin-spark-project/kylin-spark-metadata/pom.xml b/kylin-spark-project/kylin-spark-metadata/pom.xml index 5d8527b..46a8bb4 100644 --- a/kylin-spark-project/kylin-spark-metadata/pom.xml +++ b/kylin-spark-project/kylin-spark-metadata/pom.xml @@ -23,7 +23,7 @@ <modelVersion>4.0.0</modelVersion> <artifactId>kylin-spark-metadata</artifactId> <packaging>jar</packaging> - <name>Apche Kylin on parquet - Metadata</name> + <name>Apache Kylin 4.X - Metadata</name> <parent> <artifactId>kylin-spark-project</artifactId> diff --git a/kylin-spark-project/kylin-spark-query/pom.xml b/kylin-spark-project/kylin-spark-query/pom.xml index aaf7d16..97299eb 100644 --- a/kylin-spark-project/kylin-spark-query/pom.xml +++ b/kylin-spark-project/kylin-spark-query/pom.xml @@ -24,7 +24,7 @@ <artifactId>kylin-spark-query</artifactId> <packaging>jar</packaging> - <name>Apche Kylin on parquet - Query</name> + <name>Apache Kylin 4.X - Query</name> <parent> <groupId>org.apache.kylin</groupId> @@ -55,11 +55,6 @@ <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.apache.kylin</groupId> - <artifactId>kylin-query</artifactId> - <version>${project.version}</version> - </dependency> <!-- Env & Test --> <dependency> <groupId>org.apache.kylin</groupId> @@ -81,17 +76,6 @@ </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <scope>test</scope> - <version>${mockito.version}</version> - </dependency> - <dependency> <groupId>org.springframework</groupId> <artifactId>spring-test</artifactId> <scope>test</scope> @@ -103,13 +87,6 @@ </dependency> <dependency> - <groupId>org.scalatest</groupId> - <artifactId>scalatest_2.11</artifactId> - <version>3.0.0</version> - <scope>test</scope> - </dependency> - - <dependency> <groupId>org.apache.spark</groupId> <artifactId>spark-core_2.11</artifactId> <version>${spark.version}</version> @@ -129,27 +106,6 @@ <artifactId>kylin-core-storage</artifactId> </dependency> - <!-- for test --> - <!-- <dependency>--> - <!-- <groupId>org.apache.kylin</groupId>--> - <!-- <artifactId>kylin-storage-hbase</artifactId>--> - <!-- <version>${project.version}</version>--> - <!-- </dependency>--> - - <!-- <dependency>--> - <!-- <groupId>org.apache.hbase</groupId>--> - <!-- <artifactId>hbase-server</artifactId>--> - <!-- <version>1.1.1</version>--> - <!-- <type>test-jar</type>--> - <!-- </dependency>--> - - <!-- <dependency>--> - <!-- <groupId>org.json</groupId>--> - <!-- <artifactId>json</artifactId>--> - <!-- <version>20190722</version>--> - <!-- </dependency>--> - - <!--For update spark job info from cluster--> <dependency> <groupId>org.apache.kylin</groupId> @@ -159,10 +115,6 @@ <groupId>org.apache.kylin</groupId> <artifactId>kylin-query</artifactId> </dependency> - <dependency> - <groupId>org.apache.kylin</groupId> - <artifactId>kylin-engine-mr</artifactId> - </dependency> </dependencies> <build> diff --git a/kylin-spark-project/kylin-spark-test/pom.xml b/kylin-spark-project/kylin-spark-test/pom.xml index 60517ac..6efacdb 100644 --- a/kylin-spark-project/kylin-spark-test/pom.xml +++ b/kylin-spark-project/kylin-spark-test/pom.xml @@ -28,7 +28,7 @@ <modelVersion>4.0.0</modelVersion> <artifactId>kylin-spark-test</artifactId> - <name>Apche Kylin on parquet - Integration Test</name> + <name>Apache Kylin 4.X - Integration Test</name> <properties> <hdp.version/> @@ -45,10 +45,17 @@ <groupId>org.apache.kylin</groupId> <artifactId>kylin-core-common</artifactId> </dependency> + <dependency> <groupId>org.apache.kylin</groupId> <artifactId>kylin-core-job</artifactId> </dependency> + + <dependency> + <groupId>org.apache.kylin</groupId> + <artifactId>kylin-server-base</artifactId> + </dependency> + <dependency> <groupId>org.apache.kylin</groupId> <artifactId>kylin-spark-engine</artifactId> @@ -131,19 +138,19 @@ <type>test-jar</type> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.kylin</groupId> - <artifactId>kylin-it</artifactId> - <version>${project.version}</version> - <exclusions> - <exclusion> - <groupId>org.apache.calcite.avatica</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - <type>test-jar</type> - <scope>test</scope> - </dependency> +<!-- <dependency>--> +<!-- <groupId>org.apache.kylin</groupId>--> +<!-- <artifactId>kylin-it</artifactId>--> +<!-- <version>${project.version}</version>--> +<!-- <exclusions>--> +<!-- <exclusion>--> +<!-- <groupId>org.apache.calcite.avatica</groupId>--> +<!-- <artifactId>*</artifactId>--> +<!-- </exclusion>--> +<!-- </exclusions>--> +<!-- <type>test-jar</type>--> +<!-- <scope>test</scope>--> +<!-- </dependency>--> <dependency> <groupId>org.apache.kylin</groupId> <artifactId>kylin-spark-query</artifactId> diff --git a/kylin-spark-project/pom.xml b/kylin-spark-project/pom.xml index 5dc764e..db5b1cb 100644 --- a/kylin-spark-project/pom.xml +++ b/kylin-spark-project/pom.xml @@ -23,7 +23,7 @@ <modelVersion>4.0.0</modelVersion> <artifactId>kylin-spark-project</artifactId> <packaging>pom</packaging> - <name>Apche Kylin on parquet</name> + <name>Apache Kylin 4.X</name> <parent> <groupId>org.apache.kylin</groupId> diff --git a/metrics-reporter-hive/pom.xml b/metrics-reporter-hive/pom.xml index 3534b33..ed9ea2e 100644 --- a/metrics-reporter-hive/pom.xml +++ b/metrics-reporter-hive/pom.xml @@ -39,6 +39,7 @@ <dependency> <groupId>org.apache.kylin</groupId> <artifactId>kylin-source-hive</artifactId> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.hive.hcatalog</groupId> @@ -56,9 +57,5 @@ <artifactId>hadoop-hdfs</artifactId> <scope>provided</scope> </dependency> - <dependency> - <groupId>org.apache.kylin</groupId> - <artifactId>kylin-source-hive</artifactId> - </dependency> </dependencies> </project> \ No newline at end of file diff --git a/parquet-assembly/pom.xml b/parquet-assembly/pom.xml index 4f69e37..6254690 100644 --- a/parquet-assembly/pom.xml +++ b/parquet-assembly/pom.xml @@ -44,20 +44,20 @@ <groupId>org.apache.kylin</groupId> <artifactId>kylin-core-metadata</artifactId> </dependency> - <dependency> - <groupId>org.apache.kylin</groupId> - <artifactId>kylin-storage-hbase</artifactId> - <exclusions> - <exclusion> - <groupId>org.apache.kylin</groupId> - <artifactId>kylin-engine-mr</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.kylin</groupId> - <artifactId>kylin-engine-spark</artifactId> - </exclusion> - </exclusions> - </dependency> +<!-- <dependency>--> +<!-- <groupId>org.apache.kylin</groupId>--> +<!-- <artifactId>kylin-storage-hbase</artifactId>--> +<!-- <exclusions>--> +<!-- <exclusion>--> +<!-- <groupId>org.apache.kylin</groupId>--> +<!-- <artifactId>kylin-engine-mr</artifactId>--> +<!-- </exclusion>--> +<!-- <exclusion>--> +<!-- <groupId>org.apache.kylin</groupId>--> +<!-- <artifactId>kylin-engine-spark</artifactId>--> +<!-- </exclusion>--> +<!-- </exclusions>--> +<!-- </dependency>--> <!-- https://mvnrepository.com/artifact/org.apache.htrace/htrace --> <dependency> <groupId>org.apache.htrace</groupId> diff --git a/pom.xml b/pom.xml index 847cc92..5c8fb2f 100644 --- a/pom.xml +++ b/pom.xml @@ -299,37 +299,42 @@ </dependency> <dependency> <groupId>org.apache.kylin</groupId> - <artifactId>kylin-engine-mr</artifactId> + <artifactId>kylin-build-engine</artifactId> <version>${project.version}</version> </dependency> +<!-- <dependency>--> +<!-- <groupId>org.apache.kylin</groupId>--> +<!-- <artifactId>kylin-engine-mr</artifactId>--> +<!-- <version>${project.version}</version>--> +<!-- </dependency>--> +<!-- <dependency>--> +<!-- <groupId>org.apache.kylin</groupId>--> +<!-- <artifactId>kylin-engine-spark</artifactId>--> +<!-- <version>${project.version}</version>--> +<!-- </dependency>--> +<!-- <dependency>--> +<!-- <groupId>org.apache.kylin</groupId>--> +<!-- <artifactId>kylin-engine-flink</artifactId>--> +<!-- <version>${project.version}</version>--> +<!-- </dependency>--> +<!-- <dependency>--> +<!-- <groupId>org.apache.kylin</groupId>--> +<!-- <artifactId>kylin-source-hive</artifactId>--> +<!-- <version>${project.version}</version>--> +<!-- </dependency>--> +<!-- <dependency>--> +<!-- <groupId>org.apache.kylin</groupId>--> +<!-- <artifactId>kylin-source-jdbc</artifactId>--> +<!-- <version>${project.version}</version>--> +<!-- </dependency>--> +<!-- <dependency>--> +<!-- <groupId>org.apache.kylin</groupId>--> +<!-- <artifactId>kylin-source-kafka</artifactId>--> +<!-- <version>${project.version}</version>--> +<!-- </dependency>--> <dependency> <groupId>org.apache.kylin</groupId> - <artifactId>kylin-engine-spark</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.kylin</groupId> - <artifactId>kylin-engine-flink</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.kylin</groupId> - <artifactId>kylin-source-hive</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.kylin</groupId> - <artifactId>kylin-source-jdbc</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.kylin</groupId> - <artifactId>kylin-source-kafka</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.kylin</groupId> - <artifactId>kylin-storage-hbase</artifactId> + <artifactId>kylin-metastore-hbase</artifactId> <version>${project.version}</version> </dependency> <dependency> @@ -352,11 +357,11 @@ <artifactId>kylin-jdbc</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.apache.kylin</groupId> - <artifactId>kylin-assembly</artifactId> - <version>${project.version}</version> - </dependency> +<!-- <dependency>--> +<!-- <groupId>org.apache.kylin</groupId>--> +<!-- <artifactId>kylin-assembly</artifactId>--> +<!-- <version>${project.version}</version>--> +<!-- </dependency>--> <dependency> <groupId>org.apache.kylin</groupId> <artifactId>kylin-spark-project</artifactId> @@ -372,11 +377,11 @@ <artifactId>kylin-tool-assembly</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.apache.kylin</groupId> - <artifactId>kylin-it</artifactId> - <version>${project.version}</version> - </dependency> +<!-- <dependency>--> +<!-- <groupId>org.apache.kylin</groupId>--> +<!-- <artifactId>kylin-it</artifactId>--> +<!-- <version>${project.version}</version>--> +<!-- </dependency>--> <dependency> <groupId>org.apache.kylin</groupId> <artifactId>kylin-core-common</artifactId> @@ -395,12 +400,12 @@ <version>${project.version}</version> <type>test-jar</type> </dependency> - <dependency> - <groupId>org.apache.kylin</groupId> - <artifactId>kylin-storage-hbase</artifactId> - <version>${project.version}</version> - <type>test-jar</type> - </dependency> +<!-- <dependency>--> +<!-- <groupId>org.apache.kylin</groupId>--> +<!-- <artifactId>kylin-storage-hbase</artifactId>--> +<!-- <version>${project.version}</version>--> +<!-- <type>test-jar</type>--> +<!-- </dependency>--> <dependency> <groupId>org.apache.kylin</groupId> <artifactId>kylin-server-base</artifactId> @@ -420,31 +425,31 @@ <type>test-jar</type> </dependency> - <dependency> - <groupId>org.apache.kylin</groupId> - <artifactId>kylin-stream-core</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.kylin</groupId> - <artifactId>kylin-stream-coordinator</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.kylin</groupId> - <artifactId>kylin-stream-source-kafka</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.kylin</groupId> - <artifactId>kylin-storage-stream</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.kylin</groupId> - <artifactId>kylin-stream-receiver</artifactId> - <version>${project.version}</version> - </dependency> +<!-- <dependency>--> +<!-- <groupId>org.apache.kylin</groupId>--> +<!-- <artifactId>kylin-stream-core</artifactId>--> +<!-- <version>${project.version}</version>--> +<!-- </dependency>--> +<!-- <dependency>--> +<!-- <groupId>org.apache.kylin</groupId>--> +<!-- <artifactId>kylin-stream-coordinator</artifactId>--> +<!-- <version>${project.version}</version>--> +<!-- </dependency>--> +<!-- <dependency>--> +<!-- <groupId>org.apache.kylin</groupId>--> +<!-- <artifactId>kylin-stream-source-kafka</artifactId>--> +<!-- <version>${project.version}</version>--> +<!-- </dependency>--> +<!-- <dependency>--> +<!-- <groupId>org.apache.kylin</groupId>--> +<!-- <artifactId>kylin-storage-stream</artifactId>--> +<!-- <version>${project.version}</version>--> +<!-- </dependency>--> +<!-- <dependency>--> +<!-- <groupId>org.apache.kylin</groupId>--> +<!-- <artifactId>kylin-stream-receiver</artifactId>--> +<!-- <version>${project.version}</version>--> +<!-- </dependency>--> <dependency> <groupId>org.apache.kylin</groupId> @@ -457,12 +462,12 @@ <version>${project.version}</version> <classifier>framework</classifier> </dependency> - <dependency> - <groupId>org.apache.kylin</groupId> - <artifactId>kylin-assembly</artifactId> - <version>${project.version}</version> - <type>test-jar</type> - </dependency> +<!-- <dependency>--> +<!-- <groupId>org.apache.kylin</groupId>--> +<!-- <artifactId>kylin-assembly</artifactId>--> +<!-- <version>${project.version}</version>--> +<!-- <type>test-jar</type>--> +<!-- </dependency>--> <dependency> <groupId>org.lz4</groupId> @@ -1472,31 +1477,31 @@ <module>core-cube</module> <module>core-job</module> <module>core-storage</module> - <module>engine-mr</module> - <module>engine-spark</module> + <module>build-engine</module> +<!-- <module>engine-spark</module>--> <module>source-hive</module> - <module>source-jdbc</module> - <module>source-kafka</module> - <module>storage-hbase</module> +<!-- <module>source-jdbc</module>--> +<!-- <module>source-kafka</module>--> + <module>metastore-hbase</module> <module>query</module> <module>server-base</module> <module>server</module> <module>jdbc</module> - <module>assembly</module> +<!-- <module>assembly</module>--> <module>tool</module> <module>tool-assembly</module> - <module>kylin-it</module> +<!-- <module>kylin-it</module>--> <module>core-metrics</module> <module>metrics-reporter-hive</module> <module>metrics-reporter-kafka</module> <module>cache</module> <module>datasource-sdk</module> - <module>storage-stream</module> - <module>stream-receiver</module> - <module>stream-coordinator</module> - <module>stream-core</module> - <module>stream-source-kafka</module> - <module>engine-flink</module> +<!-- <module>storage-stream</module>--> +<!-- <module>stream-receiver</module>--> +<!-- <module>stream-coordinator</module>--> +<!-- <module>stream-core</module>--> +<!-- <module>stream-source-kafka</module>--> +<!-- <module>engine-flink</module>--> <module>kylin-spark-project</module> <module>parquet-assembly</module> </modules> @@ -1957,6 +1962,12 @@ <exclude> src/main/java/org/apache/kylin/storage/hbase/cube/v2/coprocessor/endpoint/generated/CubeVisitProtos.java </exclude> + <exclude> + storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/coprocessor/endpoint/generated/CubeVisitProtos.java + </exclude> + <exclude> + examples/test_case_data/sample_local/UUID + </exclude> </excludes> </configuration> <executions> diff --git a/server-base/pom.xml b/server-base/pom.xml index e4b8059..a5411c8 100644 --- a/server-base/pom.xml +++ b/server-base/pom.xml @@ -51,6 +51,12 @@ <artifactId>kylin-core-metrics</artifactId> </dependency> + <dependency> + <groupId>org.apache.kylin</groupId> + <artifactId>kylin-build-engine</artifactId> + <version>4.0.0-SNAPSHOT</version> + </dependency> + <!-- these plug-in modules, should not have API dependencies --> <dependency> <groupId>org.apache.kylin</groupId> @@ -62,24 +68,26 @@ </dependency> <dependency> <groupId>org.apache.kylin</groupId> - <artifactId>kylin-storage-hbase</artifactId> + <artifactId>kylin-metastore-hbase</artifactId> + <version>4.0.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.kylin</groupId> <artifactId>kylin-source-hive</artifactId> + <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.apache.kylin</groupId> - <artifactId>kylin-source-kafka</artifactId> - </dependency> +<!-- <dependency>--> +<!-- <groupId>org.apache.kylin</groupId>--> +<!-- <artifactId>kylin-source-kafka</artifactId>--> +<!-- </dependency>--> <dependency> <groupId>org.apache.kylin</groupId> <artifactId>kylin-cache</artifactId> </dependency> - <dependency> - <groupId>org.apache.kylin</groupId> - <artifactId>kylin-source-jdbc</artifactId> - </dependency> +<!-- <dependency>--> +<!-- <groupId>org.apache.kylin</groupId>--> +<!-- <artifactId>kylin-source-jdbc</artifactId>--> +<!-- </dependency>--> <dependency> <groupId>org.apache.kylin</groupId> <artifactId>kylin-datasource-sdk</artifactId> @@ -90,30 +98,29 @@ <artifactId>kylin-datasource-sdk</artifactId> <classifier>framework</classifier> </dependency> - <dependency> - <groupId>org.apache.kylin</groupId> - <artifactId>kylin-stream-coordinator</artifactId> - <exclusions> - <exclusion> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </exclusion> - <exclusion> - <groupId>javax.servlet.jsp</groupId> - <artifactId>jsp-api</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.kylin</groupId> - <artifactId>kylin-stream-source-kafka</artifactId> - </dependency> - <dependency> - <groupId>org.apache.kylin</groupId> - <artifactId>kylin-storage-stream</artifactId> - </dependency> +<!-- <dependency>--> +<!-- <groupId>org.apache.kylin</groupId>--> +<!-- <artifactId>kylin-stream-coordinator</artifactId>--> +<!-- <exclusions>--> +<!-- <exclusion>--> +<!-- <groupId>javax.servlet</groupId>--> +<!-- <artifactId>servlet-api</artifactId>--> +<!-- </exclusion>--> +<!-- <exclusion>--> +<!-- <groupId>javax.servlet.jsp</groupId>--> +<!-- <artifactId>jsp-api</artifactId>--> +<!-- </exclusion>--> +<!-- </exclusions>--> +<!-- </dependency>--> +<!-- <dependency>--> +<!-- <groupId>org.apache.kylin</groupId>--> +<!-- <artifactId>kylin-stream-source-kafka</artifactId>--> +<!-- </dependency>--> +<!-- <dependency>--> +<!-- <groupId>org.apache.kylin</groupId>--> +<!-- <artifactId>kylin-storage-stream</artifactId>--> +<!-- </dependency>--> - <!-- kylin on parquet --> <dependency> <groupId>org.apache.kylin</groupId> <artifactId>kylin-spark-engine</artifactId> @@ -164,10 +171,10 @@ <artifactId>commons-pool2</artifactId> </dependency> - <dependency> - <groupId>org.apache.kylin</groupId> - <artifactId>kylin-engine-spark</artifactId> - </dependency> +<!-- <dependency>--> +<!-- <groupId>org.apache.kylin</groupId>--> +<!-- <artifactId>kylin-engine-spark</artifactId>--> +<!-- </dependency>--> <!-- Spring Core --> <dependency> diff --git a/server/pom.xml b/server/pom.xml index f4e4d4d..a992385 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -118,7 +118,8 @@ </dependency> <dependency> <groupId>org.apache.kylin</groupId> - <artifactId>kylin-storage-hbase</artifactId> + <artifactId>kylin-metastore-hbase</artifactId> + <version>4.0.0-SNAPSHOT</version> <type>test-jar</type> <scope>test</scope> </dependency> diff --git a/source-hive/pom.xml b/source-hive/pom.xml index 570e3b5..8430796 100644 --- a/source-hive/pom.xml +++ b/source-hive/pom.xml @@ -35,7 +35,7 @@ <dependency> <groupId>org.apache.kylin</groupId> - <artifactId>kylin-engine-mr</artifactId> + <artifactId>kylin-build-engine</artifactId> </dependency> <!-- Env & Test --> @@ -101,14 +101,6 @@ <version>1.10.19</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.kylin</groupId> - <artifactId>kylin-engine-spark</artifactId> - </dependency> - <dependency> - <groupId>org.apache.kylin</groupId> - <artifactId>kylin-engine-flink</artifactId> - </dependency> </dependencies> </project> diff --git a/source-jdbc/pom.xml b/source-jdbc/pom.xml index acee3c9..6b13f64 100644 --- a/source-jdbc/pom.xml +++ b/source-jdbc/pom.xml @@ -26,11 +26,11 @@ <name>Apache Kylin - Jdbc Source</name> <description>Apache Kylin - Jdbc Source</description> - <parent> - <groupId>org.apache.kylin</groupId> - <artifactId>kylin</artifactId> - <version>4.0.0-SNAPSHOT</version> - </parent> +<!-- <parent>--> +<!-- <groupId>org.apache.kylin</groupId>--> +<!-- <artifactId>kylin</artifactId>--> +<!-- <version>4.0.0-SNAPSHOT</version>--> +<!-- </parent>--> <dependencies> <dependency> diff --git a/source-kafka/pom.xml b/source-kafka/pom.xml index cc99926..f54e5d7 100644 --- a/source-kafka/pom.xml +++ b/source-kafka/pom.xml @@ -25,11 +25,11 @@ <name>Apache Kylin - Kafka Source</name> <description>Apache Kylin - Kafka Source</description> - <parent> - <groupId>org.apache.kylin</groupId> - <artifactId>kylin</artifactId> - <version>4.0.0-SNAPSHOT</version> - </parent> +<!-- <parent>--> +<!-- <groupId>org.apache.kylin</groupId>--> +<!-- <artifactId>kylin</artifactId>--> +<!-- <version>4.0.0-SNAPSHOT</version>--> +<!-- </parent>--> <dependencies> <dependency> diff --git a/storage-hbase/pom.xml b/storage-hbase/pom.xml index 2d38f58..484eb8a 100644 --- a/storage-hbase/pom.xml +++ b/storage-hbase/pom.xml @@ -26,37 +26,22 @@ <name>Apache Kylin - HBase Storage</name> <description>Apache Kylin - HBase Storage</description> - <parent> - <groupId>org.apache.kylin</groupId> - <artifactId>kylin</artifactId> - <version>4.0.0-SNAPSHOT</version> - </parent> +<!-- <parent>--> +<!-- <groupId>org.apache.kylin</groupId>--> +<!-- <artifactId>kylin</artifactId>--> +<!-- <version>4.0.0-SNAPSHOT</version>--> +<!-- </parent>--> <properties> <shadeBase>org.apache.kylin.coprocessor.shaded</shadeBase> </properties> <dependencies> - - <dependency> - <groupId>org.apache.kylin</groupId> - <artifactId>kylin-engine-mr</artifactId> - </dependency> <dependency> <groupId>org.apache.kylin</groupId> <artifactId>kylin-cache</artifactId> </dependency> - <dependency> - <groupId>org.apache.kylin</groupId> - <artifactId>kylin-engine-spark</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.kylin</groupId> - <artifactId>kylin-engine-flink</artifactId> - </dependency> - <!-- Env & Test --> <dependency> <groupId>org.apache.kylin</groupId> diff --git a/storage-stream/pom.xml b/storage-stream/pom.xml index 6d5c88d..fb27644 100644 --- a/storage-stream/pom.xml +++ b/storage-stream/pom.xml @@ -18,11 +18,11 @@ --> <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>4.0.0-SNAPSHOT</version> - </parent> +<!-- <parent>--> +<!-- <artifactId>kylin</artifactId>--> +<!-- <groupId>org.apache.kylin</groupId>--> +<!-- <version>4.0.0-SNAPSHOT</version>--> +<!-- </parent>--> <modelVersion>4.0.0</modelVersion> <artifactId>kylin-storage-stream</artifactId> <packaging>jar</packaging> diff --git a/stream-coordinator/pom.xml b/stream-coordinator/pom.xml index a6d5dcc..cc385c0 100644 --- a/stream-coordinator/pom.xml +++ b/stream-coordinator/pom.xml @@ -19,11 +19,11 @@ <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"> - <parent> - <artifactId>kylin</artifactId> - <groupId>org.apache.kylin</groupId> - <version>4.0.0-SNAPSHOT</version> - </parent> +<!-- <parent>--> +<!-- <artifactId>kylin</artifactId>--> +<!-- <groupId>org.apache.kylin</groupId>--> +<!-- <version>4.0.0-SNAPSHOT</version>--> +<!-- </parent>--> <modelVersion>4.0.0</modelVersion> <artifactId>kylin-stream-coordinator</artifactId> <packaging>jar</packaging> diff --git a/stream-core/pom.xml b/stream-core/pom.xml index 4423e6c..ac2ad37 100644 --- a/stream-core/pom.xml +++ b/stream-core/pom.xml @@ -18,11 +18,11 @@ --> <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>4.0.0-SNAPSHOT</version> - </parent> +<!-- <parent>--> +<!-- <artifactId>kylin</artifactId>--> +<!-- <groupId>org.apache.kylin</groupId>--> +<!-- <version>4.0.0-SNAPSHOT</version>--> +<!-- </parent>--> <modelVersion>4.0.0</modelVersion> <artifactId>kylin-stream-core</artifactId> <packaging>jar</packaging> diff --git a/stream-receiver/pom.xml b/stream-receiver/pom.xml index 7346a95..f58d903 100644 --- a/stream-receiver/pom.xml +++ b/stream-receiver/pom.xml @@ -19,11 +19,11 @@ <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"> - <parent> - <artifactId>kylin</artifactId> - <groupId>org.apache.kylin</groupId> - <version>4.0.0-SNAPSHOT</version> - </parent> +<!-- <parent>--> +<!-- <artifactId>kylin</artifactId>--> +<!-- <groupId>org.apache.kylin</groupId>--> +<!-- <version>4.0.0-SNAPSHOT</version>--> +<!-- </parent>--> <modelVersion>4.0.0</modelVersion> <artifactId>kylin-stream-receiver</artifactId> <packaging>jar</packaging> diff --git a/stream-source-kafka/pom.xml b/stream-source-kafka/pom.xml index 0a25956..cdec1d4 100644 --- a/stream-source-kafka/pom.xml +++ b/stream-source-kafka/pom.xml @@ -18,11 +18,11 @@ --> <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>4.0.0-SNAPSHOT</version> - </parent> +<!-- <parent>--> +<!-- <artifactId>kylin</artifactId>--> +<!-- <groupId>org.apache.kylin</groupId>--> +<!-- <version>4.0.0-SNAPSHOT</version>--> +<!-- </parent>--> <modelVersion>4.0.0</modelVersion> <artifactId>kylin-stream-source-kafka</artifactId> <packaging>jar</packaging> diff --git a/tool/pom.xml b/tool/pom.xml index c0befd5..cfadc5c 100644 --- a/tool/pom.xml +++ b/tool/pom.xml @@ -43,20 +43,23 @@ <dependency> <groupId>org.apache.kylin</groupId> - <artifactId>kylin-storage-hbase</artifactId> + <artifactId>kylin-metastore-hbase</artifactId> + <version>${project.version}</version> </dependency> + <dependency> <groupId>org.apache.kylin</groupId> - <artifactId>kylin-engine-mr</artifactId> + <artifactId>kylin-core-metadata</artifactId> </dependency> <dependency> <groupId>org.apache.kylin</groupId> - <artifactId>kylin-source-kafka</artifactId> + <artifactId>kylin-core-job</artifactId> </dependency> + <dependency> <groupId>org.apache.kylin</groupId> - <artifactId>kylin-source-hive</artifactId> + <artifactId>kylin-core-storage</artifactId> </dependency> <dependency> @@ -64,9 +67,15 @@ <artifactId>kylin-server-base</artifactId> </dependency> + + <dependency> + <groupId>org.apache.kylin</groupId> + <artifactId>kylin-metrics-reporter-hive</artifactId> + </dependency> + <dependency> <groupId>org.apache.kylin</groupId> - <artifactId>kylin-stream-core</artifactId> + <artifactId>kylin-metrics-reporter-kafka</artifactId> </dependency> <!--Env-->