Author: zly
Date: Thu May 18 06:57:16 2017
New Revision: 1795485
URL: http://svn.apache.org/viewvc?rev=1795485&view=rev
Log:
PIG-5199:exclude jline in spark dependency(Adam via Liyun)
Modified:
pig/branches/spark/build.xml
pig/branches/spark/ivy.xml
Modified: pig/branches/spark/build.xml
URL:
http://svn.apache.org/viewvc/pig/branches/spark/build.xml?rev=1795485&r1=1795484&r2=1795485&view=diff
==============================================================================
--- pig/branches/spark/build.xml (original)
+++ pig/branches/spark/build.xml Thu May 18 06:57:16 2017
@@ -261,9 +261,7 @@
<property name="build.ivy.dir" location="${build.dir}/ivy" />
<property name="build.ivy.lib.dir" location="${build.ivy.dir}/lib" />
<property name="ivy.lib.dir"
location="${build.ivy.lib.dir}/${ant.project.name}"/>
- <!-- if we set ivy.lib.dir.spark as "${ivy.lib.dir}/spark",
org.apache.pig.test.TestRegisteredJarVisibility.testRegisterJarOverridePigJarPackages
will fail -->
- <!--<property name="ivy.lib.dir.spark" location="${ivy.lib.dir}/spark"
/>-->
- <property name="ivy.lib.dir.spark" location="${build.ivy.dir}/lib/spark" />
+ <property name="ivy.lib.dir.spark" location="${ivy.lib.dir}/spark" />
<property name="build.ivy.report.dir" location="${build.ivy.dir}/report" />
<property name="build.ivy.maven.dir" location="${build.ivy.dir}/maven" />
<property name="pom.xml" location="${build.ivy.maven.dir}/pom.xml"/>
@@ -385,6 +383,7 @@
<fileset dir="${ivy.lib.dir}" id="core.dependencies.jar">
<exclude name="**.*jar"/>
+ <exclude name="spark/**.*jar"/>
</fileset>
<fileset dir="${ivy.lib.dir}" id="runtime.dependencies-withouthadoop.jar">
Modified: pig/branches/spark/ivy.xml
URL:
http://svn.apache.org/viewvc/pig/branches/spark/ivy.xml?rev=1795485&r1=1795484&r2=1795485&view=diff
==============================================================================
--- pig/branches/spark/ivy.xml (original)
+++ pig/branches/spark/ivy.xml Thu May 18 06:57:16 2017
@@ -415,6 +415,7 @@
<exclude org="org.eclipse.jetty.orbit" module="javax.activation"/>
<exclude org="org.apache.hadoop" />
<exclude org="com.esotericsoftware.kryo" />
+ <exclude org="jline" module="jline"/>
<exclude org="com.google.guava" />
</dependency>
<dependency org="org.apache.spark" name="spark-yarn_2.11"
rev="${spark.version}" conf="spark->default">
