Skip to content

Commit fe3ecea

Browse files
mbautinmbautin
committed
Remove activation of profiles by default
See the discussion at mesos/spark#355 for why default profile activation is a problem.
1 parent 55327a2 commit fe3ecea

File tree

7 files changed

+0
-77
lines changed

7 files changed

+0
-77
lines changed

‎bagel/pom.xml‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,6 @@
4545
<profiles>
4646
<profile>
4747
<id>hadoop1</id>
48-
<activation>
49-
<property>
50-
<name>!hadoopVersion</name>
51-
</property>
52-
</activation>
5348
<dependencies>
5449
<dependency>
5550
<groupId>org.spark-project</groupId>
@@ -77,12 +72,6 @@
7772
</profile>
7873
<profile>
7974
<id>hadoop2</id>
80-
<activation>
81-
<property>
82-
<name>hadoopVersion</name>
83-
<value>2</value>
84-
</property>
85-
</activation>
8675
<dependencies>
8776
<dependency>
8877
<groupId>org.spark-project</groupId>

‎core/pom.xml‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -163,11 +163,6 @@
163163
<profiles>
164164
<profile>
165165
<id>hadoop1</id>
166-
<activation>
167-
<property>
168-
<name>!hadoopVersion</name>
169-
</property>
170-
</activation>
171166
<dependencies>
172167
<dependency>
173168
<groupId>org.apache.hadoop</groupId>
@@ -220,12 +215,6 @@
220215
</profile>
221216
<profile>
222217
<id>hadoop2</id>
223-
<activation>
224-
<property>
225-
<name>hadoopVersion</name>
226-
<value>2</value>
227-
</property>
228-
</activation>
229218
<dependencies>
230219
<dependency>
231220
<groupId>org.apache.hadoop</groupId>

‎examples/pom.xml‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,6 @@
5050
<profiles>
5151
<profile>
5252
<id>hadoop1</id>
53-
<activation>
54-
<property>
55-
<name>!hadoopVersion</name>
56-
</property>
57-
</activation>
5853
<dependencies>
5954
<dependency>
6055
<groupId>org.spark-project</groupId>
@@ -88,12 +83,6 @@
8883
</profile>
8984
<profile>
9085
<id>hadoop2</id>
91-
<activation>
92-
<property>
93-
<name>hadoopVersion</name>
94-
<value>2</value>
95-
</property>
96-
</activation>
9786
<dependencies>
9887
<dependency>
9988
<groupId>org.spark-project</groupId>

‎pom.xml‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -499,11 +499,6 @@
499499
<profiles>
500500
<profile>
501501
<id>hadoop1</id>
502-
<activation>
503-
<property>
504-
<name>!hadoopVersion</name>
505-
</property>
506-
</activation>
507502

508503
<properties>
509504
<hadoop.major.version>1</hadoop.major.version>
@@ -521,12 +516,6 @@
521516

522517
<profile>
523518
<id>hadoop2</id>
524-
<activation>
525-
<property>
526-
<name>hadoopVersion</name>
527-
<value>2</value>
528-
</property>
529-
</activation>
530519
<properties>
531520
<hadoop.major.version>2</hadoop.major.version>
532521
</properties>

‎repl-bin/pom.xml‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,6 @@
7070
<profiles>
7171
<profile>
7272
<id>hadoop1</id>
73-
<activation>
74-
<property>
75-
<name>!hadoopVersion</name>
76-
</property>
77-
</activation>
7873
<properties>
7974
<classifier>hadoop1</classifier>
8075
</properties>
@@ -115,12 +110,6 @@
115110
</profile>
116111
<profile>
117112
<id>hadoop2</id>
118-
<activation>
119-
<property>
120-
<name>hadoopVersion</name>
121-
<value>2</value>
122-
</property>
123-
</activation>
124113
<properties>
125114
<classifier>hadoop2</classifier>
126115
</properties>

‎repl/pom.xml‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,6 @@
7272
<profiles>
7373
<profile>
7474
<id>hadoop1</id>
75-
<activation>
76-
<property>
77-
<name>!hadoopVersion</name>
78-
</property>
79-
</activation>
8075
<properties>
8176
<classifier>hadoop1</classifier>
8277
</properties>
@@ -128,12 +123,6 @@
128123
</profile>
129124
<profile>
130125
<id>hadoop2</id>
131-
<activation>
132-
<property>
133-
<name>hadoopVersion</name>
134-
<value>2</value>
135-
</property>
136-
</activation>
137126
<properties>
138127
<classifier>hadoop2</classifier>
139128
</properties>

‎streaming/pom.xml‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,6 @@
8383
<profiles>
8484
<profile>
8585
<id>hadoop1</id>
86-
<activation>
87-
<property>
88-
<name>!hadoopVersion</name>
89-
</property>
90-
</activation>
9186
<dependencies>
9287
<dependency>
9388
<groupId>org.spark-project</groupId>
@@ -115,12 +110,6 @@
115110
</profile>
116111
<profile>
117112
<id>hadoop2</id>
118-
<activation>
119-
<property>
120-
<name>hadoopVersion</name>
121-
<value>2</value>
122-
</property>
123-
</activation>
124113
<dependencies>
125114
<dependency>
126115
<groupId>org.spark-project</groupId>

0 commit comments

Comments
 (0)