Skip to content

Commit 5a9a65d

Browse files
ODP-1098: add javax.ws.rs-api - 2.1.1 dependency
YARN-11558 - Fix dependency convergence error on hbase2 profile
1 parent 4d1c080 commit 5a9a65d

File tree

3 files changed

+10
-1
lines changed
  • hadoop-common-project/hadoop-common
  • hadoop-yarn-project/hadoop-yarn
    • hadoop-yarn-common
    • hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-client

3 files changed

+10
-1
lines changed

hadoop-common-project/hadoop-common/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@
162162
<groupId>commons-logging</groupId>
163163
<artifactId>commons-logging</artifactId>
164164
<scope>compile</scope>
165-
165+
166166
<exclusions>
167167
<exclusion>
168168
<groupId>com.fasterxml.jackson.core</groupId>

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,11 @@
222222
<groupId>com.fasterxml.jackson.jaxrs</groupId>
223223
<artifactId>jackson-jaxrs-json-provider</artifactId>
224224
</dependency>
225+
<dependency>
226+
<groupId>javax.ws.rs</groupId>
227+
<artifactId>javax.ws.rs-api</artifactId>
228+
<version>2.1.1</version>
229+
</dependency>
225230
</dependencies>
226231

227232
<build>

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-client/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,10 @@
155155
<groupId>org.apache.hadoop</groupId>
156156
<artifactId>hadoop-hdfs-client</artifactId>
157157
</exclusion>
158+
<exclusion>
159+
<groupId>javax.ws.rs</groupId>
160+
<artifactId>javax.ws.rs-api</artifactId>
161+
</exclusion>
158162
<exclusion>
159163
<groupId>org.apache.hadoop</groupId>
160164
<artifactId>hadoop-client</artifactId>

0 commit comments

Comments
 (0)