Skip to content

Commit 9467111

Browse files
RANGER-4076: Build failure fix after rebase and revert hadoop libraries inclusion
1 parent f969263 commit 9467111

6 files changed

Lines changed: 8 additions & 129 deletions

File tree

credentialbuilder/pom.xml

Lines changed: 0 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -121,73 +121,6 @@
121121
<artifactId>hadoop-client-runtime</artifactId>
122122
<version>${hadoop.version}</version>
123123
</dependency>
124-
<dependency>
125-
<groupId>org.apache.hadoop</groupId>
126-
<artifactId>hadoop-common</artifactId>
127-
<version>${hadoop.version}</version>
128-
<exclusions>
129-
<exclusion>
130-
<groupId>com.fasterxml.jackson.core</groupId>
131-
<artifactId>*</artifactId>
132-
</exclusion>
133-
<exclusion>
134-
<groupId>com.fasterxml.jackson.jaxrs</groupId>
135-
<artifactId>*</artifactId>
136-
</exclusion>
137-
<exclusion>
138-
<groupId>com.fasterxml.jackson.module</groupId>
139-
<artifactId>*</artifactId>
140-
</exclusion>
141-
<exclusion>
142-
<groupId>com.github.pjfanning</groupId>
143-
<artifactId>jersey-json</artifactId>
144-
</exclusion>
145-
<exclusion>
146-
<groupId>com.google.protobuf</groupId>
147-
<artifactId>protobuf-java</artifactId>
148-
</exclusion>
149-
<exclusion>
150-
<groupId>com.sun.jersey</groupId>
151-
<artifactId>*</artifactId>
152-
</exclusion>
153-
<exclusion>
154-
<groupId>io.netty</groupId>
155-
<artifactId>*</artifactId>
156-
</exclusion>
157-
<exclusion>
158-
<groupId>javax.servlet</groupId>
159-
<artifactId>javax.servlet-api</artifactId>
160-
</exclusion>
161-
<exclusion>
162-
<groupId>log4j</groupId>
163-
<artifactId>*</artifactId>
164-
</exclusion>
165-
<exclusion>
166-
<groupId>org.apache.commons</groupId>
167-
<artifactId>commons-compress</artifactId>
168-
</exclusion>
169-
<exclusion>
170-
<groupId>org.apache.commons</groupId>
171-
<artifactId>commons-configuration2</artifactId>
172-
</exclusion>
173-
<exclusion>
174-
<groupId>org.apache.commons</groupId>
175-
<artifactId>commons-lang3</artifactId>
176-
</exclusion>
177-
<exclusion>
178-
<groupId>org.apache.commons</groupId>
179-
<artifactId>commons-text</artifactId>
180-
</exclusion>
181-
<exclusion>
182-
<groupId>org.slf4j</groupId>
183-
<artifactId>*</artifactId>
184-
</exclusion>
185-
<exclusion>
186-
<groupId>org.slf4j</groupId>
187-
<artifactId>slf4j-log4j12</artifactId>
188-
</exclusion>
189-
</exclusions>
190-
</dependency>
191124
<dependency>
192125
<groupId>org.codehaus.woodstox</groupId>
193126
<artifactId>stax2-api</artifactId>

distro/src/main/assembly/kms.xml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
4242
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
4343
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
44-
<include>org.apache.hadoop:hadoop-hdfs-client:jar:${hadoop.version}</include>
4544
<include>org.eclipse.persistence:eclipselink</include>
4645
<include>org.eclipse.persistence:javax.persistence</include>
4746
<include>com.googlecode.log4jdbc:log4jdbc</include>
@@ -222,7 +221,8 @@
222221
<include>org.eclipse.jdt.core.compiler:ecj:jar:P20140317-1600</include>
223222
<include>org.eclipse.jetty:jetty-client:jar:${jetty-client.version}</include>
224223
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
225-
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
224+
<include>org.apache.hadoop:hadoop-client-api:jar:${hadoop.version}</include>
225+
<include>org.apache.hadoop:hadoop-client-runtime:jar:${hadoop.version}</include>
226226
<include>org.apache.solr:solr-solrj:jar:${solr.version}</include>
227227
<include>org.apache.ranger:ranger-common-utils</include>
228228
<include>org.apache.ranger:ranger-authz-api</include>
@@ -336,7 +336,6 @@
336336
<directoryMode>755</directoryMode>
337337
<fileMode>644</fileMode>
338338
<includes>
339-
<include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include>
340339
<include>com.fasterxml.woodstox:woodstox-core</include>
341340
<include>commons-cli:commons-cli</include>
342341
<include>commons-collections:commons-collections</include>
@@ -346,6 +345,8 @@
346345
<include>org.apache.commons:commons-configuration2:jar:${commons.configuration.version}</include>
347346
<include>org.apache.commons:commons-lang3:jar:${commons.lang3.version}</include>
348347
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
348+
<include>org.apache.hadoop:hadoop-client-api:jar:${hadoop.version}</include>
349+
<include>org.apache.hadoop:hadoop-client-runtime:jar:${hadoop.version}</include>
349350
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
350351
<include>org.codehaus.woodstox:stax2-api</include>
351352
<include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include>
@@ -390,6 +391,8 @@
390391
<include>commons-logging:commons-logging</include>
391392
<include>org.slf4j:slf4j-api</include>
392393
<include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include>
394+
<include>org.apache.hadoop:hadoop-client-api:jar:${hadoop.version}</include>
395+
<include>org.apache.hadoop:hadoop-client-runtime:jar:${hadoop.version}</include>
393396
<include>org.codehaus.woodstox:stax2-api</include>
394397
<include>com.fasterxml.woodstox:woodstox-core</include>
395398
<include>org.apache.commons:commons-compress:jar:${commons.compress.version}</include>

