diff options
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 84 |
1 files changed, 50 insertions, 34 deletions
@@ -129,6 +129,7 @@ <chill.version>0.3.6</chill.version> <codahale.metrics.version>3.0.0</codahale.metrics.version> <avro.version>1.7.4</avro.version> + <jets3t.version>0.7.1</jets3t.version> <PermGen>64m</PermGen> <MaxPermGen>512m</MaxPermGen> @@ -560,10 +561,18 @@ </exclusion> </exclusions> </dependency> + <!-- See SPARK-1556 for info on this dependency: --> <dependency> <groupId>net.java.dev.jets3t</groupId> <artifactId>jets3t</artifactId> - <version>0.7.1</version> + <version>${jets3t.version}</version> + <scope>runtime</scope> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> @@ -843,36 +852,6 @@ </build> <profiles> - <!-- SPARK-1121: Adds an explicit dependency on Avro to work around a Hadoop 0.23.X issue --> - <profile> - <id>hadoop-0.23</id> - <dependencies> - <dependency> - <groupId>org.apache.avro</groupId> - <artifactId>avro</artifactId> - </dependency> - </dependencies> - </profile> - - <profile> - <id>yarn-alpha</id> - <properties> - <hadoop.major.version>2</hadoop.major.version> - <!-- 0.23.* is same as 2.0.* - except hardened to run production jobs --> - <hadoop.version>0.23.7</hadoop.version> - <!--<hadoop.version>2.0.5-alpha</hadoop.version> --> - </properties> - <dependencies> - <dependency> - <groupId>org.apache.avro</groupId> - <artifactId>avro</artifactId> - </dependency> - </dependencies> - <modules> - <module>yarn</module> - </modules> - - </profile> <!-- Ganglia integration is not included by default due to LGPL-licensed code --> <profile> @@ -907,17 +886,54 @@ </profile> + <!-- A series of build profiles where customizations for particular Hadoop releases can be made --> + <profile> - <id>yarn</id> + <id>hadoop-0.23</id> + <!-- SPARK-1121: Adds an explicit dependency on Avro to work around a Hadoop 0.23.X issue --> + <dependencies> + <dependency> + <groupId>org.apache.avro</groupId> + <artifactId>avro</artifactId> + </dependency> + </dependencies> + </profile> + + <profile> + <id>hadoop-2.2</id> + <properties> + <protobuf.version>2.5.0</protobuf.version> + </properties> + </profile> + + <profile> + <id>hadoop-2.3</id> <properties> - <hadoop.major.version>2</hadoop.major.version> - <hadoop.version>2.2.0</hadoop.version> <protobuf.version>2.5.0</protobuf.version> + <jets3t.version>0.9.0</jets3t.version> </properties> + </profile> + + <profile> + <id>hadoop-2.4</id> + <properties> + <protobuf.version>2.5.0</protobuf.version> + <jets3t.version>0.9.0</jets3t.version> + </properties> + </profile> + + <profile> + <id>yarn-alpha</id> <modules> <module>yarn</module> </modules> + </profile> + <profile> + <id>yarn</id> + <modules> + <module>yarn</module> + </modules> </profile> <!-- Build without Hadoop dependencies that are included in some runtime environments. --> |