Skip to content

Commit 0d4903d

Browse files
authored
Add version for hadoop-mapreduce-client-core to the BOM (apache-spark-on-k8s#251)
The recent org.apache.orc:orc-mapreduce:1.4.0 addition introduced a conflict that we must resolve in the BOM
1 parent 944e132 commit 0d4903d

File tree

1 file changed

+26
-21
lines changed

1 file changed

+26
-21
lines changed

dists/hadoop-palantir/pom.xml

Lines changed: 26 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -118,26 +118,31 @@
118118
<!--
119119
Propagate these from spark-parent hadoop-palantir profile
120120
-->
121-
<dependency>
122-
<groupId>org.apache.hadoop</groupId>
123-
<artifactId>hadoop-azure</artifactId>
124-
<version>${hadoop.version}</version>
125-
<scope>${hadoop.deps.scope}</scope>
126-
<exclusions>
127-
<exclusion>
128-
<groupId>org.apache.hadoop</groupId>
129-
<artifactId>hadoop-common</artifactId>
130-
</exclusion>
131-
<exclusion>
132-
<groupId>org.codehaus.jackson</groupId>
133-
<artifactId>jackson-mapper-asl</artifactId>
134-
</exclusion>
135-
<exclusion>
136-
<groupId>com.fasterxml.jackson.core</groupId>
137-
<artifactId>jackson-core</artifactId>
138-
</exclusion>
139-
</exclusions>
140-
</dependency>
121+
<dependency>
122+
<groupId>org.apache.hadoop</groupId>
123+
<artifactId>hadoop-mapreduce-client-core</artifactId>
124+
<version>${hadoop.version}</version>
125+
</dependency>
126+
<dependency>
127+
<groupId>org.apache.hadoop</groupId>
128+
<artifactId>hadoop-azure</artifactId>
129+
<version>${hadoop.version}</version>
130+
<scope>${hadoop.deps.scope}</scope>
131+
<exclusions>
132+
<exclusion>
133+
<groupId>org.apache.hadoop</groupId>
134+
<artifactId>hadoop-common</artifactId>
135+
</exclusion>
136+
<exclusion>
137+
<groupId>org.codehaus.jackson</groupId>
138+
<artifactId>jackson-mapper-asl</artifactId>
139+
</exclusion>
140+
<exclusion>
141+
<groupId>com.fasterxml.jackson.core</groupId>
142+
<artifactId>jackson-core</artifactId>
143+
</exclusion>
144+
</exclusions>
145+
</dependency>
141146
</dependencies>
142147
</dependencyManagement>
143148

@@ -167,7 +172,7 @@
167172
<artifactId>spark-hadoop-cloud_${scala.binary.version}</artifactId>
168173
</dependency>
169174
<!--
170-
Taken from cloud/pom.xml profile dpeendency
175+
Taken from cloud/pom.xml profile dependency
171176
-->
172177
<dependency>
173178
<groupId>org.apache.hadoop</groupId>

0 commit comments

Comments
 (0)