Skip to content

Commit 22d2ec1

Browse files
committed
Fix failure in precommit checks for Yetus JDK8 Hadoop2 due to missing class SchemaLdifExtractor in ApacheDS 2.0.0.AM26. The issue arises from an overridden ApacheDS version incompatible with Hadoop 2. To resolve, skip LDAP tests for Hadoop 2 and apply dependency changes only for Hadoop 3.
1 parent 39c68df commit 22d2ec1

File tree

1 file changed

+68
-60
lines changed

1 file changed

+68
-60
lines changed

hbase-http/pom.xml

Lines changed: 68 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -160,60 +160,6 @@
160160
<artifactId>log4j-1.2-api</artifactId>
161161
<scope>test</scope>
162162
</dependency>
163-
<dependency>
164-
<groupId>org.apache.directory.server</groupId>
165-
<artifactId>apacheds-core</artifactId>
166-
<version>${apacheds.version}</version>
167-
<scope>test</scope>
168-
<exclusions>
169-
<exclusion>
170-
<groupId>org.bouncycastle</groupId>
171-
<artifactId>bcprov-jdk15on</artifactId>
172-
</exclusion>
173-
</exclusions>
174-
</dependency>
175-
<dependency>
176-
<groupId>org.apache.directory.server</groupId>
177-
<artifactId>apacheds-protocol-ldap</artifactId>
178-
<version>${apacheds.version}</version>
179-
<scope>test</scope>
180-
<exclusions>
181-
<exclusion>
182-
<groupId>org.bouncycastle</groupId>
183-
<artifactId>bcprov-jdk15on</artifactId>
184-
</exclusion>
185-
</exclusions>
186-
</dependency>
187-
<dependency>
188-
<groupId>org.apache.directory.server</groupId>
189-
<artifactId>apacheds-ldif-partition</artifactId>
190-
<version>${apacheds.version}</version>
191-
<scope>test</scope>
192-
</dependency>
193-
<dependency>
194-
<groupId>org.apache.directory.api</groupId>
195-
<artifactId>api-ldap-codec-core</artifactId>
196-
<version>${ldap-api.version}</version>
197-
<scope>test</scope>
198-
</dependency>
199-
<dependency>
200-
<groupId>org.apache.directory.api</groupId>
201-
<artifactId>api-ldap-model</artifactId>
202-
<version>${ldap-api.version}</version>
203-
<scope>test</scope>
204-
</dependency>
205-
<dependency>
206-
<groupId>org.apache.directory.server</groupId>
207-
<artifactId>apacheds-server-integ</artifactId>
208-
<version>${apacheds.version}</version>
209-
<scope>test</scope>
210-
<exclusions>
211-
<exclusion>
212-
<groupId>log4j</groupId>
213-
<artifactId>log4j</artifactId>
214-
</exclusion>
215-
</exclusions>
216-
</dependency>
217163
</dependencies>
218164

219165
<build>
@@ -424,12 +370,6 @@
424370
<groupId>org.apache.hadoop</groupId>
425371
<artifactId>hadoop-minikdc</artifactId>
426372
<scope>test</scope>
427-
<exclusions>
428-
<exclusion>
429-
<groupId>org.apache.directory.api</groupId>
430-
<artifactId>api-all</artifactId>
431-
</exclusion>
432-
</exclusions>
433373
</dependency>
434374
<dependency>
435375
<groupId>org.apache.kerby</groupId>
@@ -458,6 +398,20 @@
458398
</execution>
459399
</executions>
460400
</plugin>
401+
<plugin>
402+
<groupId>org.apache.maven.plugins</groupId>
403+
<artifactId>maven-compiler-plugin</artifactId>
404+
<configuration>
405+
<!--
406+
These files can not compile against hadoop 2.x and we also do not need these
407+
hacks when working with hadoop 2.x, so exclude them here.
408+
See HBASE-28368 for more details
409+
-->
410+
<testExcludes>
411+
<testExclude>**/org/apache/hadoop/hbase/http/TestLdapHttpServer**</testExclude>
412+
</testExcludes>
413+
</configuration>
414+
</plugin>
461415
</plugins>
462416
</build>
463417
</profile>
@@ -506,6 +460,60 @@
506460
<artifactId>hadoop-minikdc</artifactId>
507461
<scope>test</scope>
508462
</dependency>
463+
<dependency>
464+
<groupId>org.apache.directory.server</groupId>
465+
<artifactId>apacheds-core</artifactId>
466+
<version>${apacheds.version}</version>
467+
<scope>test</scope>
468+
<exclusions>
469+
<exclusion>
470+
<groupId>org.bouncycastle</groupId>
471+
<artifactId>bcprov-jdk15on</artifactId>
472+
</exclusion>
473+
</exclusions>
474+
</dependency>
475+
<dependency>
476+
<groupId>org.apache.directory.server</groupId>
477+
<artifactId>apacheds-protocol-ldap</artifactId>
478+
<version>${apacheds.version}</version>
479+
<scope>test</scope>
480+
<exclusions>
481+
<exclusion>
482+
<groupId>org.bouncycastle</groupId>
483+
<artifactId>bcprov-jdk15on</artifactId>
484+
</exclusion>
485+
</exclusions>
486+
</dependency>
487+
<dependency>
488+
<groupId>org.apache.directory.server</groupId>
489+
<artifactId>apacheds-ldif-partition</artifactId>
490+
<version>${apacheds.version}</version>
491+
<scope>test</scope>
492+
</dependency>
493+
<dependency>
494+
<groupId>org.apache.directory.api</groupId>
495+
<artifactId>api-ldap-codec-core</artifactId>
496+
<version>${ldap-api.version}</version>
497+
<scope>test</scope>
498+
</dependency>
499+
<dependency>
500+
<groupId>org.apache.directory.api</groupId>
501+
<artifactId>api-ldap-model</artifactId>
502+
<version>${ldap-api.version}</version>
503+
<scope>test</scope>
504+
</dependency>
505+
<dependency>
506+
<groupId>org.apache.directory.server</groupId>
507+
<artifactId>apacheds-server-integ</artifactId>
508+
<version>${apacheds.version}</version>
509+
<scope>test</scope>
510+
<exclusions>
511+
<exclusion>
512+
<groupId>log4j</groupId>
513+
<artifactId>log4j</artifactId>
514+
</exclusion>
515+
</exclusions>
516+
</dependency>
509517
</dependencies>
510518
<build>
511519
<plugins>

0 commit comments

Comments
 (0)