This is an automated email from the ASF dual-hosted git repository.
nic pushed a commit to branch master-hadoop3
in repository https://gitbox.apache.org/repos/asf/kylin.git
commit e2f22eb694e57d3b4214d8ac20dd30a830978b93
Author: nichunen <n...@apache.org>
AuthorDate: Fri Jun 19 09:38:48 2020 +0800
Fix compile error
---
core-common/pom.xml | 4 ----
kylin-it/pom.xml | 4 ----
pom.xml | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++--
3 files changed, 56 insertions(+), 10 deletions(-)
diff --git a/core-common/pom.xml b/core-common/pom.xml
index 407ab9c..6266558 100644
--- a/core-common/pom.xml
+++ b/core-common/pom.xml
@@ -114,9 +114,5 @@
<artifactId>curator-test</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.kylin</groupId>
- <artifactId>kylin-shaded-guava</artifactId>
- </dependency>
</dependencies>
</project>
diff --git a/kylin-it/pom.xml b/kylin-it/pom.xml
index 878da15..92614fa 100644
--- a/kylin-it/pom.xml
+++ b/kylin-it/pom.xml
@@ -77,10 +77,6 @@
</dependency>
<dependency>
<groupId>org.apache.kylin</groupId>
- <artifactId>kylin-shaded-guava</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.kylin</groupId>
<artifactId>kylin-core-storage</artifactId>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index 0e3aec8..30a4f8f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -115,7 +115,7 @@
<commons-math3.version>3.1.1</commons-math3.version>
<commons-collections.version>3.2.2</commons-collections.version>
<commons-pool.version>2.5.0</commons-pool.version>
-
+ <commons-httpclient.version>3.1</commons-httpclient.version>
<!-- Calcite deps, keep compatible with calcite.version -->
<jackson.version>2.10.0</jackson.version>
@@ -248,6 +248,11 @@
</dependency>
<dependency>
<groupId>org.apache.kylin</groupId>
+ <artifactId>kylin-shaded-guava</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.kylin</groupId>
<artifactId>kylin-core-common</artifactId>
<version>${project.version}</version>
</dependency>
@@ -308,6 +313,11 @@
</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>
@@ -353,6 +363,11 @@
</dependency>
<dependency>
<groupId>org.apache.kylin</groupId>
+ <artifactId>kylin-cube-migration</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.kylin</groupId>
<artifactId>kylin-tool</artifactId>
<version>${project.version}</version>
</dependency>
@@ -434,6 +449,24 @@
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.kylin</groupId>
+ <artifactId>kylin-datasource-sdk</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.kylin</groupId>
+ <artifactId>kylin-datasource-sdk</artifactId>
+ <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>
+
<!-- Hadoop2 dependencies -->
<dependency>
<groupId>org.apache.hadoop</groupId>
@@ -508,6 +541,11 @@
<optional>true</optional>
</dependency>
<dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-distcp</artifactId>
+ <version>${hadoop2.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
<version>${zookeeper.version}</version>
@@ -562,6 +600,12 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>${commons-httpclient.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-math3</artifactId>
<version>${commons-math3.version}</version>
@@ -1000,6 +1044,11 @@
<artifactId>spring-security-saml2-core</artifactId>
<version>${spring.framework.security.extensions.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-cas</artifactId>
+ <version>${spring.framework.security.version}</version>
+ </dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
@@ -1015,6 +1064,11 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
<version>${jetty.version}</version>
<scope>test</scope>
@@ -1366,7 +1420,7 @@
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
<!-- uncomment this on release -->
- <!--<version>3.4.1</version>-->
+ <version>3.4.1</version>
</plugin>
</plugins>
</build>
