Skip to content

Commit 00c8335

Browse files
committed
Narrow down only to Hadoop 2 profile
1 parent 3838dfe commit 00c8335

File tree

2 files changed

+21
-12
lines changed

2 files changed

+21
-12
lines changed

pom.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -372,18 +372,6 @@
372372
<artifactId>junit-interface</artifactId>
373373
<scope>test</scope>
374374
</dependency>
375-
<!--
376-
Hack to exclude org.apache.hadoop:hadoop-yarn-server-resourcemanager:jar:tests.
377-
For some reasons, SBT starts to pull the dependencies of 'hadoop-yarn-server-tests' above
378-
with 'tests' classifier after upgrading SBT 1.3 (SPARK-21708). Otherwise, some tests might
379-
fail, see also SPARK-33104.
380-
-->
381-
<dependency>
382-
<groupId>org.apache.hadoop</groupId>
383-
<artifactId>hadoop-yarn-server-resourcemanager</artifactId>
384-
<version>${yarn.version}</version>
385-
<scope>test</scope>
386-
</dependency>
387375
</dependencies>
388376
<dependencyManagement>
389377
<dependencies>
@@ -1417,6 +1405,18 @@
14171405
</exclusion>
14181406
</exclusions>
14191407
</dependency>
1408+
<!--
1409+
Hack to exclude org.apache.hadoop:hadoop-yarn-server-resourcemanager:jar:tests.
1410+
For some reasons, SBT starts to pull the dependencies of 'hadoop-yarn-server-tests' above
1411+
with 'tests' classifier after upgrading SBT 1.3 (SPARK-21708). Otherwise, some tests might
1412+
fail, see also SPARK-33104.
1413+
-->
1414+
<dependency>
1415+
<groupId>org.apache.hadoop</groupId>
1416+
<artifactId>hadoop-yarn-server-resourcemanager</artifactId>
1417+
<version>${yarn.version}</version>
1418+
<scope>test</scope>
1419+
</dependency>
14201420
<dependency>
14211421
<groupId>org.apache.hadoop</groupId>
14221422
<artifactId>hadoop-yarn-server-web-proxy</artifactId>

resource-managers/yarn/pom.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,15 @@
6565
<classifier>tests</classifier>
6666
<scope>test</scope>
6767
</dependency>
68+
<!--
69+
Hack to exclude org.apache.hadoop:hadoop-yarn-server-resourcemanager:jar:tests.
70+
See the parent pom.xml for more details.
71+
-->
72+
<dependency>
73+
<groupId>org.apache.hadoop</groupId>
74+
<artifactId>hadoop-yarn-server-resourcemanager</artifactId>
75+
<scope>test</scope>
76+
</dependency>
6877
</dependencies>
6978
</profile>
7079
</profiles>

0 commit comments

Comments
 (0)