HBASE-21153 Shaded client jars should always build in relevant phase to avoid confusion
Signed-off-by: Michael Stack <stack@apache.org>
This commit is contained in:
Sean Busbey
parent
198aa5dab4
commit
4d7221a68f
|
|
@ -45,6 +45,10 @@
|
||||||
<skipAssembly>true</skipAssembly>
|
<skipAssembly>true</skipAssembly>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-shade-plugin</artifactId>
|
||||||
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
|
@ -54,17 +58,4 @@
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<profiles>
|
|
||||||
<profile>
|
|
||||||
<id>release</id>
|
|
||||||
<build>
|
|
||||||
<plugins>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-shade-plugin</artifactId>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
|
||||||
</build>
|
|
||||||
</profile>
|
|
||||||
</profiles>
|
|
||||||
</project>
|
</project>
|
||||||
|
|
|
||||||
|
|
@ -45,6 +45,34 @@
|
||||||
<skipAssembly>true</skipAssembly>
|
<skipAssembly>true</skipAssembly>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-shade-plugin</artifactId>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<id>aggregate-into-a-jar-with-relocated-third-parties</id>
|
||||||
|
<configuration>
|
||||||
|
<artifactSet>
|
||||||
|
<excludes>
|
||||||
|
<!--
|
||||||
|
Tell the shade plugin that in this case we want to include hadoop
|
||||||
|
by leaving out the exclude.
|
||||||
|
-->
|
||||||
|
<!-- The rest of these should be kept in sync with the parent pom -->
|
||||||
|
<exclude>org.apache.hbase:hbase-resource-bundle</exclude>
|
||||||
|
<exclude>org.slf4j:*</exclude>
|
||||||
|
<exclude>com.google.code.findbugs:*</exclude>
|
||||||
|
<exclude>com.github.stephenc.findbugs:*</exclude>
|
||||||
|
<exclude>org.apache.htrace:*</exclude>
|
||||||
|
<exclude>org.apache.yetus:*</exclude>
|
||||||
|
<exclude>log4j:*</exclude>
|
||||||
|
<exclude>commons-logging:*</exclude>
|
||||||
|
</excludes>
|
||||||
|
</artifactSet>
|
||||||
|
</configuration>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
|
@ -55,41 +83,4 @@
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<profiles>
|
|
||||||
<profile>
|
|
||||||
<id>release</id>
|
|
||||||
<build>
|
|
||||||
<plugins>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-shade-plugin</artifactId>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<id>aggregate-into-a-jar-with-relocated-third-parties</id>
|
|
||||||
<configuration>
|
|
||||||
<artifactSet>
|
|
||||||
<excludes>
|
|
||||||
<!--
|
|
||||||
Tell the shade plugin that in this case we want to include hadoop
|
|
||||||
by leaving out the exclude.
|
|
||||||
-->
|
|
||||||
<!-- The rest of these should be kept in sync with the parent pom -->
|
|
||||||
<exclude>org.apache.hbase:hbase-resource-bundle</exclude>
|
|
||||||
<exclude>org.slf4j:*</exclude>
|
|
||||||
<exclude>com.google.code.findbugs:*</exclude>
|
|
||||||
<exclude>com.github.stephenc.findbugs:*</exclude>
|
|
||||||
<exclude>org.apache.htrace:*</exclude>
|
|
||||||
<exclude>org.apache.yetus:*</exclude>
|
|
||||||
<exclude>log4j:*</exclude>
|
|
||||||
<exclude>commons-logging:*</exclude>
|
|
||||||
</excludes>
|
|
||||||
</artifactSet>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
|
||||||
</build>
|
|
||||||
</profile>
|
|
||||||
</profiles>
|
|
||||||
</project>
|
</project>
|
||||||
|
|
|
||||||
|
|
@ -59,6 +59,10 @@
|
||||||
</archive>
|
</archive>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-shade-plugin</artifactId>
|
||||||
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
|
@ -165,17 +169,6 @@
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<profiles>
|
<profiles>
|
||||||
<profile>
|
|
||||||
<id>release</id>
|
|
||||||
<build>
|
|
||||||
<plugins>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-shade-plugin</artifactId>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
|
||||||
</build>
|
|
||||||
</profile>
|
|
||||||
<!-- These hadoop profiles should be derived from those in the hbase-mapreduce
|
<!-- These hadoop profiles should be derived from those in the hbase-mapreduce
|
||||||
module. Essentially, you must list the same hadoop-* dependencies
|
module. Essentially, you must list the same hadoop-* dependencies
|
||||||
since provided dependencies are not transitively included.
|
since provided dependencies are not transitively included.
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue