Skip to content

Commit

Permalink
[KYUUBI-216]Make thrift IDL a separate sub module fix #216 (#217)
Browse files Browse the repository at this point in the history
* [KYUUBI-216]Make thrift IDL a separate sub module fix #216

* typo
  • Loading branch information
yaooqinn committed Sep 25, 2019
1 parent 9473943 commit 191b817
Show file tree
Hide file tree
Showing 87 changed files with 83 additions and 20 deletions.
27 changes: 7 additions & 20 deletions kyuubi-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,12 @@
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>yaooqinn</groupId>
<artifactId>kyuubi-thrift</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>${spark.group}</groupId>
<artifactId>spark-yarn_${scala.binary.version}</artifactId>
Expand Down Expand Up @@ -234,25 +240,6 @@
<artifactId>scala-maven-plugin</artifactId>
</plugin>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
<id>add-source</id>
<phase>generate-sources</phase>
<goals>
<goal>add-source</goal>
</goals>
<configuration>
<sources>
<source>src/gen/java</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
Expand All @@ -261,6 +248,7 @@
<artifactSet>
<includes>
<include>yaooqinn:kyuubi-common</include>
<include>yaooqinn:kyuubi-thrift</include>
</includes>
</artifactSet>
</configuration>
Expand Down Expand Up @@ -312,7 +300,6 @@
<artifactId>jacoco-maven-plugin</artifactId>
<configuration>
<excludes>
<exclude>**/org/apache/hive/service/cli/thrift/*.class</exclude>
<exclude>**/org/apache/spark/launcher/*.class</exclude>
<exclude>**/org/apache/spark/deploy/*.class</exclude>
<exclude>**/org/apache/spark/SparkEnv.class</exclude>
Expand Down
File renamed without changes.
68 changes: 68 additions & 0 deletions kyuubi-thrift/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
<?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.
-->

<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>kyuubi</artifactId>
<groupId>yaooqinn</groupId>
<version>0.8.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>kyuubi-thrift</artifactId>
<packaging>jar</packaging>
<name>Kyuubi Project Thrift IDL</name>
<dependencies>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</dependency>

<dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
<version>0.9.3</version>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
<id>add-source</id>
<phase>generate-sources</phase>
<goals>
<goal>add-source</goal>
</goals>
<configuration>
<sources>
<source>src/gen/java</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

</project>
8 changes: 8 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
<version>0.8.0-SNAPSHOT</version>
<modules>
<module>kyuubi-common</module>
<module>kyuubi-thrift</module>
<module>kyuubi-server</module>
</modules>
<packaging>pom</packaging>
Expand Down Expand Up @@ -67,6 +68,7 @@
<apacheds.version>2.0.0-M15</apacheds.version>
<curator.version>2.6.0</curator.version>
<codahale.metrics.version>3.1.2</codahale.metrics.version>
<commons-lang.version>2.6</commons-lang.version>
</properties>

<repositories>
Expand Down Expand Up @@ -276,6 +278,12 @@
<version>${codahale.metrics.version}</version>
</dependency>

<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>${commons-lang.version}</version>
</dependency>

<dependency>
<groupId>org.scalatest</groupId>
<artifactId>scalatest_${scala.binary.version}</artifactId>
Expand Down

0 comments on commit 191b817

Please sign in to comment.