Skip to content

Commit 191b817

Browse files
authored
[KYUUBI-216]Make thrift IDL a separate sub module fix apache#216 (apache#217)
* [KYUUBI-216]Make thrift IDL a separate sub module fix apache#216 * typo
1 parent 9473943 commit 191b817

File tree

87 files changed

+83
-20
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+83
-20
lines changed

kyuubi-server/pom.xml

Lines changed: 7 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,12 @@
3939
<version>${project.version}</version>
4040
</dependency>
4141

42+
<dependency>
43+
<groupId>yaooqinn</groupId>
44+
<artifactId>kyuubi-thrift</artifactId>
45+
<version>${project.version}</version>
46+
</dependency>
47+
4248
<dependency>
4349
<groupId>${spark.group}</groupId>
4450
<artifactId>spark-yarn_${scala.binary.version}</artifactId>
@@ -234,25 +240,6 @@
234240
<artifactId>scala-maven-plugin</artifactId>
235241
</plugin>
236242

237-
<plugin>
238-
<groupId>org.codehaus.mojo</groupId>
239-
<artifactId>build-helper-maven-plugin</artifactId>
240-
<executions>
241-
<execution>
242-
<id>add-source</id>
243-
<phase>generate-sources</phase>
244-
<goals>
245-
<goal>add-source</goal>
246-
</goals>
247-
<configuration>
248-
<sources>
249-
<source>src/gen/java</source>
250-
</sources>
251-
</configuration>
252-
</execution>
253-
</executions>
254-
</plugin>
255-
256243
<plugin>
257244
<groupId>org.apache.maven.plugins</groupId>
258245
<artifactId>maven-shade-plugin</artifactId>
@@ -261,6 +248,7 @@
261248
<artifactSet>
262249
<includes>
263250
<include>yaooqinn:kyuubi-common</include>
251+
<include>yaooqinn:kyuubi-thrift</include>
264252
</includes>
265253
</artifactSet>
266254
</configuration>
@@ -312,7 +300,6 @@
312300
<artifactId>jacoco-maven-plugin</artifactId>
313301
<configuration>
314302
<excludes>
315-
<exclude>**/org/apache/hive/service/cli/thrift/*.class</exclude>
316303
<exclude>**/org/apache/spark/launcher/*.class</exclude>
317304
<exclude>**/org/apache/spark/deploy/*.class</exclude>
318305
<exclude>**/org/apache/spark/SparkEnv.class</exclude>

kyuubi-thrift/pom.xml

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
~ Licensed to the Apache Software Foundation (ASF) under one or more
4+
~ contributor license agreements. See the NOTICE file distributed with
5+
~ this work for additional information regarding copyright ownership.
6+
~ The ASF licenses this file to You under the Apache License, Version 2.0
7+
~ (the "License"); you may not use this file except in compliance with
8+
~ the License. You may obtain a copy of the License at
9+
~
10+
~ http://www.apache.org/licenses/LICENSE-2.0
11+
~
12+
~ Unless required by applicable law or agreed to in writing, software
13+
~ distributed under the License is distributed on an "AS IS" BASIS,
14+
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
~ See the License for the specific language governing permissions and
16+
~ limitations under the License.
17+
-->
18+
19+
<project xmlns="http://maven.apache.org/POM/4.0.0"
20+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
21+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
22+
<parent>
23+
<artifactId>kyuubi</artifactId>
24+
<groupId>yaooqinn</groupId>
25+
<version>0.8.0-SNAPSHOT</version>
26+
</parent>
27+
<modelVersion>4.0.0</modelVersion>
28+
29+
<artifactId>kyuubi-thrift</artifactId>
30+
<packaging>jar</packaging>
31+
<name>Kyuubi Project Thrift IDL</name>
32+
<dependencies>
33+
<dependency>
34+
<groupId>commons-lang</groupId>
35+
<artifactId>commons-lang</artifactId>
36+
</dependency>
37+
38+
<dependency>
39+
<groupId>org.apache.thrift</groupId>
40+
<artifactId>libthrift</artifactId>
41+
<version>0.9.3</version>
42+
</dependency>
43+
</dependencies>
44+
45+
<build>
46+
<plugins>
47+
<plugin>
48+
<groupId>org.codehaus.mojo</groupId>
49+
<artifactId>build-helper-maven-plugin</artifactId>
50+
<executions>
51+
<execution>
52+
<id>add-source</id>
53+
<phase>generate-sources</phase>
54+
<goals>
55+
<goal>add-source</goal>
56+
</goals>
57+
<configuration>
58+
<sources>
59+
<source>src/gen/java</source>
60+
</sources>
61+
</configuration>
62+
</execution>
63+
</executions>
64+
</plugin>
65+
</plugins>
66+
</build>
67+
68+
</project>

pom.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
<version>0.8.0-SNAPSHOT</version>
2727
<modules>
2828
<module>kyuubi-common</module>
29+
<module>kyuubi-thrift</module>
2930
<module>kyuubi-server</module>
3031
</modules>
3132
<packaging>pom</packaging>
@@ -67,6 +68,7 @@
6768
<apacheds.version>2.0.0-M15</apacheds.version>
6869
<curator.version>2.6.0</curator.version>
6970
<codahale.metrics.version>3.1.2</codahale.metrics.version>
71+
<commons-lang.version>2.6</commons-lang.version>
7072
</properties>
7173

7274
<repositories>
@@ -276,6 +278,12 @@
276278
<version>${codahale.metrics.version}</version>
277279
</dependency>
278280

281+
<dependency>
282+
<groupId>commons-lang</groupId>
283+
<artifactId>commons-lang</artifactId>
284+
<version>${commons-lang.version}</version>
285+
</dependency>
286+
279287
<dependency>
280288
<groupId>org.scalatest</groupId>
281289
<artifactId>scalatest_${scala.binary.version}</artifactId>

0 commit comments

Comments
 (0)