[
https://issues.apache.org/jira/browse/PIG-5132?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15885381#comment-15885381
]
liyunzhang_intel commented on PIG-5132:
---------------------------------------
[~szita]: in PIG-5132.aftermerge.0.patch. most accept except modification in
build.xml
{code}
git diff build.xml
diff --git a/build.xml b/build.xml
index 2ecf7b8..d8e88f1 100644
--- a/build.xml
+++ b/build.xml
@@ -394,6 +394,21 @@
<include name="joda-time-${joda-time.version}.jar"/>
<include name="automaton-${automaton.version}.jar"/>
<include name="jansi-${jansi.version}.jar"/>
+ <include name="scala*.jar"/>
+ <include name="akka*.jar"/>
+ <include name="jcl-over-slf4j*.jar"/>
+ <include name="jul-to-slf4j*.jar"/>
+ <include name="slf4j*.jar"/>
+ <include name="commons*.jar"/>
+ <include name="config*.jar"/>
+ <include name="netty*.jar"/>
+ <include name="jetty*.jar"/>
+ <include name="metrics-core*.jar"/>
+ <include name="jackson*.jar"/>
+ <include name="metrics-json-*.jar"/>
+ <include name="json4s-*.jar"/>
+ <include name="javax.servlet-*.jar"/>
+ <include name="reflectasm*.jar"/>
</patternset>
</fileset>
{code}
actually we need not put these jars to build/ivy/lib/Pig/, this folder
includes jars which is common use. All jar related to spark branch is in
build/ivy/lib/spark.
> Merge from trunk (5) [Spark Branch]
> -----------------------------------
>
> Key: PIG-5132
> URL: https://issues.apache.org/jira/browse/PIG-5132
> Project: Pig
> Issue Type: Bug
> Components: spark
> Reporter: liyunzhang_intel
> Assignee: liyunzhang_intel
> Fix For: spark-branch
>
> Attachments: diffOfPatches.png, hadoop-streaming.jar,
> jenkins.5132.2.fix.PNG, PIG-5132.1_fixes.patch, PIG-5132.1.patch,
> PIG-5132.2.fix.patch, PIG-5132.2.zip, PIG-5132.aftermerge.0.patch,
> PIG-5132.patch
>
>
> merge changes from trunk to branch.
> the latest commit in trunk is
> 92df45d - (origin/trunk, origin/HEAD, trunk) PIG-5085: Support FLATTEN of
> maps (szita via rohini)
--
This message was sent by Atlassian JIRA
(v6.3.15#6346)
