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/01/03 20:53:18 UTC
kudu git commit: KUDU-1817. Fix kudu-spark2 artifactId in pom.xml
Repository: kudu
Updated Branches:
refs/heads/master a68779bc4 -> 33b1de3ee
KUDU-1817. Fix kudu-spark2 artifactId in pom.xml
kudu-spark2 pom.xml is malformed due to a maven shade plugin issue:
dependency-reduced-pom should use shadedArtifactId
(https://issues.apache.org/jira/browse/MSHADE-155)
I upgraded maven-shade-plugin to version 2.4 and fixed the pom.xml.
Additionally, I moved the default properties to a default profile.
This makes the property settings consistent for both versions.
Change-Id: I0dc9ac261a82e13d189bc1be04faea5a9812d518
Reviewed-on: http://gerrit.cloudera.org:8080/5586
Tested-by: Kudu Jenkins
Reviewed-by: Will Berkeley <wd...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/33b1de3e
Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/33b1de3e
Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/33b1de3e
Branch: refs/heads/master
Commit: 33b1de3eebc19c1be908f6f2d56cda2fe3cde995
Parents: a68779b
Author: Jun He <ju...@gmail.com>
Authored: Wed Dec 28 21:32:17 2016 -0800
Committer: Dan Burkert <da...@apache.org>
Committed: Tue Jan 3 20:53:02 2017 +0000
----------------------------------------------------------------------
java/kudu-spark/pom.xml | 26 +++++++++++++++-----------
1 file changed, 15 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kudu/blob/33b1de3e/java/kudu-spark/pom.xml
----------------------------------------------------------------------
diff --git a/java/kudu-spark/pom.xml b/java/kudu-spark/pom.xml
index 67bb151..d158214 100644
--- a/java/kudu-spark/pom.xml
+++ b/java/kudu-spark/pom.xml
@@ -23,15 +23,6 @@
<artifactId>kudu-${spark.version.label}_${scala.binary.version}</artifactId>
<name>Kudu Spark Bindings</name>
- <properties>
- <spark.version>1.6.1</spark.version>
- <spark.version.label>spark</spark.version.label>
- <scala.version>2.10.4</scala.version>
- <scala.binary.version>2.10</scala.binary.version>
- <top.dir>${project.basedir}/..</top.dir>
- <compat.src>src/main/spark1</compat.src>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.spark</groupId>
@@ -146,7 +137,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>2.3</version>
+ <version>2.4</version>
<configuration>
<artifactSet>
<includes>
@@ -185,13 +176,26 @@
<profiles>
<profile>
+ <id>spark_2.10</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <properties>
+ <spark.version>1.6.1</spark.version>
+ <spark.version.label>spark</spark.version.label>
+ <scala.version>2.10.4</scala.version>
+ <scala.binary.version>2.10</scala.binary.version>
+ <compat.src>src/main/spark1</compat.src>
+ </properties>
+ </profile>
+ <profile>
<id>spark2_2.11</id>
<properties>
<spark.version>2.0.1</spark.version>
- <compat.src>src/main/spark2</compat.src>
<spark.version.label>spark2</spark.version.label>
<scala.version>2.11.6</scala.version>
<scala.binary.version>2.11</scala.binary.version>
+ <compat.src>src/main/spark2</compat.src>
</properties>
</profile>
</profiles>