Skip to content
Snippets Groups Projects
Commit 995075bf authored by Matei Zaharia's avatar Matei Zaharia
Browse files

Merge pull request #355 from shivaram/default-hadoop-pom 

Activate hadoop1 profile by default for maven builds
parents 2e914d99 bbc56d85
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
bagel/pom.xml
+ 11
− 0
View file @ 995075bf
...@@ -45,6 +45,11 @@ ...@@ -45,6 +45,11 @@
<profiles> <profiles>
<profile> <profile>
<id>hadoop1</id> <id>hadoop1</id>
<activation>
<property>
<name>!hadoopVersion</name>
</property>
</activation>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.spark-project</groupId> <groupId>org.spark-project</groupId>
...@@ -72,6 +77,12 @@ ...@@ -72,6 +77,12 @@
</profile> </profile>
<profile> <profile>
<id>hadoop2</id> <id>hadoop2</id>
<activation>
<property>
<name>hadoopVersion</name>
<value>2</value>
</property>
</activation>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.spark-project</groupId> <groupId>org.spark-project</groupId>
......
core/pom.xml
+ 12
− 1
View file @ 995075bf
...@@ -159,6 +159,11 @@ ...@@ -159,6 +159,11 @@
<profiles> <profiles>
<profile> <profile>
<id>hadoop1</id> <id>hadoop1</id>
<activation>
<property>
<name>!hadoopVersion</name>
</property>
</activation>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
...@@ -211,6 +216,12 @@ ...@@ -211,6 +216,12 @@
</profile> </profile>
<profile> <profile>
<id>hadoop2</id> <id>hadoop2</id>
<activation>
<property>
<name>hadoopVersion</name>
<value>2</value>
</property>
</activation>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
...@@ -267,4 +278,4 @@ ...@@ -267,4 +278,4 @@
</build> </build>
</profile> </profile>
</profiles> </profiles>
</project> </project>
\ No newline at end of file
examples/pom.xml
+ 11
− 0
View file @ 995075bf
...@@ -45,6 +45,11 @@ ...@@ -45,6 +45,11 @@
<profiles> <profiles>
<profile> <profile>
<id>hadoop1</id> <id>hadoop1</id>
<activation>
<property>
<name>!hadoopVersion</name>
</property>
</activation>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.spark-project</groupId> <groupId>org.spark-project</groupId>
...@@ -72,6 +77,12 @@ ...@@ -72,6 +77,12 @@
</profile> </profile>
<profile> <profile>
<id>hadoop2</id> <id>hadoop2</id>
<activation>
<property>
<name>hadoopVersion</name>
<value>2</value>
</property>
</activation>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.spark-project</groupId> <groupId>org.spark-project</groupId>
......
pom.xml
+ 12
− 0
View file @ 995075bf
...@@ -481,6 +481,12 @@ ...@@ -481,6 +481,12 @@
<profiles> <profiles>
<profile> <profile>
<id>hadoop1</id> <id>hadoop1</id>
<activation>
<property>
<name>!hadoopVersion</name>
</property>
</activation>
<properties> <properties>
<hadoop.major.version>1</hadoop.major.version> <hadoop.major.version>1</hadoop.major.version>
</properties> </properties>
...@@ -497,6 +503,12 @@ ...@@ -497,6 +503,12 @@
<profile> <profile>
<id>hadoop2</id> <id>hadoop2</id>
<activation>
<property>
<name>hadoopVersion</name>
<value>2</value>
</property>
</activation>
<properties> <properties>
<hadoop.major.version>2</hadoop.major.version> <hadoop.major.version>2</hadoop.major.version>
</properties> </properties>
......
repl-bin/pom.xml
+ 11
− 0
View file @ 995075bf
...@@ -70,6 +70,11 @@ ...@@ -70,6 +70,11 @@
<profiles> <profiles>
<profile> <profile>
<id>hadoop1</id> <id>hadoop1</id>
<activation>
<property>
<name>!hadoopVersion</name>
</property>
</activation>
<properties> <properties>
<classifier>hadoop1</classifier> <classifier>hadoop1</classifier>
</properties> </properties>
...@@ -110,6 +115,12 @@ ...@@ -110,6 +115,12 @@
</profile> </profile>
<profile> <profile>
<id>hadoop2</id> <id>hadoop2</id>
<activation>
<property>
<name>hadoopVersion</name>
<value>2</value>
</property>
</activation>
<properties> <properties>
<classifier>hadoop2</classifier> <classifier>hadoop2</classifier>
</properties> </properties>
......
repl/pom.xml
+ 11
− 0
View file @ 995075bf
...@@ -72,6 +72,11 @@ ...@@ -72,6 +72,11 @@
<profiles> <profiles>
<profile> <profile>
<id>hadoop1</id> <id>hadoop1</id>
<activation>
<property>
<name>!hadoopVersion</name>
</property>
</activation>
<properties> <properties>
<classifier>hadoop1</classifier> <classifier>hadoop1</classifier>
</properties> </properties>
...@@ -116,6 +121,12 @@ ...@@ -116,6 +121,12 @@
</profile> </profile>
<profile> <profile>
<id>hadoop2</id> <id>hadoop2</id>
<activation>
<property>
<name>hadoopVersion</name>
<value>2</value>
</property>
</activation>
<properties> <properties>
<classifier>hadoop2</classifier> <classifier>hadoop2</classifier>
</properties> </properties>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment