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

Merge pull request #431 from mbautin/revert_default_profile 

Remove activation of profiles by default
parents 55327a28 fe3eceab
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
bagel/pom.xml
+ 0
− 11
View file @ 95e14fbc
...@@ -45,11 +45,6 @@ ...@@ -45,11 +45,6 @@
<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>
...@@ -77,12 +72,6 @@ ...@@ -77,12 +72,6 @@
</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
+ 0
− 11
View file @ 95e14fbc
...@@ -163,11 +163,6 @@ ...@@ -163,11 +163,6 @@
<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>
...@@ -220,12 +215,6 @@ ...@@ -220,12 +215,6 @@
</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>
......
examples/pom.xml
+ 0
− 11
View file @ 95e14fbc
...@@ -50,11 +50,6 @@ ...@@ -50,11 +50,6 @@
<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>
...@@ -88,12 +83,6 @@ ...@@ -88,12 +83,6 @@
</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
+ 0
− 11
View file @ 95e14fbc
...@@ -499,11 +499,6 @@ ...@@ -499,11 +499,6 @@
<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>
...@@ -521,12 +516,6 @@ ...@@ -521,12 +516,6 @@
<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
+ 0
− 11
View file @ 95e14fbc
...@@ -70,11 +70,6 @@ ...@@ -70,11 +70,6 @@
<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>
...@@ -115,12 +110,6 @@ ...@@ -115,12 +110,6 @@
</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
+ 0
− 11
View file @ 95e14fbc
...@@ -72,11 +72,6 @@ ...@@ -72,11 +72,6 @@
<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>
...@@ -128,12 +123,6 @@ ...@@ -128,12 +123,6 @@
</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>
......
streaming/pom.xml
+ 0
− 11
View file @ 95e14fbc
...@@ -83,11 +83,6 @@ ...@@ -83,11 +83,6 @@
<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>
...@@ -115,12 +110,6 @@ ...@@ -115,12 +110,6 @@
</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>
......
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