Repository: crunch Updated Branches: refs/heads/master eac45b00a -> e04f4c7d9
CRUNCH-367: Moving default properties outside of default profile Signed-off-by: Micah Whitacre <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/crunch/repo Commit: http://git-wip-us.apache.org/repos/asf/crunch/commit/e04f4c7d Tree: http://git-wip-us.apache.org/repos/asf/crunch/tree/e04f4c7d Diff: http://git-wip-us.apache.org/repos/asf/crunch/diff/e04f4c7d Branch: refs/heads/master Commit: e04f4c7d93410f05872066c8b50f608d3d30ff1b Parents: eac45b0 Author: Sean Griffin <[email protected]> Authored: Tue Mar 18 08:35:54 2014 -0500 Committer: Micah Whitacre <[email protected]> Committed: Tue Mar 25 20:50:39 2014 -0500 ---------------------------------------------------------------------- pom.xml | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/crunch/blob/e04f4c7d/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 8812f5e..1fa6f2c 100644 --- a/pom.xml +++ b/pom.xml @@ -88,6 +88,11 @@ under the License. <scalatest.version>1.9.1</scalatest.version> <spark.version>0.8.0-incubating</spark.version> <pkg>org.apache.crunch</pkg> + + <!-- Can be overridden by hadoop-2 profile, but these are the default values --> + <hadoop.version>1.1.2</hadoop.version> + <hbase.version>0.96.0-hadoop1</hbase.version> + <hbase.midfix>hadoop1</hbase.midfix> </properties> <scm> @@ -429,24 +434,10 @@ under the License. <version>${scala.version}</version> </dependency> </dependencies> - </dependencyManagement> <profiles> <profile> - <id>hadoop-1</id> - <activation> - <property> - <name>!crunch.platform</name> - </property> - </activation> - <properties> - <hadoop.version>1.1.2</hadoop.version> - <hbase.version>0.96.0-hadoop1</hbase.version> - <hbase.midfix>hadoop1</hbase.midfix> - </properties> - </profile> - <profile> <id>hadoop-2</id> <activation> <property> @@ -458,7 +449,6 @@ under the License. <hadoop.version>2.2.0</hadoop.version> <hbase.version>0.96.0-hadoop2</hbase.version> <commons-lang.version>2.5</commons-lang.version> - <slf4j.version>1.6.1</slf4j.version> <hbase.midfix>hadoop2</hbase.midfix> </properties> <dependencyManagement>