distro/src/main/assembly/pdp.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,6 @@
7272
Use client/core only; avoid jersey-bundle to prevent
7373
ASM package clashes with Jersey-2 server scanner.
7474
-->
75-
<include>com.sun.jersey:jersey-client:jar:${jersey-bundle.version}</include>
76-
<include>com.sun.jersey:jersey-core:jar:${jersey-bundle.version}</include>
7775

7876
<!-- HK2 (Jersey DI framework) -->
7977
<include>org.glassfish.hk2:hk2-api</include>

distro/src/main/assembly/tagsync.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,9 @@
8686
<include>org.apache.curator:curator-framework:jar:${curator.version}</include>
8787
<include>org.apache.curator:curator-recipes:jar:${curator.version}</include>
8888
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
89-
<include>org.apache.hadoop.thirdparty:hadoop-shaded-guava:jar:${hadoop-shaded-guava.version}</include>
9089
<include>org.apache.hadoop:hadoop-auth</include>
91-
<include>org.apache.hadoop:hadoop-common</include>
90+
<include>org.apache.hadoop:hadoop-client-api:jar:${hadoop.version}</include>
91+
<include>org.apache.hadoop:hadoop-client-runtime:jar:${hadoop.version}</include>
9292
<include>org.apache.kafka:kafka-clients:jar:${kafka.version}</include>
9393
<include>org.apache.ranger:credentialbuilder</include>
9494
<include>org.apache.ranger:ranger-authz-api</include>

pdp/pom.xml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -55,16 +55,6 @@
5555
<version>${nimbus-jose-jwt.version}</version>
5656
</dependency>
5757
<!-- Jersey-1 client pieces needed by ranger-plugins-common -->
58-
<dependency>
59-
<groupId>com.sun.jersey</groupId>
60-
<artifactId>jersey-client</artifactId>
61-
<version>${jersey-core.version}</version>
62-
</dependency>
63-
<dependency>
64-
<groupId>com.sun.jersey</groupId>
65-
<artifactId>jersey-core</artifactId>
66-
<version>${jersey-core.version}</version>
67-
</dependency>
6858
<dependency>
6959
<groupId>commons-codec</groupId>
7060
<artifactId>commons-codec</artifactId>
@@ -75,11 +65,6 @@
7565
<artifactId>jakarta.ws.rs-api</artifactId>
7666
<version>2.1.6</version>
7767
</dependency>
78-
<dependency>
79-
<groupId>javax.inject</groupId>
80-
<artifactId>javax.inject</artifactId>
81-
<version>${javax-inject.version}</version>
82-
</dependency>
8368
<dependency>
8469
<groupId>javax.validation</groupId>
8570
<artifactId>validation-api</artifactId>

security-admin/pom.xml

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -351,46 +351,6 @@
351351
</exclusion>
352352
</exclusions>
353353
</dependency>
354-
<dependency>
355-
<groupId>org.apache.hadoop</groupId>
356-
<artifactId>hadoop-hdfs</artifactId>
357-
<version>${hadoop.version}</version>
358-
<exclusions>
359-
<!-- Exclude Jackson - project uses newer Jackson version -->
360-
<exclusion>
361-
<groupId>com.fasterxml.jackson.core</groupId>
362-
<artifactId>*</artifactId>
363-
</exclusion>
364-
<exclusion>
365-
<groupId>com.fasterxml.jackson.jaxrs</groupId>
366-
<artifactId>*</artifactId>
367-
</exclusion>
368-
<exclusion>
369-
<groupId>com.fasterxml.jackson.module</groupId>
370-
<artifactId>*</artifactId>
371-
</exclusion>
372-
<exclusion>
373-
<groupId>com.google.guava</groupId>
374-
<artifactId>guava</artifactId>
375-
</exclusion>
376-
<exclusion>
377-
<groupId>com.sun.jersey</groupId>
378-
<artifactId>*</artifactId>
379-
</exclusion>
380-
<exclusion>
381-
<groupId>io.netty</groupId>
382-
<artifactId>netty</artifactId>
383-
</exclusion>
384-
<exclusion>
385-
<groupId>log4j</groupId>
386-
<artifactId>*</artifactId>
387-
</exclusion>
388-
<exclusion>
389-
<groupId>org.slf4j</groupId>
390-
<artifactId>*</artifactId>
391-
</exclusion>
392-
</exclusions>
393-
</dependency>
394354
<dependency>
395355
<groupId>org.apache.hadoop</groupId>
396356
<artifactId>hadoop-mapreduce-client-core</artifactId>

0 commit comments

Comments
 (0)