Author: billie
Date: Fri May 17 02:02:00 2013
New Revision: 1483635
URL: http://svn.apache.org/r1483635
Log:
ACCUMULO-1354 moved hadoop version properties to profiles
Modified:
accumulo/trunk/pom.xml
Modified: accumulo/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/accumulo/trunk/pom.xml?rev=1483635&r1=1483634&r2=1483635&view=diff
==============================================================================
--- accumulo/trunk/pom.xml (original)
+++ accumulo/trunk/pom.xml Fri May 17 02:02:00 2013
@@ -107,14 +107,11 @@
<!-- used for filtering the java source with the current version -->
<accumulo.release.version>${project.version}</accumulo.release.version>
<!-- the maven-release-plugin makes this recommendation, due to plugin
bugs -->
- <hadoop.version>1.0.4</hadoop.version>
- <httpclient.version>3.0.1</httpclient.version>
<maven.min-version>3.0.4</maven.min-version>
<powermock.version>1.5</powermock.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<sealJars>false</sealJars>
- <slf4j.version>1.4.3</slf4j.version>
<!-- include the tarball, as well as the zip, for the Apache
source-release artifact -->
<sourceReleaseAssemblyDescriptor>source-release-zip-tar</sourceReleaseAssemblyDescriptor>
<!-- ZooKeeper 3.4.x works also, but we're not using new features yet;
this ensures 3.3.x compatibility. -->
@@ -874,5 +871,36 @@
</plugins>
</reporting>
</profile>
+ <profile>
+ <!-- profile for building against Hadoop 1.0.x
+ Activate by not specifying hadoop.profile -->
+ <id>hadoop-1.0</id>
+ <activation>
+ <property>
+ <name>!hadoop.profile</name>
+ </property>
+ </activation>
+ <properties>
+ <hadoop.version>1.0.4</hadoop.version>
+ <httpclient.version>3.0.1</httpclient.version>
+ <slf4j.version>1.4.3</slf4j.version>
+ </properties>
+ </profile>
+ <profile>
+ <!-- profile for building against Hadoop 2.0.x
+ Activate using: mvn -Dhadoop.profile=2.0 -->
+ <id>hadoop-2.0</id>
+ <activation>
+ <property>
+ <name>hadoop.profile</name>
+ <value>2.0</value>
+ </property>
+ </activation>
+ <properties>
+ <hadoop.version>2.0.4-alpha</hadoop.version>
+ <httpclient.version>3.1</httpclient.version>
+ <slf4j.version>1.6.1</slf4j.version>
+ </properties>
+ </profile>
</profiles>
</project>
