Skip to content

Commit d8c32be

Browse files
committed
ATLAS-5210: updates for unit tests to pickup the modified hbase-shaded-client library
1 parent 016aa68 commit d8c32be

File tree

1 file changed

+28
-14
lines changed

1 file changed

+28
-14
lines changed

webapp/pom.xml

Lines changed: 28 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -522,6 +522,7 @@
522522
</artifactItems>
523523
</configuration>
524524
</execution>
525+
525526
</executions>
526527
</plugin>
527528
<plugin>
@@ -533,10 +534,31 @@
533534
<goals>
534535
<goal>jar</goal>
535536
</goals>
536-
<phase>prepare-package</phase>
537+
<phase>process-classes</phase>
537538
<configuration>
538539
<classesDirectory>${project.build.directory}/hbase-shaded-client-fixed</classesDirectory>
539-
<finalName>hbase-shaded-client-${hbase.version}-hadoop3-fixed</finalName>
540+
<finalName>hbase-shaded-client-${hbase.version}-hadoop3</finalName>
541+
</configuration>
542+
</execution>
543+
</executions>
544+
</plugin>
545+
<plugin>
546+
<groupId>org.apache.maven.plugins</groupId>
547+
<artifactId>maven-install-plugin</artifactId>
548+
<version>3.1.4</version>
549+
<executions>
550+
<execution>
551+
<id>install-fixed-hbase-shaded-client</id>
552+
<goals>
553+
<goal>install-file</goal>
554+
</goals>
555+
<phase>prepare-package</phase>
556+
<configuration>
557+
<file>${project.build.directory}/hbase-shaded-client-${hbase.version}-hadoop3.jar</file>
558+
<groupId>org.apache.hbase</groupId>
559+
<artifactId>hbase-shaded-client</artifactId>
560+
<version>${hbase.version}-hadoop3</version>
561+
<packaging>jar</packaging>
540562
</configuration>
541563
</execution>
542564
</executions>
@@ -566,13 +588,6 @@
566588
<directory>${project.build.directory}/api/v2/apidocs/ui</directory>
567589
<targetPath>apidocs</targetPath>
568590
</resource>
569-
<resource>
570-
<directory>${project.build.directory}</directory>
571-
<includes>
572-
<include>hbase-shaded-client-${hbase.version}-hadoop3-fixed.jar</include>
573-
</includes>
574-
<targetPath>WEB-INF/lib</targetPath>
575-
</resource>
576591
</webResources>
577592

578593
<archive>
@@ -583,7 +598,6 @@
583598
<packagingExcludes>WEB-INF/lib/dom4j-*.jar,WEB-INF/lib/jsp-api*.jar,${packages.to.exclude}</packagingExcludes>
584599
</configuration>
585600
</plugin>
586-
587601
<plugin>
588602
<groupId>org.codehaus.mojo</groupId>
589603
<artifactId>keytool-maven-plugin</artifactId>
@@ -869,7 +883,7 @@
869883
<activeByDefault>false</activeByDefault>
870884
</activation>
871885
<properties>
872-
<packages.to.exclude>WEB-INF/lib/hbase-shaded-client-${hbase.version}-hadoop3.jar,${distro.exclude.packages}</packages.to.exclude>
886+
<packages.to.exclude>${distro.exclude.packages}</packages.to.exclude>
873887
</properties>
874888
</profile>
875889

@@ -879,7 +893,7 @@
879893
<activeByDefault>false</activeByDefault>
880894
</activation>
881895
<properties>
882-
<packages.to.exclude>WEB-INF/lib/hbase-shaded-client-${hbase.version}-hadoop3.jar,WEB-INF/lib/je-*.jar,WEB-INF/lib/dom4j-*.jar</packages.to.exclude>
896+
<packages.to.exclude>WEB-INF/lib/je-*.jar,WEB-INF/lib/dom4j-*.jar</packages.to.exclude>
883897
</properties>
884898
</profile>
885899

@@ -889,7 +903,7 @@
889903
<activeByDefault>false</activeByDefault>
890904
</activation>
891905
<properties>
892-
<packages.to.exclude>WEB-INF/lib/hbase-shaded-client-${hbase.version}-hadoop3.jar,WEB-INF/lib/dom4j-*.jar</packages.to.exclude>
906+
<packages.to.exclude>WEB-INF/lib/dom4j-*.jar</packages.to.exclude>
893907
</properties>
894908
</profile>
895909

@@ -899,7 +913,7 @@
899913
<activeByDefault>false</activeByDefault>
900914
</activation>
901915
<properties>
902-
<packages.to.exclude>WEB-INF/lib/hbase-shaded-client-${hbase.version}-hadoop3.jar,WEB-INF/lib/dom4j-*.jar</packages.to.exclude>
916+
<packages.to.exclude>WEB-INF/lib/dom4j-*.jar</packages.to.exclude>
903917
</properties>
904918
</profile>
905919

0 commit comments

Comments
 (0)