Skip to content

Commit ca8dfc3

Browse files
kevins-29kevins-29
committed
Merge remote-tracking branch 'oss/trunk' into hadoop-12007 
2 parents 5200470 + 080e670 commit ca8dfc3

File tree

240 files changed

+104898
-2085
lines changed

Some content is hidden

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

240 files changed

+104898
-2085
lines changed

‎.asf.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ notifications:
2222
commits: [email protected]
2323
issues: [email protected]
2424
pullrequests: [email protected]
25-
jira_options: link label worklog
25+
jira_options: comment link label

‎LICENSE-binary‎

Lines changed: 46 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ com.aliyun:aliyun-java-sdk-ecs:4.2.0
215215
com.aliyun:aliyun-java-sdk-ram:3.0.0
216216
com.aliyun:aliyun-java-sdk-sts:3.0.0
217217
com.aliyun.oss:aliyun-sdk-oss:3.13.2
218-
com.amazonaws:aws-java-sdk-bundle:1.11.901
218+
com.amazonaws:aws-java-sdk-bundle:1.12.262
219219
com.cedarsoftware:java-util:1.9.0
220220
com.cedarsoftware:json-io:2.5.1
221221
com.fasterxml.jackson.core:jackson-annotations:2.12.7
@@ -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
@@ -290,7 +309,7 @@ org.apache.commons:commons-configuration2:2.1.1
290309
org.apache.commons:commons-csv:1.0
291310
org.apache.commons:commons-digester:1.8.1
292311
org.apache.commons:commons-lang3:3.12.0
293-
org.apache.commons:commons-math3:3.1.1
312+
org.apache.commons:commons-math3:3.6.1
294313
org.apache.commons:commons-text:1.4
295314
org.apache.commons:commons-validator:1.6
296315
org.apache.curator:curator-client:5.2.0
@@ -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

0 commit comments

Comments
 (0)