Skip to content

Commit 22734a9

Browse files
authored
HDDS-12461. Bump Ranger to 2.6.0 (#8120)
1 parent 0d6231c commit 22734a9

5 files changed

Lines changed: 11 additions & 102 deletions

File tree

hadoop-ozone/dist/src/main/license/bin/LICENSE.txt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,7 @@ Apache License 2.0
267267
ch.qos.reload4j:reload4j
268268
com.amazonaws:aws-java-sdk-core
269269
com.amazonaws:aws-java-sdk-kms
270+
com.amazonaws:aws-java-sdk-logs
270271
com.amazonaws:aws-java-sdk-s3
271272
com.amazonaws:jmespath-java
272273
com.carrotsearch:hppc
@@ -276,6 +277,8 @@ Apache License 2.0
276277
com.fasterxml.jackson.dataformat:jackson-dataformat-cbor
277278
com.fasterxml.jackson.dataformat:jackson-dataformat-xml
278279
com.fasterxml.jackson.datatype:jackson-datatype-jsr310
280+
com.fasterxml.jackson.jaxrs:jackson-jaxrs-base
281+
com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider
279282
com.fasterxml.jackson.module:jackson-module-jaxb-annotations
280283
com.fasterxml.woodstox:woodstox-core
281284
com.github.jnr:jnr-a64asm
@@ -316,6 +319,7 @@ Apache License 2.0
316319
commons-fileupload:commons-fileupload
317320
info.picocli:picocli
318321
info.picocli:picocli-shell-jline3
322+
io.airlift:aircompressor
319323
io.dropwizard.metrics:metrics-core
320324
io.grpc:grpc-api
321325
io.grpc:grpc-context
@@ -398,6 +402,7 @@ Apache License 2.0
398402
org.apache.logging.log4j:log4j-api
399403
org.apache.logging.log4j:log4j-core
400404
org.apache.orc:orc-core
405+
org.apache.orc:orc-shims
401406
org.apache.ranger:ranger-intg
402407
org.apache.ranger:ranger-plugin-classloader
403408
org.apache.ranger:ranger-plugin-audit
@@ -417,10 +422,6 @@ Apache License 2.0
417422
org.apache.thrift:libthrift
418423
org.apache.zookeeper:zookeeper
419424
org.apache.zookeeper:zookeeper-jute
420-
org.codehaus.jackson:jackson-core-asl
421-
org.codehaus.jackson:jackson-jaxrs
422-
org.codehaus.jackson:jackson-mapper-asl
423-
org.codehaus.jackson:jackson-xc
424425
org.eclipse.jetty:jetty-client
425426
org.eclipse.jetty:jetty-http
426427
org.eclipse.jetty:jetty-io

hadoop-ozone/dist/src/main/license/bin/NOTICE.txt

Lines changed: 0 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -395,17 +395,6 @@ com.jolbox:bonecp
395395
This product includes software developed by
396396
Wallace Wadge (http://jolbox.com/).
397397

398-
org.codehaus.jackson:jackson-mapper-asl
399-
====================
400-
401-
This product currently only contains code developed by authors
402-
of specific components, as identified by the source code files;
403-
if such notes are missing files have been created by
404-
Tatu Saloranta.
405-
406-
For additional credits (generally to people who reported problems)
407-
see CREDITS file.
408-
409398

410399
com.google.inject:guice
411400
====================
@@ -431,32 +420,6 @@ This product includes software developed at
431420
The Apache Software Foundation (http://www.apache.org/).
432421

433422

434-
435-
436-
org.codehaus.jackson:jackson-xc
437-
====================
438-
439-
This product currently only contains code developed by authors
440-
of specific components, as identified by the source code files;
441-
if such notes are missing files have been created by
442-
Tatu Saloranta.
443-
444-
For additional credits (generally to people who reported problems)
445-
see CREDITS file.
446-
447-
448-
org.codehaus.jackson:jackson-jaxrs
449-
====================
450-
451-
This product currently only contains code developed by authors
452-
of specific components, as identified by the source code files;
453-
if such notes are missing files have been created by
454-
Tatu Saloranta.
455-
456-
For additional credits (generally to people who reported problems)
457-
see CREDITS file.
458-
459-
460423
com.google.inject.extensions:guice-servlet
461424
====================
462425

@@ -470,18 +433,6 @@ The Apache Software Foundation (http://www.apache.org/).
470433

471434

472435

473-
org.codehaus.jackson:jackson-core-asl
474-
====================
475-
476-
This product currently only contains code developed by authors
477-
of specific components, as identified by the source code files;
478-
if such notes are missing files have been created by
479-
Tatu Saloranta.
480-
481-
For additional credits (generally to people who reported problems)
482-
see CREDITS file.
483-
484-
485436
org.bouncycastle:bcpkix-jdk18on
486437
====================
487438

hadoop-ozone/dist/src/main/license/jar-report.txt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
share/ozone/lib/aircompressor.jar
12
share/ozone/lib/animal-sniffer-annotations.jar
23
share/ozone/lib/annotations.jar
34
share/ozone/lib/annotations.jar
@@ -12,6 +13,7 @@ share/ozone/lib/aspectjrt.jar
1213
share/ozone/lib/aspectjweaver.jar
1314
share/ozone/lib/aws-java-sdk-core.jar
1415
share/ozone/lib/aws-java-sdk-kms.jar
16+
share/ozone/lib/aws-java-sdk-logs.jar
1517
share/ozone/lib/aws-java-sdk-s3.jar
1618
share/ozone/lib/bcpkix-jdk18on.jar
1719
share/ozone/lib/bcprov-jdk18on.jar
@@ -93,14 +95,13 @@ share/ozone/lib/httpmime.jar
9395
share/ozone/lib/istack-commons-runtime.jar
9496
share/ozone/lib/j2objc-annotations.jar
9597
share/ozone/lib/jackson-annotations.jar
96-
share/ozone/lib/jackson-core-asl.jar
9798
share/ozone/lib/jackson-core.jar
9899
share/ozone/lib/jackson-databind.jar
99100
share/ozone/lib/jackson-dataformat-cbor.jar
100101
share/ozone/lib/jackson-dataformat-xml.jar
101102
share/ozone/lib/jackson-datatype-jsr310.jar
102-
share/ozone/lib/jackson-jaxrs.jar
103-
share/ozone/lib/jackson-mapper-asl.jar
103+
share/ozone/lib/jackson-jaxrs-base.jar
104+
share/ozone/lib/jackson-jaxrs-json-provider.jar
104105
share/ozone/lib/jackson-module-jaxb-annotations.jar
105106
share/ozone/lib/jaeger-client.jar
106107
share/ozone/lib/jaeger-core.jar
@@ -215,6 +216,7 @@ share/ozone/lib/opentracing-noop.jar
215216
share/ozone/lib/opentracing-tracerresolver.jar
216217
share/ozone/lib/opentracing-util.jar
217218
share/ozone/lib/orc-core.jar
219+
share/ozone/lib/orc-shims.jar
218220
share/ozone/lib/osgi-resource-locator.jar
219221
share/ozone/lib/ozone-client.jar
220222
share/ozone/lib/ozone-cli-shell.jar

hadoop-ozone/ozone-manager/pom.xml

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -285,29 +285,6 @@
285285
<groupId>org.bouncycastle</groupId>
286286
<artifactId>bcprov-jdk18on</artifactId>
287287
</dependency>
288-
<!-- Override ranger-intg jackson version -->
289-
<dependency>
290-
<groupId>org.codehaus.jackson</groupId>
291-
<artifactId>jackson-core-asl</artifactId>
292-
</dependency>
293-
<dependency>
294-
<groupId>org.codehaus.jackson</groupId>
295-
<artifactId>jackson-jaxrs</artifactId>
296-
<exclusions>
297-
<exclusion>
298-
<groupId>org.codehaus.jackson</groupId>
299-
<artifactId>jackson-core-asl</artifactId>
300-
</exclusion>
301-
<exclusion>
302-
<groupId>org.codehaus.jackson</groupId>
303-
<artifactId>jackson-mapper-asl</artifactId>
304-
</exclusion>
305-
</exclusions>
306-
</dependency>
307-
<dependency>
308-
<groupId>org.codehaus.jackson</groupId>
309-
<artifactId>jackson-mapper-asl</artifactId>
310-
</dependency>
311288
<dependency>
312289
<groupId>org.eclipse.jetty</groupId>
313290
<artifactId>jetty-util</artifactId>

pom.xml

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,6 @@
109109
<httpclient.version>4.5.14</httpclient.version>
110110
<httpcore.version>4.4.16</httpcore.version>
111111
<io.grpc.version>1.58.0</io.grpc.version>
112-
<jackson-jaxr.version>1.9.13</jackson-jaxr.version>
113-
<jackson1.version>1.9.13</jackson1.version>
114112
<jackson2-bom.version>2.16.2</jackson2-bom.version>
115113
<jacoco.version>0.8.13</jacoco.version>
116114
<jaeger.version>1.8.1</jaeger.version>
@@ -202,7 +200,7 @@
202200
<proto3.hadooprpc.protobuf.version>3.23.4</proto3.hadooprpc.protobuf.version>
203201
<!-- Maven protoc compiler -->
204202
<protobuf-maven-plugin.version>0.6.1</protobuf-maven-plugin.version>
205-
<ranger.version>2.3.0</ranger.version>
203+
<ranger.version>2.6.0</ranger.version>
206204
<ratis.thirdparty.version>1.0.6</ratis.thirdparty.version>
207205
<ratis.version>3.1.2</ratis.version>
208206
<re2j.version>1.7</re2j.version>
@@ -989,26 +987,6 @@
989987
<artifactId>bcutil-jdk18on</artifactId>
990988
<version>${bouncycastle.version}</version>
991989
</dependency>
992-
<dependency>
993-
<groupId>org.codehaus.jackson</groupId>
994-
<artifactId>jackson-core-asl</artifactId>
995-
<version>${jackson1.version}</version>
996-
</dependency>
997-
<dependency>
998-
<groupId>org.codehaus.jackson</groupId>
999-
<artifactId>jackson-jaxrs</artifactId>
1000-
<version>${jackson-jaxr.version}</version>
1001-
</dependency>
1002-
<dependency>
1003-
<groupId>org.codehaus.jackson</groupId>
1004-
<artifactId>jackson-mapper-asl</artifactId>
1005-
<version>${jackson1.version}</version>
1006-
</dependency>
1007-
<dependency>
1008-
<groupId>org.codehaus.woodstox</groupId>
1009-
<artifactId>stax2-api</artifactId>
1010-
<version>${stax2.version}</version>
1011-
</dependency>
1012990
<dependency>
1013991
<groupId>org.eclipse.jetty</groupId>
1014992
<artifactId>jetty-client</artifactId>

0 commit comments

Comments
 (0)