Skip to content

Commit e40e668

Browse files
susheelgupta7susheelgupta7
committed
Replaced with
1 parent 2b32e46 commit e40e668

File tree

16 files changed

+25
-15
lines changed
  • LICENSE-binary
  • hadoop-client-modules
  • hadoop-mapreduce-project
  • hadoop-project
  • hadoop-tools/hadoop-resourceestimator
  • hadoop-yarn-project/hadoop-yarn
    • hadoop-yarn-client
    • hadoop-yarn-common
    • hadoop-yarn-server
      • hadoop-yarn-server-applicationhistoryservice
      • hadoop-yarn-server-globalpolicygenerator
      • hadoop-yarn-server-nodemanager
      • hadoop-yarn-server-resourcemanager
      • hadoop-yarn-server-timelineservice-hbase-tests
      • hadoop-yarn-server-web-proxy

16 files changed

+25
-15
lines changed

‎LICENSE-binary

+1-1
Original file line numberDiff line numberDiff line change
@@ -538,7 +538,7 @@ org.glassfish.jersey.core:jersey-server:2.46
538538
org.glassfish.jersey.inject:jersey-hk2:2.46
539539
org.glassfish.jersey.core:jersey-client:2.46
540540
org.glassfish.jersey.test-framework:jersey-test-framework-core:2.46
541-
org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-grizzly2:2.46
541+
org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-jetty:2.46
542542
org.glassfish.jersey.containers:jersey-container-servlet:2.46
543543
org.glassfish.jersey.containers:jersey-container-servlet-core:2.46
544544
org.glassfish.jersey.media:jersey-media-json-jettison:2.46

‎hadoop-client-modules/hadoop-client-minicluster/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@
582582
</dependency>
583583
<dependency>
584584
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
585-
<artifactId>jersey-test-framework-provider-grizzly2</artifactId>
585+
<artifactId>jersey-test-framework-provider-jetty</artifactId>
586586
<optional>true</optional>
587587
</dependency>
588588
<!-- skipping jersey-server because it's above -->

‎hadoop-client-modules/hadoop-client-runtime/pom.xml

+10
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,16 @@
152152
<exclude>io.dropwizard.metrics:metrics-core</exclude>
153153
<exclude>org.eclipse.jetty:jetty-servlet</exclude>
154154
<exclude>org.eclipse.jetty:jetty-security</exclude>
155+
<!-- Excluding Jetty dependencies to resolve `BanDuplicateClasses` issues caused by
156+
duplicate Jetty classes in `hadoop-client-minicluster` and `hadoop-client-runtime`.
157+
so keeping it here leads to conflicts.
158+
-->
159+
<exclude>org.eclipse.jetty:jetty-util</exclude>
160+
<exclude>org.eclipse.jetty:jetty-server</exclude>
161+
<exclude>org.eclipse.jetty:jetty-http</exclude>
162+
<exclude>org.eclipse.jetty:jetty-io</exclude>
163+
<exclude>org.eclipse.jetty:jetty-webapp</exclude>
164+
<exclude>org.eclipse.jetty:jetty-continuation</exclude>
155165
<exclude>org.ow2.asm:*</exclude>
156166
<!-- Leave bouncycastle unshaded because it's signed with a special Oracle certificate so it can be a custom JCE security provider -->
157167
<exclude>org.bouncycastle:*</exclude>

‎hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@
131131
</dependency>
132132
<dependency>
133133
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
134-
<artifactId>jersey-test-framework-provider-grizzly2</artifactId>
134+
<artifactId>jersey-test-framework-provider-jetty</artifactId>
135135
<scope>test</scope>
136136
</dependency>
137137
<dependency>

‎hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@
162162
</dependency>
163163
<dependency>
164164
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
165-
<artifactId>jersey-test-framework-provider-grizzly2</artifactId>
165+
<artifactId>jersey-test-framework-provider-jetty</artifactId>
166166
<scope>test</scope>
167167
</dependency>
168168
</dependencies>

‎hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
</dependency>
102102
<dependency>
103103
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
104-
<artifactId>jersey-test-framework-provider-grizzly2</artifactId>
104+
<artifactId>jersey-test-framework-provider-jetty</artifactId>
105105
<scope>test</scope>
106106
</dependency>
107107
<dependency>

‎hadoop-project/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2126,7 +2126,7 @@
21262126
</dependency>
21272127
<dependency>
21282128
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
2129-
<artifactId>jersey-test-framework-provider-grizzly2</artifactId>
2129+
<artifactId>jersey-test-framework-provider-jetty</artifactId>
21302130
<version>${jersey2.version}</version>
21312131
<exclusions>
21322132
<exclusion>

‎hadoop-tools/hadoop-resourceestimator/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
</dependency>
6868
<dependency>
6969
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
70-
<artifactId>jersey-test-framework-provider-grizzly2</artifactId>
70+
<artifactId>jersey-test-framework-provider-jetty</artifactId>
7171
<scope>test</scope>
7272
</dependency>
7373
<dependency>

‎hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
</dependency>
9292
<dependency>
9393
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
94-
<artifactId>jersey-test-framework-provider-grizzly2</artifactId>
94+
<artifactId>jersey-test-framework-provider-jetty</artifactId>
9595
<scope>test</scope>
9696
</dependency>
9797
<!-- 'mvn dependency:analyze' fails to detect use of this dependency -->

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@
153153
</dependency>
154154
<dependency>
155155
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
156-
<artifactId>jersey-test-framework-provider-grizzly2</artifactId>
156+
<artifactId>jersey-test-framework-provider-jetty</artifactId>
157157
<scope>compile</scope>
158158
<exclusions>
159159
<exclusion>

‎hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
</dependency>
9898
<dependency>
9999
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
100-
<artifactId>jersey-test-framework-provider-grizzly2</artifactId>
100+
<artifactId>jersey-test-framework-provider-jetty</artifactId>
101101
<scope>test</scope>
102102
</dependency>
103103
<dependency>

‎hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-globalpolicygenerator/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125
</dependency>
126126
<dependency>
127127
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
128-
<artifactId>jersey-test-framework-provider-grizzly2</artifactId>
128+
<artifactId>jersey-test-framework-provider-jetty</artifactId>
129129
<scope>test</scope>
130130
</dependency>
131131

‎hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@
218218
</dependency>
219219
<dependency>
220220
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
221-
<artifactId>jersey-test-framework-provider-grizzly2</artifactId>
221+
<artifactId>jersey-test-framework-provider-jetty</artifactId>
222222
<scope>test</scope>
223223
</dependency>
224224
<dependency>

‎hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@
254254
</dependency>
255255
<dependency>
256256
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
257-
<artifactId>jersey-test-framework-provider-grizzly2</artifactId>
257+
<artifactId>jersey-test-framework-provider-jetty</artifactId>
258258
<scope>test</scope>
259259
</dependency>
260260
<dependency>

‎hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@
224224
</exclusion>
225225
<exclusion>
226226
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
227-
<artifactId>jersey-test-framework-provider-grizzly2</artifactId>
227+
<artifactId>jersey-test-framework-provider-jetty</artifactId>
228228
</exclusion>
229229
<exclusion>
230230
<groupId>org.glassfish.jersey.test-framework</groupId>

‎hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@
118118
<!-- 'mvn dependency:analyze' fails to detect use of this dependency -->
119119
<dependency>
120120
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
121-
<artifactId>jersey-test-framework-provider-grizzly2</artifactId>
121+
<artifactId>jersey-test-framework-provider-jetty</artifactId>
122122
<scope>test</scope>
123123
</dependency>
124124
<dependency>

0 commit comments

Comments
 (0)