Modified: pig/branches/spark/ivy.xml URL: http://svn.apache.org/viewvc/pig/branches/spark/ivy.xml?rev=1784237&r1=1784236&r2=1784237&view=diff ============================================================================== --- pig/branches/spark/ivy.xml (original) +++ pig/branches/spark/ivy.xml Fri Feb 24 08:19:42 2017 @@ -38,11 +38,9 @@ <conf name="jdiff" visibility="private"/> <conf name="checkstyle" visibility="private"/> <conf name="buildJar" extends="compile,test" visibility="private"/> - <conf name="hadoop20" visibility="private"/> - <conf name="hadoop23" visibility="private"/> - <conf name="hbase94" visibility="private"/> - <conf name="hbase95" visibility="private"/> - <conf name="spark" visibility="private" /> + <conf name="hadoop2" visibility="private"/> + <conf name="hbase1" visibility="private"/> + <conf name="spark" visibility="private" /> </configurations> <publications> <artifact name="pig" conf="master"/> @@ -61,17 +59,17 @@ <dependency org="commons-beanutils" name="commons-beanutils-core" rev="${commons-beanutils.version}" conf="checkstyle->master"/> <dependency org="xmlenc" name="xmlenc" rev="${xmlenc.version}" - conf="hadoop23->master"/> + conf="hadoop2->master"/> <dependency org="com.sun.jersey" name="jersey-bundle" rev="${jersey.version}" - conf="hadoop23->master"/> + conf="hadoop2->master"/> <dependency org="com.sun.jersey" name="jersey-server" rev="${jersey.version}" - conf="hadoop23->master"/> + conf="hadoop2->master"/> <dependency org="com.sun.jersey.contribs" name="jersey-guice" rev="${jersey.version}" - conf="hadoop23->master"/> + conf="hadoop2->master"/> <dependency org="commons-codec" name="commons-codec" rev="${commons-codec.version}" - conf="hadoop23->master"/> + conf="hadoop2->master"/> <dependency org="commons-httpclient" name="commons-httpclient" rev="${commons-httpclient.version}" - conf="hadoop23->master"/> + conf="hadoop2->master"/> <dependency org="commons-el" name="commons-el" rev="${commons-el.version}" conf="compile->master"/> <dependency org="commons-io" name="commons-io" rev="${commons-io.version}" @@ -89,92 +87,86 @@ <dependency org="nl.basjes.parse" name="parser-core" rev="${basjes-httpdlog-pigloader.version}" conf="compile->master"/> <dependency org="commons-configuration" name="commons-configuration" rev="${commons-configuration.version}" - conf="hadoop23->master"/> + conf="hadoop2->master"/> <dependency org="commons-collections" name="commons-collections" rev="${commons-collections.version}" - conf="hadoop23->master"/> + conf="hadoop2->master"/> <dependency org="javax.servlet" name="servlet-api" rev="${servlet-api.version}" - conf="hadoop23->master"/> + conf="hadoop2->master"/> <dependency org="javax.ws.rs" name="jsr311-api" rev="${jsr311-api.version}" - conf="hadoop23->master"/> + conf="hadoop2->master"/> <dependency org="com.google.protobuf" name="protobuf-java" rev="${protobuf-java.version}" - conf="hadoop23->master"/> + conf="hadoop2->master"/> <dependency org="javax.inject" name="javax.inject" rev="${javax-inject.version}" - conf="hadoop23->master"/> + conf="hadoop2->master"/> <dependency org="javax.xml.bind" name="jaxb-api" rev="${jaxb-api.version}" - conf="hadoop23->master"/> + conf="hadoop2->master"/> <dependency org="com.sun.xml.bind" name="jaxb-impl" rev="${jaxb-impl.version}" - conf="hadoop23->master"/> + conf="hadoop2->master"/> <dependency org="com.google.inject" name="guice" rev="${guice.version}" - conf="hadoop23->master"/> + conf="hadoop2->master"/> <dependency org="com.google.inject.extensions" name="guice-servlet" rev="${guice-servlet.version}" - conf="hadoop23->master"/> + conf="hadoop2->master"/> <dependency org="aopalliance" name="aopalliance" rev="${aopalliance.version}" - conf="hadoop23->master"/> + conf="hadoop2->master"/> <dependency org="org.mortbay.jetty" name="jsp-2.1" rev="${jasper.version}" - conf="hadoop23->master"/> + conf="hadoop2->master"/> <dependency org="org.mortbay.jetty" name="jsp-api-2.1" rev="${jasper.version}" - conf="hadoop23->master"/> + conf="hadoop2->master"/> <dependency org="log4j" name="log4j" rev="${log4j.version}" conf="compile->master"/> - <dependency org="com.sun.jersey" name="jersey-core" rev="${jersey-core.version}" - conf="hadoop20->default"/> - <dependency org="org.apache.hadoop" name="hadoop-core" rev="${hadoop-core.version}" - conf="hadoop20->default"/> - <dependency org="org.apache.hadoop" name="hadoop-test" rev="${hadoop-test.version}" - conf="hadoop20->default"/> - <dependency org="org.apache.hadoop" name="hadoop-annotations" - rev="${hadoop-common.version}" conf="hadoop23->master"/> + <dependency org="org.apache.hadoop" name="hadoop-annotations" + rev="${hadoop-common.version}" conf="hadoop2->master"/> <dependency org="org.apache.hadoop" name="hadoop-auth" - rev="${hadoop-common.version}" conf="hadoop23->master"/> + rev="${hadoop-common.version}" conf="hadoop2->master"/> <dependency org="org.apache.hadoop" name="hadoop-common" - rev="${hadoop-common.version}" conf="hadoop23->master"> + rev="${hadoop-common.version}" conf="hadoop2->master"> <artifact name="hadoop-common" ext="jar" /> <artifact name="hadoop-common" type="tests" ext="jar" m:classifier="tests" /> </dependency> <dependency org="org.apache.hadoop" name="hadoop-hdfs" - rev="${hadoop-hdfs.version}" conf="hadoop23->master"> + rev="${hadoop-hdfs.version}" conf="hadoop2->master"> <artifact name="hadoop-hdfs" ext="jar" /> <artifact name="hadoop-hdfs" type="tests" ext="jar" m:classifier="tests" /> </dependency> <dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-core" rev="${hadoop-mapreduce.version}" - conf="hadoop23->master"/> + conf="hadoop2->master"/> <dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-jobclient" rev="${hadoop-mapreduce.version}" - conf="hadoop23->master"> + conf="hadoop2->master"> <artifact name="hadoop-mapreduce-client-jobclient" ext="jar" /> <artifact name="hadoop-mapreduce-client-jobclient" type="tests" ext="jar" m:classifier="tests"/> <exclude org="commons-daemon" module="commons-daemon"/><!--bad POM--> <exclude org="org.apache.commons" module="commons-daemon"/><!--bad POM--> </dependency> <dependency org="org.apache.hadoop" name="hadoop-yarn-server-tests" rev="${hadoop-mapreduce.version}" - conf="hadoop23->master"> + conf="hadoop2->master"> <artifact name="hadoop-yarn-server-tests" type="jar" m:classifier="tests"/> </dependency> <dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-app" rev="${hadoop-mapreduce.version}" - conf="hadoop23->master" /> + conf="hadoop2->master" /> <dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-shuffle" rev="${hadoop-mapreduce.version}" - conf="hadoop23->master" /> + conf="hadoop2->master" /> <dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-common" - rev="${hadoop-mapreduce.version}" conf="hadoop23->master"/> + rev="${hadoop-mapreduce.version}" conf="hadoop2->master"/> <dependency org="org.apache.hadoop" name="hadoop-yarn-api" - rev="${hadoop-mapreduce.version}" conf="hadoop23->master"/> + rev="${hadoop-mapreduce.version}" conf="hadoop2->master"/> <dependency org="org.apache.hadoop" name="hadoop-yarn-common" - rev="${hadoop-mapreduce.version}" conf="hadoop23->master"/> + rev="${hadoop-mapreduce.version}" conf="hadoop2->master"/> <dependency org="org.apache.hadoop" name="hadoop-yarn-server" - rev="${hadoop-mapreduce.version}" conf="hadoop23->master"/> + rev="${hadoop-mapreduce.version}" conf="hadoop2->master"/> <dependency org="org.apache.hadoop" name="hadoop-yarn-server-web-proxy" - rev="${hadoop-mapreduce.version}" conf="hadoop23->master"/> + rev="${hadoop-mapreduce.version}" conf="hadoop2->master"/> <dependency org="org.apache.hadoop" name="hadoop-yarn-server-common" - rev="${hadoop-mapreduce.version}" conf="hadoop23->master"/> + rev="${hadoop-mapreduce.version}" conf="hadoop2->master"/> <dependency org="org.apache.hadoop" name="hadoop-yarn-server-nodemanager" - rev="${hadoop-mapreduce.version}" conf="hadoop23->master"/> + rev="${hadoop-mapreduce.version}" conf="hadoop2->master"/> <dependency org="org.apache.hadoop" name="hadoop-yarn-server-resourcemanager" - rev="${hadoop-mapreduce.version}" conf="hadoop23->master"/> + rev="${hadoop-mapreduce.version}" conf="hadoop2->master"/> <dependency org="org.apache.hadoop" name="hadoop-yarn-client" - rev="${hadoop-mapreduce.version}" conf="hadoop23->master"/> + rev="${hadoop-mapreduce.version}" conf="hadoop2->master"/> <dependency org="org.apache.hadoop" name="hadoop-yarn-server-applicationhistoryservice" - rev="${hadoop-mapreduce.version}" conf="hadoop23->master"/> + rev="${hadoop-mapreduce.version}" conf="hadoop2->master"/> <dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-hs" - rev="${hadoop-mapreduce.version}" conf="hadoop23->master"/> + rev="${hadoop-mapreduce.version}" conf="hadoop2->master"/> <dependency org="org.mortbay.jetty" name="jetty" rev="${jetty.version}" conf="compile->master"> <artifact name="jetty" ext="jar" /> @@ -193,13 +185,7 @@ <exclude org="org.codehaus.jackson" module="jackson-mapper-asl"/> </dependency> <dependency org="org.apache.avro" name="avro-mapred" rev="${avro.version}" - conf="hadoop20->default;checkstyle->master"> - <exclude org="org.codehaus.jackson" module="jackson-core-asl"/> - <exclude org="org.codehaus.jackson" module="jackson-mapper-asl"/> - <exclude org="io.netty" module="netty"/> - </dependency> - <dependency org="org.apache.avro" name="avro-mapred" rev="${avro.version}" - conf="hadoop23->default;checkstyle->master"> + conf="hadoop2->default;checkstyle->master"> <artifact name="avro-mapred" type="jar" m:classifier="hadoop2"/> <exclude org="org.codehaus.jackson" module="jackson-core-asl"/> <exclude org="org.codehaus.jackson" module="jackson-mapper-asl"/> @@ -261,37 +247,14 @@ <dependency org="org.antlr" name="ST4" rev="${stringtemplate.version}" conf="compile->default"/> <dependency org="org.apache.zookeeper" name="zookeeper" rev="${zookeeper.version}" conf="compile->master"/> <dependency org="io.netty" name="netty" rev="${netty.version}" conf="test->master"/> + <dependency org="io.netty" name="netty-all" rev="${netty-all.version}" conf="test->master" /> <dependency org="dk.brics.automaton" name="automaton" rev="1.11-8" conf="compile->default"/> <dependency org="org.jruby" name="jruby-complete" rev="${jruby.version}" conf="compile->master"/> <dependency org="asm" name="asm" rev="${asm.version}" conf="compile->default"/> - <!-- HBase dependency in format for releases up to 0.94 (including) --> - <dependency org="org.apache.hbase" name="hbase" rev="${hbase94.version}" conf="hbase94->master"> - <artifact name="hbase" type="jar"/> - <artifact name="hbase" type="test-jar" ext="jar" m:classifier="tests"/> - <exclude org="org.apache.thrift" module="thrift"/> - <exclude org="org.apache.hadoop" module="hadoop-core"/> - <exclude org="org.apache.ant" module="ant" /> - <exclude org="org.slf4j" module="slf4j"/> - <exclude org="org.slf4j" module="slf4j-api"/> - <exclude org="org.slf4j" module="slf4j-log4j12" /> - <exclude org="org.slf4j" module="log4j12"/> - <exclude org="org.slf4j" module="log4j-over-slf4j"/> - <exclude org="stax" module="stax-api" /> - <exclude org="javax.xml.bind" module="jaxb-api" /> - <exclude org="javax.ws.rs" module="jsr311-api" /> - <exclude org="tomcat" module="jasper-runtime"/> - <exclude org="tomcat" module="jasper-compiler"/> - <exclude org="com.google.protobuf" module="protobuf-java"/> - <exclude org="com.sun.jersey" module="jersey-core"/> - <exclude org="com.sun.jersey" module="jersey-server"/> - <exclude org="com.sun.jersey" module="jersey-json"/> - <exclude org="asm" module="asm"/> - </dependency> - <!-- HBase dependency in format for releases higher or equal to 0.95 --> - <dependency org="org.apache.hbase" name="hbase-client" rev="${hbase95.version}" conf="hbase95->master"> + <dependency org="org.apache.hbase" name="hbase-client" rev="${hbase1.version}" conf="hbase1->master"> <artifact name="hbase-client" type="jar"/> <artifact name="hbase-client" type="test-jar" ext="jar" m:classifier="tests"/> <exclude org="org.slf4j" module="slf4j-api"/> @@ -307,7 +270,7 @@ <exclude org="asm" module="asm"/> </dependency> - <dependency org="org.apache.hbase" name="hbase-common" rev="${hbase95.version}" conf="hbase95->master"> + <dependency org="org.apache.hbase" name="hbase-common" rev="${hbase1.version}" conf="hbase1->master"> <artifact name="hbase-common" type="jar"/> <artifact name="hbase-common" type="test-jar" ext="jar" m:classifier="tests"/> <exclude org="org.apache.hadoop" module="hadoop-core"/> @@ -322,7 +285,7 @@ <exclude org="asm" module="asm"/> </dependency> - <dependency org="org.apache.hbase" name="hbase-server" rev="${hbase95.version}" conf="hbase95->master"> + <dependency org="org.apache.hbase" name="hbase-server" rev="${hbase1.version}" conf="hbase1->master"> <artifact name="hbase-server" type="jar"/> <artifact name="hbase-server" type="test-jar" ext="jar" m:classifier="tests"/> <exclude org="org.apache.hadoop" module="hadoop-core"/> @@ -339,20 +302,20 @@ <exclude org="asm" module="asm"/> </dependency> - <dependency org="org.apache.hbase" name="hbase-protocol" rev="${hbase95.version}" conf="hbase95->master"> + <dependency org="org.apache.hbase" name="hbase-protocol" rev="${hbase1.version}" conf="hbase1->master"> <artifact name="hbase-protocol" type="jar"/> <artifact name="hbase-protocol" type="test-jar" ext="jar" m:classifier="tests"/> <exclude org="com.google.protobuf" module="protobuf-java"/> </dependency> - <dependency org="org.apache.hbase" name="hbase-hadoop-compat" rev="${hbase95.version}" conf="hbase95->master"> + <dependency org="org.apache.hbase" name="hbase-hadoop-compat" rev="${hbase1.version}" conf="hbase1->master"> <artifact name="hbase-hadoop-compat" type="jar"/> <artifact name="hbase-hadoop-compat" type="test-jar" ext="jar" m:classifier="tests"/> </dependency> - <dependency org="org.apache.hbase" name="hbase-${hbase.hadoop.version}-compat" rev="${hbase95.version}" conf="hbase95->master"> - <artifact name="hbase-${hbase.hadoop.version}-compat" type="jar"/> - <artifact name="hbase-${hbase.hadoop.version}-compat" type="test-jar" ext="jar" m:classifier="tests"/> + <dependency org="org.apache.hbase" name="hbase-hadoop2-compat" rev="${hbase1.version}" conf="hbase1->master"> + <artifact name="hbase-hadoop2-compat" type="jar"/> + <artifact name="hbase-hadoop2-compat" type="test-jar" ext="jar" m:classifier="tests"/> <exclude org="org.apache.hadoop" module="hadoop-core"/> <exclude org="org.slf4j" module="slf4j-api"/> <exclude org="stax" module="stax-api" /> @@ -365,20 +328,17 @@ <exclude org="asm" module="asm"/> </dependency> - <dependency org="org.htrace" name="htrace-core" rev="3.0.4" conf="hadoop23->master"/> - <dependency org="org.apache.htrace" name="htrace-core" rev="${htrace.version}" conf="hadoop23->master"/> + <dependency org="org.htrace" name="htrace-core" rev="3.0.4" conf="hadoop2->master"/> + <dependency org="org.apache.htrace" name="htrace-core" rev="${htrace.version}" conf="hadoop2->master"/> <dependency org="org.fusesource.leveldbjni" name="leveldbjni-all" rev="${leveldbjni.version}" - conf="hadoop23->master"/> - <dependency org="org.cloudera.htrace" name="htrace-core" rev="2.00" conf="hbase95->master"> + conf="hadoop2->master"/> + <dependency org="org.cloudera.htrace" name="htrace-core" rev="2.00" conf="hbase1->master"> <artifact name="htrace-core" type="jar"/> </dependency> - <dependency org="com.lmax" name="disruptor" rev="3.3.0" conf="hbase95->master"/> + <dependency org="com.lmax" name="disruptor" rev="3.3.0" conf="hbase1->master"/> <!-- for TestHBaseStorage --> - <dependency org="com.github.stephenc.high-scale-lib" name="high-scale-lib" rev="${high-scale-lib.version}" - conf="test->default"/> - <dependency org="com.google.protobuf" name="protobuf-java" rev="${protobuf-java.version}" - conf="test->default"/> + <dependency org="org.apache.hbase" name="hbase-procedure" rev="${hbase1.version}" conf="test->master"/> <dependency org="com.yammer.metrics" name="metrics-core" rev="${metrics-core.version}" conf="test->default"/> @@ -428,10 +388,10 @@ conf="compile->master" /> <dependency org="org.apache.hive.shims" name="hive-shims-common" rev="${hive.version}" changing="true" conf="compile->master" /> + <dependency org="org.apache.hive" name="hive-contrib" rev="${hive.version}" changing="true" + conf="test->master" /> <dependency org="org.apache.hive.shims" name="hive-shims-0.23" rev="${hive.version}" changing="true" - conf="hadoop23->master" /> - <dependency org="org.apache.hive.shims" name="hive-shims-0.20S" rev="${hive.version}" changing="true" - conf="hadoop20->master" /> + conf="hadoop2->master" /> <dependency org="org.iq80.snappy" name="snappy" rev="${snappy.version}" conf="test->master" /> <dependency org="com.esotericsoftware.kryo" name="kryo" rev="${kryo.version}" @@ -464,33 +424,33 @@ <dependency org="javax.servlet" name="javax.servlet-api" rev="3.0.1" conf="spark->default"/> <dependency org="org.scala-lang.modules" name="scala-xml_2.11" rev="${scala-xml.version}" conf="spark->default"/> - <!-- for Tez integration --> - <dependency org="org.apache.tez" name="tez" rev="${tez.version}" - conf="hadoop23->master"/> - <dependency org="org.apache.tez" name="tez-common" rev="${tez.version}" - conf="hadoop23->master"/> - <dependency org="org.apache.tez" name="tez-api" rev="${tez.version}" - conf="hadoop23->master"/> - <dependency org="org.apache.tez" name="tez-dag" rev="${tez.version}" - conf="hadoop23->master"/> - <dependency org="org.apache.tez" name="tez-runtime-internals" rev="${tez.version}" - conf="hadoop23->master"/> - <dependency org="org.apache.tez" name="tez-runtime-library" rev="${tez.version}" - conf="hadoop23->master"/> - <dependency org="org.apache.tez" name="tez-mapreduce" rev="${tez.version}" - conf="hadoop23->master"/> - <dependency org="org.apache.tez" name="tez-yarn-timeline-history-with-acls" rev="${tez.version}" - conf="hadoop23->master"/> - <dependency org="org.apache.commons" name="commons-collections4" rev="${commons-collections4.version}" - conf="hadoop23->master"/> - <dependency org="org.codehaus.jettison" name="jettison" rev="${jettison.version}" - conf="hadoop23->master"/> - <dependency org="org.apache.commons" name="commons-math3" rev="${commons-math3.version}" - conf="hadoop23->master"/> - <dependency org="org.apache.curator" name="curator-framework" rev="${curator.version}" - conf="hadoop23->master"/> - <dependency org="org.apache.curator" name="curator-client" rev="${curator.version}" - conf="hadoop23->master"/> + <!-- for Tez integration --> + <dependency org="org.apache.tez" name="tez" rev="${tez.version}" + conf="hadoop2->master"/> + <dependency org="org.apache.tez" name="tez-common" rev="${tez.version}" + conf="hadoop2->master"/> + <dependency org="org.apache.tez" name="tez-api" rev="${tez.version}" + conf="hadoop2->master"/> + <dependency org="org.apache.tez" name="tez-dag" rev="${tez.version}" + conf="hadoop2->master"/> + <dependency org="org.apache.tez" name="tez-runtime-internals" rev="${tez.version}" + conf="hadoop2->master"/> + <dependency org="org.apache.tez" name="tez-runtime-library" rev="${tez.version}" + conf="hadoop2->master"/> + <dependency org="org.apache.tez" name="tez-mapreduce" rev="${tez.version}" + conf="hadoop2->master"/> + <dependency org="org.apache.tez" name="tez-yarn-timeline-history-with-acls" rev="${tez.version}" + conf="hadoop2->master"/> + <dependency org="org.apache.commons" name="commons-collections4" rev="${commons-collections4.version}" + conf="hadoop2->master"/> + <dependency org="org.codehaus.jettison" name="jettison" rev="${jettison.version}" + conf="hadoop2->master"/> + <dependency org="org.apache.commons" name="commons-math3" rev="${commons-math3.version}" + conf="hadoop2->master"/> + <dependency org="org.apache.curator" name="curator-framework" rev="${curator.version}" + conf="hadoop2->master"/> + <dependency org="org.apache.curator" name="curator-client" rev="${curator.version}" + conf="hadoop2->master"/> </dependencies> </ivy-module>
Added: pig/branches/spark/ivy/ant-contrib-1.0b3.jar URL: http://svn.apache.org/viewvc/pig/branches/spark/ivy/ant-contrib-1.0b3.jar?rev=1784237&view=auto ============================================================================== Binary file - no diff available. Propchange: pig/branches/spark/ivy/ant-contrib-1.0b3.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: pig/branches/spark/ivy/libraries.properties URL: http://svn.apache.org/viewvc/pig/branches/spark/ivy/libraries.properties?rev=1784237&r1=1784236&r2=1784237&view=diff ============================================================================== --- pig/branches/spark/ivy/libraries.properties (original) +++ pig/branches/spark/ivy/libraries.properties Fri Feb 24 08:19:42 2017 @@ -40,14 +40,10 @@ ivy.version=2.2.0 jasper.version=6.1.14 groovy.version=2.4.5 guava.version=11.0 -jersey-core.version=1.8 -hadoop-core.version=1.0.4 -hadoop-test.version=1.0.4 -hadoop-common.version=2.6.0 -hadoop-hdfs.version=2.6.0 -hadoop-mapreduce.version=2.6.0 -hbase94.version=0.94.1 -hbase95.version=0.98.12-${hbase.hadoop.version} +hadoop-common.version=2.7.3 +hadoop-hdfs.version=2.7.3 +hadoop-mapreduce.version=2.7.3 +hbase1.version=1.2.4 hsqldb.version=1.8.0.10 hive.version=1.2.1 httpcomponents.version=4.1 @@ -61,19 +57,20 @@ jdeb.version=0.8 jdiff.version=1.0.9 jettison.version=1.3.4 jetty.version=6.1.26 -jline.version=1.0 -joda-time.version=2.8.2 +jline.version=2.11 +joda-time.version=2.9.3 jopt.version=4.1 json-simple.version=1.1 junit.version=4.11 jruby.version=1.6.7 -jython.version=2.5.3 -kryo.version=2.21 +jython.version=2.7.0 +kryo.version=2.22 rhino.version=1.7R2 antlr.version=3.4 stringtemplate.version=4.0.4 log4j.version=1.2.16 netty.version=3.6.6.Final +netty-all.version=4.0.23.Final rats-lib.version=0.5.1 slf4j-api.version=1.6.1 slf4j-log4j12.version=1.6.1 Modified: pig/branches/spark/ivy/pig-template.xml URL: http://svn.apache.org/viewvc/pig/branches/spark/ivy/pig-template.xml?rev=1784237&r1=1784236&r2=1784237&view=diff ============================================================================== --- pig/branches/spark/ivy/pig-template.xml (original) +++ pig/branches/spark/ivy/pig-template.xml Fri Feb 24 08:19:42 2017 @@ -46,7 +46,7 @@ <dependency> <groupId>commons-net</groupId> <artifactId>commons-net</artifactId> - <version>1.4.1</version> + <version>3.1</version> </dependency> <dependency> <groupId>org.mortbay.jetty</groupId> @@ -59,16 +59,6 @@ <version>6.1.26</version> </dependency> <dependency> - <groupId>tomcat</groupId> - <artifactId>jasper-runtime</artifactId> - <version>5.5.12</version> - </dependency> - <dependency> - <groupId>tomcat</groupId> - <artifactId>jasper-compiler</artifactId> - <version>5.5.12</version> - </dependency> - <dependency> <groupId>org.mortbay.jetty</groupId> <artifactId>jsp-api-2.1</artifactId> <version>6.1.14</version> @@ -86,27 +76,17 @@ <dependency> <groupId>net.java.dev.jets3t</groupId> <artifactId>jets3t</artifactId> - <version>0.7.1</version> + <version>0.9.0</version> </dependency> <dependency> - <groupId>commons-net</groupId> - <artifactId>commons-net</artifactId> - <version>1.4.1</version> - </dependency> - <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>servlet-api-2.5</artifactId> - <version>6.1.14</version> - </dependency> - <dependency> - <groupId>net.sf.kosmosfs</groupId> - <artifactId>kfs</artifactId> - <version>0.3</version> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.8.1</version> + <version>4.11</version> </dependency> <dependency> <groupId>hsqldb</groupId> @@ -114,14 +94,9 @@ <version>1.8.0.10</version> </dependency> <dependency> - <groupId>oro</groupId> - <artifactId>oro</artifactId> - <version>2.0.8</version> - </dependency> - <dependency> <groupId>jline</groupId> <artifactId>jline</artifactId> - <version>1.0</version> + <version>2.11</version> </dependency> <dependency> <groupId>org.antlr</groupId> @@ -146,22 +121,22 @@ <dependency> <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-mapper-asl</artifactId> - <version>1.8.8</version> + <version>1.9.13</version> </dependency> <dependency> <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-core-asl</artifactId> - <version>1.8.8</version> + <version>1.9.13</version> </dependency> <dependency> <groupId>joda-time</groupId> <artifactId>joda-time</artifactId> - <version>2.1</version> + <version>2.9.3</version> </dependency> <dependency> <groupId>org.apache.avro</groupId> <artifactId>avro</artifactId> - <version>1.7.4</version> + <version>1.7.5</version> <exclusions> <exclusion> <!-- Don't pull in Avro's (later) version of Jetty.--> @@ -183,7 +158,7 @@ <dependency> <groupId>org.codehaus.groovy</groupId> <artifactId>groovy-all</artifactId> - <version>1.8.6</version> + <version>2.4.5</version> </dependency> </dependencies> </project> Modified: pig/branches/spark/ivy/piggybank-template.xml URL: http://svn.apache.org/viewvc/pig/branches/spark/ivy/piggybank-template.xml?rev=1784237&r1=1784236&r2=1784237&view=diff ============================================================================== --- pig/branches/spark/ivy/piggybank-template.xml (original) +++ pig/branches/spark/ivy/piggybank-template.xml Fri Feb 24 08:19:42 2017 @@ -51,7 +51,7 @@ <dependency> <groupId>joda-time</groupId> <artifactId>joda-time</artifactId> - <version>2.1</version> + <version>2.9.3</version> </dependency> <dependency> <groupId>com.googlecode.json-simple</groupId> @@ -61,7 +61,7 @@ <dependency> <groupId>org.apache.avro</groupId> <artifactId>avro</artifactId> - <version>1.7.4</version> + <version>1.7.5</version> <exclusions> <exclusion> <!-- Don't pull in Avro's (later) version of Jetty.--> @@ -78,7 +78,7 @@ <dependency> <groupId>nl.basjes.parse.httpdlog</groupId> <artifactId>httpdlog-pigloader</artifactId> - <version>2.2</version> + <version>2.4</version> </dependency> <dependency> <groupId>org.apache.pig</groupId> Modified: pig/branches/spark/ivy/pigsmoke-template.xml URL: http://svn.apache.org/viewvc/pig/branches/spark/ivy/pigsmoke-template.xml?rev=1784237&r1=1784236&r2=1784237&view=diff ============================================================================== --- pig/branches/spark/ivy/pigsmoke-template.xml (original) +++ pig/branches/spark/ivy/pigsmoke-template.xml Fri Feb 24 08:19:42 2017 @@ -31,7 +31,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.8.1</version> + <version>4.11</version> </dependency> <dependency> <groupId>org.apache.pig</groupId> Modified: pig/branches/spark/ivy/pigunit-template.xml URL: http://svn.apache.org/viewvc/pig/branches/spark/ivy/pigunit-template.xml?rev=1784237&r1=1784236&r2=1784237&view=diff ============================================================================== --- pig/branches/spark/ivy/pigunit-template.xml (original) +++ pig/branches/spark/ivy/pigunit-template.xml Fri Feb 24 08:19:42 2017 @@ -26,12 +26,12 @@ <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> - <version>2.3</version> + <version>2.4</version> </dependency> <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>1.2.14</version> + <version>1.2.16</version> </dependency> <dependency> <groupId>commons-logging</groupId> @@ -46,7 +46,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.8.1</version> + <version>4.11</version> </dependency> <dependency> <groupId>org.apache.pig</groupId> Added: pig/branches/spark/shims/src/hadoop2/org/apache/pig/backend/hadoop/executionengine/shims/HadoopShims.java URL: http://svn.apache.org/viewvc/pig/branches/spark/shims/src/hadoop2/org/apache/pig/backend/hadoop/executionengine/shims/HadoopShims.java?rev=1784237&view=auto ============================================================================== --- pig/branches/spark/shims/src/hadoop2/org/apache/pig/backend/hadoop/executionengine/shims/HadoopShims.java (added) +++ pig/branches/spark/shims/src/hadoop2/org/apache/pig/backend/hadoop/executionengine/shims/HadoopShims.java Fri Feb 24 08:19:42 2017 @@ -0,0 +1,116 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ +package org.apache.pig.backend.hadoop.executionengine.shims; + +import java.io.IOException; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.fs.FileSystem; +import org.apache.hadoop.fs.Path; +import org.apache.hadoop.mapred.JobConf; +import org.apache.hadoop.mapreduce.ContextFactory; +import org.apache.hadoop.mapreduce.JobContext; +import org.apache.hadoop.mapreduce.JobID; +import org.apache.hadoop.mapreduce.TaskAttemptContext; +import org.apache.hadoop.mapreduce.TaskAttemptID; +import org.apache.hadoop.mapreduce.TaskType; +import org.apache.hadoop.mapreduce.task.JobContextImpl; +import org.apache.hadoop.mapreduce.task.TaskAttemptContextImpl; + +public class HadoopShims { + + private static Log LOG = LogFactory.getLog(HadoopShims.class); + + static public JobContext cloneJobContext(JobContext original) throws IOException, InterruptedException { + JobContext newContext = ContextFactory.cloneContext(original, + new JobConf(original.getConfiguration())); + return newContext; + } + + static public TaskAttemptContext createTaskAttemptContext(Configuration conf, + TaskAttemptID taskId) { + if (conf instanceof JobConf) { + return new TaskAttemptContextImpl(new JobConf(conf), taskId); + } else { + return new TaskAttemptContextImpl(conf, taskId); + } + } + + static public JobContext createJobContext(Configuration conf, + JobID jobId) { + if (conf instanceof JobConf) { + return new JobContextImpl(new JobConf(conf), jobId); + } else { + return new JobContextImpl(conf, jobId); + } + } + + static public boolean isMap(TaskAttemptID taskAttemptID) { + TaskType type = taskAttemptID.getTaskType(); + if (type==TaskType.MAP) + return true; + + return false; + } + + static public TaskAttemptID getNewTaskAttemptID() { + TaskAttemptID taskAttemptID = new TaskAttemptID("", 1, TaskType.MAP, + 1, 1); + return taskAttemptID; + } + + static public TaskAttemptID createTaskAttemptID(String jtIdentifier, int jobId, boolean isMap, + int taskId, int id) { + if (isMap) { + return new TaskAttemptID(jtIdentifier, jobId, TaskType.MAP, taskId, id); + } else { + return new TaskAttemptID(jtIdentifier, jobId, TaskType.REDUCE, taskId, id); + } + } + + /** + * Returns whether the give path has a FileSystem implementation. + * + * @param path path + * @param conf configuration + * @return true if the give path's scheme has a FileSystem implementation, + * false otherwise + */ + public static boolean hasFileSystemImpl(Path path, Configuration conf) { + String scheme = path.toUri().getScheme(); + if (scheme != null) { + // Hadoop 0.23 + if (conf.get("fs.file.impl") != null) { + String fsImpl = conf.get("fs." + scheme + ".impl"); + if (fsImpl == null) { + return false; + } + } else { + try { + Object fs = FileSystem.getFileSystemClass(scheme,conf); + return fs == null ? false : true; + } catch (Exception e) { + return false; + } + } + } + return true; + } +} Added: pig/branches/spark/shims/test/hadoop2/.gitignore URL: http://svn.apache.org/viewvc/pig/branches/spark/shims/test/hadoop2/.gitignore?rev=1784237&view=auto ============================================================================== (empty) Modified: pig/branches/spark/src/META-INF/services/org.apache.pig.ExecType URL: http://svn.apache.org/viewvc/pig/branches/spark/src/META-INF/services/org.apache.pig.ExecType?rev=1784237&r1=1784236&r2=1784237&view=diff ============================================================================== --- pig/branches/spark/src/META-INF/services/org.apache.pig.ExecType (original) +++ pig/branches/spark/src/META-INF/services/org.apache.pig.ExecType Fri Feb 24 08:19:42 2017 @@ -13,7 +13,7 @@ # org.apache.pig.backend.hadoop.executionengine.mapReduceLayer.LocalExecType org.apache.pig.backend.hadoop.executionengine.mapReduceLayer.MRExecType -#org.apache.pig.backend.hadoop.executionengine.tez.TezLocalExecType -#org.apache.pig.backend.hadoop.executionengine.tez.TezExecType +org.apache.pig.backend.hadoop.executionengine.tez.TezLocalExecType +org.apache.pig.backend.hadoop.executionengine.tez.TezExecType org.apache.pig.backend.hadoop.executionengine.spark.SparkExecType org.apache.pig.backend.hadoop.executionengine.spark.SparkLocalExecType
