Browse files

Enabled an alternate profile for building and testing against the old…

… hadoop (1.0.x).

- also dropped support for Mac OS JDK 1.6 as it complicates the profiles
- added target to gitignore
  • Loading branch information...
1 parent d0f5a10 commit b3079d617b8a5ef014c3615f825a5b8e4ec40a3e @sjlee sjlee committed Sep 5, 2013
Showing with 34 additions and 24 deletions.
  1. +1 −0 .gitignore
  2. +2 −0 README.md
  3. +31 −24 pom.xml
View
1 .gitignore
@@ -25,3 +25,4 @@ out/
*.ipr
*.iml
*.iws
+/target
View
2 README.md
@@ -22,6 +22,8 @@ You can read more about Hadoop, LZO, and how we're using it at Twitter at [http:
To get started, see [http://code.google.com/p/hadoop-gpl-compression/wiki/FAQ](http://code.google.com/p/hadoop-gpl-compression/wiki/FAQ). This project is built exactly the same way; please follow the answer to "How do I configure Hadoop to use these classes?" on that page, or follow the summarized version here.
+You need JDK 1.6 or higher to build hadoop-lzo (1.7 or higher on Mac OS).
+
LZO 2.x is required, and most easily installed via the package manager on your system. If you choose to install manually for whatever reason (developer OSX machines is a common use-case) this is accomplished as follows:
1. Download the latest LZO release from http://www.oberhumer.com/opensource/lzo/
View
55 pom.xml
@@ -11,18 +11,6 @@
<dependencies>
<dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- <version>2.0.4-alpha</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-mapreduce-client-core</artifactId>
- <version>2.0.4-alpha</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.1</version>
@@ -108,21 +96,40 @@
<activation>
<activeByDefault>true</activeByDefault>
</activation>
- <properties>
- <tools.jar>${java.home}/../lib/tools.jar</tools.jar>
- </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ <version>2.0.4-alpha</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-mapreduce-client-core</artifactId>
+ <version>2.0.4-alpha</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
</profile>
<profile>
- <id>mac-jdk6-profile</id>
+ <id>hadoop-old</id>
<activation>
- <file>
- <missing>${java.home}/../lib/tools.jar</missing>
- <exists>${java.home}/../Classes/classes.jar</exists>
- </file>
+ <activeByDefault>false</activeByDefault>
</activation>
- <properties>
- <tools.jar>${java.home}/../Classes/classes.jar</tools.jar>
- </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-core</artifactId>
+ <version>1.0.4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-test</artifactId>
+ <version>1.0.4</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
</profile>
</profiles>
@@ -276,7 +283,7 @@
<artifactId>tools</artifactId>
<version>1.6</version>
<scope>system</scope>
- <systemPath>${tools.jar}</systemPath>
+ <systemPath>${java.home}/../lib/tools.jar</systemPath>
</dependency>
</dependencies>
</plugin>

0 comments on commit b3079d6

Please sign in to comment.