Skip to content

Commit 668d126

Browse files
FavioVazquezFavioVazquez
committed
- Moved <dependencies> <activation> and <properties> sections of the hadoop-2.2 profile in the YARN POM to the YARN profile in the root POM
- Erased unnecessary hadoop-2.2 profile from the YARN POM
1 parent fda6a51 commit 668d126

File tree

2 files changed

+52
-62
lines changed

2 files changed

+52
-62
lines changed

‎pom.xml

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1668,6 +1668,57 @@
16681668
<module>yarn</module>
16691669
<module>network/yarn</module>
16701670
</modules>
1671+
<properties>
1672+
<jersey.version>1.9</jersey.version>
1673+
</properties>
1674+
<!-- Enable hadoop-2.2 profile when the Hadoop version is 2.2.0, which is now
1675+
the default. Those building against 2.2.x or some distro-specific variation of
1676+
that string still have to manually enable -Phadoop-2.2.
1677+
-->
1678+
<activation>
1679+
<property>
1680+
<name>hadoop.version</name>
1681+
<value>2.2.0<value>
1682+
</property>
1683+
</activation>
1684+
<dependencies>
1685+
<dependency>
1686+
<groupId>org.mortbay.jetty</groupId>
1687+
<artifactId>jetty</artifactId>
1688+
<version>6.1.26</version>
1689+
<exclusions>
1690+
<exclusion>
1691+
<groupId>org.mortbay.jetty</groupId>
1692+
<artifactId>servlet-api</artifactId>
1693+
</exclusion>
1694+
</exclusions>
1695+
<scope>test</scope>
1696+
</dependency>
1697+
<dependency>
1698+
<groupId>com.sun.jersey</groupId>
1699+
<artifactId>jersey-core</artifactId>
1700+
<version>${jersey.version}</version>
1701+
<scope>test</scope>
1702+
</dependency>
1703+
<dependency>
1704+
<groupId>com.sun.jersey</groupId>
1705+
<artifactId>jersey-json</artifactId>
1706+
<version>${jersey.version}</version>
1707+
<scope>test</scope>
1708+
<exclusions>
1709+
<exclusion>
1710+
<groupId>stax</groupId>
1711+
<artifactId>stax-api</artifactId>
1712+
</exclusion>
1713+
</exclusions>
1714+
</dependency>
1715+
<dependency>
1716+
<groupId>com.sun.jersey</groupId>
1717+
<artifactId>jersey-server</artifactId>
1718+
<version>${jersey.version}</version>
1719+
<scope>test</scope>
1720+
</dependency>
1721+
</dependencies>
16711722
</profile>
16721723

16731724
<profile>

‎yarn/pom.xml

Lines changed: 1 addition & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -98,68 +98,7 @@
9898
<scope>test</scope>
9999
</dependency>
100100
</dependencies>
101-
102-
<!--
103-
See SPARK-3710. hadoop-yarn-server-tests in Hadoop 2.2 fails to pull some needed
104-
dependencies, so they need to be added manually for the tests to work.
105-
-->
106-
<profiles>
107-
<profile>
108-
<id>hadoop-2.2</id>
109-
<properties>
110-
<jersey.version>1.9</jersey.version>
111-
</properties>
112-
<!-- Enable hadoop-2.2 profile when the Hadoop version is 2.2.0, which is now
113-
the default. Those building against 2.2.x or some distro-specific variation of
114-
that string still have to manually enable -Phadoop-2.2.
115-
-->
116-
<activation>
117-
<property>
118-
<name>hadoop.version</name>
119-
<value>2.2.0<value>
120-
</property>
121-
</activation>
122-
<dependencies>
123-
<dependency>
124-
<groupId>org.mortbay.jetty</groupId>
125-
<artifactId>jetty</artifactId>
126-
<version>6.1.26</version>
127-
<exclusions>
128-
<exclusion>
129-
<groupId>org.mortbay.jetty</groupId>
130-
<artifactId>servlet-api</artifactId>
131-
</exclusion>
132-
</exclusions>
133-
<scope>test</scope>
134-
</dependency>
135-
<dependency>
136-
<groupId>com.sun.jersey</groupId>
137-
<artifactId>jersey-core</artifactId>
138-
<version>${jersey.version}</version>
139-
<scope>test</scope>
140-
</dependency>
141-
<dependency>
142-
<groupId>com.sun.jersey</groupId>
143-
<artifactId>jersey-json</artifactId>
144-
<version>${jersey.version}</version>
145-
<scope>test</scope>
146-
<exclusions>
147-
<exclusion>
148-
<groupId>stax</groupId>
149-
<artifactId>stax-api</artifactId>
150-
</exclusion>
151-
</exclusions>
152-
</dependency>
153-
<dependency>
154-
<groupId>com.sun.jersey</groupId>
155-
<artifactId>jersey-server</artifactId>
156-
<version>${jersey.version}</version>
157-
<scope>test</scope>
158-
</dependency>
159-
</dependencies>
160-
</profile>
161-
</profiles>
162-
101+
163102
<build>
164103
<outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory>
165104
<testOutputDirectory>target/scala-${scala.binary.version}/test-classes</testOutputDirectory>

0 commit comments

Comments
 (0)