Skip to content

Commit f21f356

Browse files
srowensrowen
committed
Build changes to set up for jets3t fix
1 parent fb05432 commit f21f356

File tree

1 file changed

+25
-32
lines changed

1 file changed

+25
-32
lines changed

‎pom.xml‎

Lines changed: 25 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -830,36 +830,6 @@
830830
</build>
831831

832832
<profiles>
833-
<!-- SPARK-1121: Adds an explicit dependency on Avro to work around a Hadoop 0.23.X issue -->
834-
<profile>
835-
<id>hadoop-0.23</id>
836-
<dependencies>
837-
<dependency>
838-
<groupId>org.apache.avro</groupId>
839-
<artifactId>avro</artifactId>
840-
</dependency>
841-
</dependencies>
842-
</profile>
843-
844-
<profile>
845-
<id>yarn-alpha</id>
846-
<properties>
847-
<hadoop.major.version>2</hadoop.major.version>
848-
<!-- 0.23.* is same as 2.0.* - except hardened to run production jobs -->
849-
<hadoop.version>0.23.7</hadoop.version>
850-
<!--<hadoop.version>2.0.5-alpha</hadoop.version> -->
851-
</properties>
852-
<dependencies>
853-
<dependency>
854-
<groupId>org.apache.avro</groupId>
855-
<artifactId>avro</artifactId>
856-
</dependency>
857-
</dependencies>
858-
<modules>
859-
<module>yarn</module>
860-
</modules>
861-
862-
</profile>
863833

864834
<!-- Ganglia integration is not included by default due to LGPL-licensed code -->
865835
<profile>
@@ -894,17 +864,40 @@
894864

895865
</profile>
896866

867+
<!-- SPARK-1121: Adds an explicit dependency on Avro to work around a Hadoop 0.23.X issue -->
897868
<profile>
898-
<id>yarn</id>
869+
<id>hadoop-0.23</id>
870+
<properties>
871+
<hadoop.version>0.23.7</hadoop.version>
872+
</properties>
873+
<dependencies>
874+
<dependency>
875+
<groupId>org.apache.avro</groupId>
876+
<artifactId>avro</artifactId>
877+
</dependency>
878+
</dependencies>
879+
</profile>
880+
881+
<profile>
882+
<id>hadoop-2.2</id>
899883
<properties>
900-
<hadoop.major.version>2</hadoop.major.version>
901884
<hadoop.version>2.2.0</hadoop.version>
902885
<protobuf.version>2.5.0</protobuf.version>
903886
</properties>
887+
</profile>
888+
889+
<profile>
890+
<id>yarn-alpha</id>
904891
<modules>
905892
<module>yarn</module>
906893
</modules>
894+
</profile>
907895

896+
<profile>
897+
<id>yarn</id>
898+
<modules>
899+
<module>yarn</module>
900+
</modules>
908901
</profile>
909902

910903
<!-- Build without Hadoop dependencies that are included in some runtime environments. -->

0 commit comments

Comments
 (0)