You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kudu.apache.org by da...@apache.org on 2017/04/05 17:51:49 UTC
[2/4] kudu git commit: kudu-mapreduce: tweak poms
kudu-mapreduce: tweak poms
This changes a few things about the mapreduce poms:
* kudu-mapreduce's dependency on hadoop-client is changed to provided.
* kudu-mapreduce no longer uses the maven assembly plugin. The
jar-with-dependencies artifact was not being published or used.
* kudu-client-tools now produces a fat jar, using the shade plugin. This
artifact is meant to be used as a binary MapReduce application, so
including all of the dependencies is appropriate.
Change-Id: I599ea9610fc3d541847b0205e959e94fb8425b2e
Reviewed-on: http://gerrit.cloudera.org:8080/6418
Tested-by: Kudu Jenkins
Reviewed-by: Jean-Daniel Cryans <jd...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/71deb95e
Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/71deb95e
Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/71deb95e
Branch: refs/heads/master
Commit: 71deb95efb73435850a19f4513b3023fbbe0ea34
Parents: 055ea58
Author: Dan Burkert <da...@apache.org>
Authored: Fri Mar 17 13:52:28 2017 -0700
Committer: Dan Burkert <da...@apache.org>
Committed: Wed Apr 5 17:48:57 2017 +0000
----------------------------------------------------------------------
java/assembly.xml | 34 ----------------------------------
java/kudu-client-tools/pom.xml | 26 ++++++++++++++++++--------
java/kudu-mapreduce/pom.xml | 22 ++--------------------
3 files changed, 20 insertions(+), 62 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kudu/blob/71deb95e/java/assembly.xml
----------------------------------------------------------------------
diff --git a/java/assembly.xml b/java/assembly.xml
deleted file mode 100644
index 08e1df0..0000000
--- a/java/assembly.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<!--
-
-Licensed 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>assemble</id>
- <formats>
- <format>jar</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>${project.basedir}/src</directory>
- <outputDirectory>/</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>${project.build.directory}/descriptor</directory>
- <outputDirectory>/descriptor</outputDirectory>
- <includes>
- <include>service.mdl</include>
- </includes>
- </fileSet>
- </fileSets>
-</assembly>
http://git-wip-us.apache.org/repos/asf/kudu/blob/71deb95e/java/kudu-client-tools/pom.xml
----------------------------------------------------------------------
diff --git a/java/kudu-client-tools/pom.xml b/java/kudu-client-tools/pom.xml
index a9934e3..f5203f7 100644
--- a/java/kudu-client-tools/pom.xml
+++ b/java/kudu-client-tools/pom.xml
@@ -27,7 +27,8 @@
</parent>
<artifactId>kudu-client-tools</artifactId>
- <name>Collection of tools that interact directly with Kudu</name>
+ <name>Kudu Client Tools</name>
+ <description>Collection of tools that interact directly with Kudu</description>
<dependencies>
<dependency>
@@ -49,6 +50,13 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client</artifactId>
+ <version>${hadoop.version}</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
@@ -83,21 +91,23 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
</plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>${maven-assembly-plugin.version}</version>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>${maven-shade-plugin.version}</version>
<configuration>
- <descriptorRefs>
- <descriptorRef>jar-with-dependencies</descriptorRef>
- </descriptorRefs>
- <appendAssemblyId>true</appendAssemblyId>
+ <artifactSet>
+ <includes>
+ <include>*:*</include>
+ </includes>
+ </artifactSet>
</configuration>
<executions>
<execution>
<phase>package</phase>
<goals>
- <goal>single</goal>
+ <goal>shade</goal>
</goals>
</execution>
</executions>
http://git-wip-us.apache.org/repos/asf/kudu/blob/71deb95e/java/kudu-mapreduce/pom.xml
----------------------------------------------------------------------
diff --git a/java/kudu-mapreduce/pom.xml b/java/kudu-mapreduce/pom.xml
index 38c9d91..5682e38 100644
--- a/java/kudu-mapreduce/pom.xml
+++ b/java/kudu-mapreduce/pom.xml
@@ -27,7 +27,7 @@
</parent>
<artifactId>kudu-mapreduce</artifactId>
- <name>Kudu's MapReduce bindings</name>
+ <name>Kudu MapReduce bindings</name>
<dependencies>
<dependency>
@@ -68,6 +68,7 @@
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
<version>${hadoop.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -83,25 +84,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>${maven-assembly-plugin.version}</version>
- <configuration>
- <descriptorRefs>
- <descriptorRef>jar-with-dependencies</descriptorRef>
- </descriptorRefs>
- <appendAssemblyId>true</appendAssemblyId>
- </configuration>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</project>