You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mrql.apache.org by fe...@apache.org on 2014/12/18 23:09:19 UTC
incubator-mrql git commit: MRQL-60: Fix building dependencies for
hadoop 1.x
Repository: incubator-mrql
Updated Branches:
refs/heads/master d3a9018b2 -> d3f61f9df
MRQL-60: Fix building dependencies for hadoop 1.x
Project: http://git-wip-us.apache.org/repos/asf/incubator-mrql/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mrql/commit/d3f61f9d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mrql/tree/d3f61f9d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mrql/diff/d3f61f9d
Branch: refs/heads/master
Commit: d3f61f9df1c21133e361df8824df7f024f7c4bc1
Parents: d3a9018
Author: fegaras <fe...@cse.uta.edu>
Authored: Thu Dec 18 16:08:32 2014 -0600
Committer: fegaras <fe...@cse.uta.edu>
Committed: Thu Dec 18 16:08:32 2014 -0600
----------------------------------------------------------------------
core/pom.xml | 7 +------
.../src/main/java/org/apache/mrql/MapReduceEvaluator.gen | 2 +-
pom.xml | 5 +++++
3 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mrql/blob/d3f61f9d/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index a5859d7..6251883 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -64,7 +64,7 @@
</execution>
</executions>
</plugin>
- <plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.4</version>
@@ -73,11 +73,6 @@
<outputDirectory>${project.parent.basedir}/lib</outputDirectory>
<useDefaultManifestFile>true</useDefaultManifestFile>
</configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.4</version>
<executions>
<execution>
<goals>
http://git-wip-us.apache.org/repos/asf/incubator-mrql/blob/d3f61f9d/mapreduce/src/main/java/org/apache/mrql/MapReduceEvaluator.gen
----------------------------------------------------------------------
diff --git a/mapreduce/src/main/java/org/apache/mrql/MapReduceEvaluator.gen b/mapreduce/src/main/java/org/apache/mrql/MapReduceEvaluator.gen
index 16c06ee..84d82e5 100644
--- a/mapreduce/src/main/java/org/apache/mrql/MapReduceEvaluator.gen
+++ b/mapreduce/src/main/java/org/apache/mrql/MapReduceEvaluator.gen
@@ -64,7 +64,7 @@ final public class MapReduceEvaluator extends Evaluator {
for ( Map.Entry<String,String> entry: old_conf )
if (entry.getKey().startsWith("mrql.") && entry.getValue() != null)
conf.set(entry.getKey(),entry.getValue());
- conf.unset("mapred.input.dir.formats"); // need to reset MultipleInputs for local mode
+ conf.set("mapred.input.dir.formats",""); // need to reset MultipleInputs for local mode
return conf;
}
http://git-wip-us.apache.org/repos/asf/incubator-mrql/blob/d3f61f9d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 10995c8..7414bf4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -229,6 +229,11 @@
<artifactId>hadoop-core</artifactId>
<version>${hadoop.version}</version>
</dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.1</version>
+ </dependency>
</dependencies>
</profile>
<profile>