Skip to content

Commit f6661c2

Browse files
committed
fix profile activation
1 parent 1a0195f commit f6661c2

File tree

2 files changed

+7
-12
lines changed

2 files changed

+7
-12
lines changed

spark-dependencies/pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -798,12 +798,6 @@
798798

799799
<profile>
800800
<id>sparkr</id>
801-
802-
<!-- see exclude-sparkr profile in spark -->
803-
<properties>
804-
<sparkr.activate>y</sparkr.activate>
805-
</properties>
806-
807801
<build>
808802
<plugins>
809803
<plugin>

spark/pom.xml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -432,16 +432,17 @@
432432
</build>
433433

434434
<profiles>
435+
436+
<!-- to deactivate 'exclude-sparkr' automatically when 'spark' is activated -->
435437
<profile>
436-
<id>exclude-sparkr</id>
438+
<id>sparkr</id>
439+
</profile>
437440

438-
<!-- see sparkr profile in spark-dependencies -->
441+
<profile>
442+
<id>exclude-sparkr</id>
439443
<activation>
440-
<property>
441-
<name>!sparkr.activate</name>
442-
</property>
444+
<activeByDefault>true</activeByDefault>
443445
</activation>
444-
445446
<build>
446447
<plugins>
447448
<plugin>

0 commit comments

Comments
 (0)