Skip to content

Commit 4e99643

Browse files
anmolanmol1234anmolanmol1234
authored
Merge branch 'apache:trunk' into HADOOP-18325 
2 parents bca9c4e + 8f83d9f commit 4e99643

File tree

184 files changed

+100933
-869
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

184 files changed

+100933
-869
lines changed

‎LICENSE-binary‎

Lines changed: 51 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -218,12 +218,12 @@ com.aliyun.oss:aliyun-sdk-oss:3.13.2
218218
com.amazonaws:aws-java-sdk-bundle:1.11.901
219219
com.cedarsoftware:java-util:1.9.0
220220
com.cedarsoftware:json-io:2.5.1
221-
com.fasterxml.jackson.core:jackson-annotations:2.13.2
222-
com.fasterxml.jackson.core:jackson-core:2.13.2
223-
com.fasterxml.jackson.core:jackson-databind:2.13.2.2
224-
com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.13.2
225-
com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.13.2
226-
com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.13.2
221+
com.fasterxml.jackson.core:jackson-annotations:2.12.7
222+
com.fasterxml.jackson.core:jackson-core:2.12.7
223+
com.fasterxml.jackson.core:jackson-databind:2.12.7
224+
com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.12.7
225+
com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.12.7
226+
com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.12.7
227227
com.fasterxml.uuid:java-uuid-generator:3.1.4
228228
com.fasterxml.woodstox:woodstox-core:5.3.0
229229
com.github.davidmoten:rxjava-extras:0.8.0.17
@@ -261,17 +261,36 @@ io.grpc:grpc-protobuf:1.26.0
261261
io.grpc:grpc-protobuf-lite:1.26.0
262262
io.grpc:grpc-stub:1.26.0
263263
io.netty:netty:3.10.6.Final
264-
io.netty:netty-all:4.1.42.Final
265-
io.netty:netty-buffer:4.1.27.Final
266-
io.netty:netty-codec:4.1.27.Final
267-
io.netty:netty-codec-http:4.1.27.Final
268-
io.netty:netty-codec-http2:4.1.27.Final
269-
io.netty:netty-codec-socks:4.1.27.Final
270-
io.netty:netty-common:4.1.27.Final
271-
io.netty:netty-handler:4.1.27.Final
272-
io.netty:netty-handler-proxy:4.1.27.Final
273-
io.netty:netty-resolver:4.1.27.Final
274-
io.netty:netty-transport:4.1.27.Final
264+
io.netty:netty-all:4.1.77.Final
265+
io.netty:netty-buffer:4.1.77.Final
266+
io.netty:netty-codec:4.1.77.Final
267+
io.netty:netty-codec-dns:4.1.77.Final
268+
io.netty:netty-codec-haproxy:4.1.77.Final
269+
io.netty:netty-codec-http:4.1.77.Final
270+
io.netty:netty-codec-http2:4.1.77.Final
271+
io.netty:netty-codec-memcache:4.1.77.Final
272+
io.netty:netty-codec-mqtt:4.1.77.Final
273+
io.netty:netty-codec-redis:4.1.77.Final
274+
io.netty:netty-codec-smtp:4.1.77.Final
275+
io.netty:netty-codec-socks:4.1.77.Final
276+
io.netty:netty-codec-stomp:4.1.77.Final
277+
io.netty:netty-codec-xml:4.1.77.Final
278+
io.netty:netty-common:4.1.77.Final
279+
io.netty:netty-handler:4.1.77.Final
280+
io.netty:netty-handler-proxy:4.1.77.Final
281+
io.netty:netty-resolver:4.1.77.Final
282+
io.netty:netty-resolver-dns:4.1.77.Final
283+
io.netty:netty-transport:4.1.77.Final
284+
io.netty:netty-transport-rxtx:4.1.77.Final
285+
io.netty:netty-transport-sctp:4.1.77.Final
286+
io.netty:netty-transport-udt:4.1.77.Final
287+
io.netty:netty-transport-classes-epoll:4.1.77.Final
288+
io.netty:netty-transport-native-unix-common:4.1.77.Final
289+
io.netty:netty-transport-classes-kqueue:4.1.77.Final
290+
io.netty:netty-resolver-dns-classes-macos:4.1.77.Final
291+
io.netty:netty-transport-native-epoll:4.1.77.Final
292+
io.netty:netty-transport-native-kqueue:4.1.77.Final
293+
io.netty:netty-resolver-dns-native-macos:4.1.77.Final
275294
io.opencensus:opencensus-api:0.12.3
276295
io.opencensus:opencensus-contrib-grpc-metrics:0.12.3
277296
io.reactivex:rxjava:1.3.8
@@ -325,20 +344,20 @@ org.apache.solr:solr-solrj:8.8.2
325344
org.apache.yetus:audience-annotations:0.5.0
326345
org.apache.zookeeper:zookeeper:3.6.3
327346
org.codehaus.jettison:jettison:1.1
328-
org.eclipse.jetty:jetty-annotations:9.4.44.v20210927
329-
org.eclipse.jetty:jetty-http:9.4.44.v20210927
330-
org.eclipse.jetty:jetty-io:9.4.44.v20210927
331-
org.eclipse.jetty:jetty-jndi:9.4.44.v20210927
332-
org.eclipse.jetty:jetty-plus:9.4.44.v20210927
333-
org.eclipse.jetty:jetty-security:9.4.44.v20210927
334-
org.eclipse.jetty:jetty-server:9.4.44.v20210927
335-
org.eclipse.jetty:jetty-servlet:9.4.44.v20210927
336-
org.eclipse.jetty:jetty-util:9.4.44.v20210927
337-
org.eclipse.jetty:jetty-util-ajax:9.4.44.v20210927
338-
org.eclipse.jetty:jetty-webapp:9.4.44.v20210927
339-
org.eclipse.jetty:jetty-xml:9.4.44.v20210927
340-
org.eclipse.jetty.websocket:javax-websocket-client-impl:9.4.44.v20210927
341-
org.eclipse.jetty.websocket:javax-websocket-server-impl:9.4.44.v20210927
347+
org.eclipse.jetty:jetty-annotations:9.4.48.v20220622
348+
org.eclipse.jetty:jetty-http:9.4.48.v20220622
349+
org.eclipse.jetty:jetty-io:9.4.48.v20220622
350+
org.eclipse.jetty:jetty-jndi:9.4.48.v20220622
351+
org.eclipse.jetty:jetty-plus:9.4.48.v20220622
352+
org.eclipse.jetty:jetty-security:9.4.48.v20220622
353+
org.eclipse.jetty:jetty-server:9.4.48.v20220622
354+
org.eclipse.jetty:jetty-servlet:9.4.48.v20220622
355+
org.eclipse.jetty:jetty-util:9.4.48.v20220622
356+
org.eclipse.jetty:jetty-util-ajax:9.4.48.v20220622
357+
org.eclipse.jetty:jetty-webapp:9.4.48.v20220622
358+
org.eclipse.jetty:jetty-xml:9.4.48.v20220622
359+
org.eclipse.jetty.websocket:javax-websocket-client-impl:9.4.48.v20220622
360+
org.eclipse.jetty.websocket:javax-websocket-server-impl:9.4.48.v20220622
342361
org.ehcache:ehcache:3.3.1
343362
org.lz4:lz4-java:1.7.1
344363
org.objenesis:objenesis:2.6
@@ -416,7 +435,7 @@ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanage
416435
bootstrap v3.3.6
417436
broccoli-asset-rev v2.4.2
418437
broccoli-funnel v1.0.1
419-
datatables v1.10.8
438+
datatables v1.10.19
420439
em-helpers v0.5.13
421440
em-table v0.1.6
422441
ember v2.2.0
@@ -491,7 +510,6 @@ javax.annotation:javax.annotation-api:1.3.2
491510
javax.servlet:javax.servlet-api:3.1.0
492511
javax.servlet.jsp:jsp-api:2.1
493512
javax.websocket:javax.websocket-api:1.0
494-
javax.ws.rs:javax.ws.rs-api:2.1.1
495513
javax.ws.rs:jsr311-api:1.1.1
496514
javax.xml.bind:jaxb-api:2.2.11
497515

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -704,7 +704,6 @@
704704
<exclude>org.bouncycastle:*</exclude>
705705
<!-- Leave snappy that includes native methods which cannot be relocated. -->
706706
<exclude>org.xerial.snappy:*</exclude>
707-
<exclude>javax.ws.rs:javax.ws.rs-api</exclude>
708707
</excludes>
709708
</artifactSet>
710709
<filters>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,6 @@
163163
<exclude>org.bouncycastle:*</exclude>
164164
<!-- Leave snappy that includes native methods which cannot be relocated. -->
165165
<exclude>org.xerial.snappy:*</exclude>
166-
<exclude>javax.ws.rs:javax.ws.rs-api</exclude>
167166
</excludes>
168167
</artifactSet>
169168
<filters>

0 commit comments

Comments
 (0)