Skip to content

HBASE-26592 Fix the broken shaded protobuf module #70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Apache9 merged 1 commit into from
Dec 17, 2021
Merged

HBASE-26592 Fix the broken shaded protobuf module #70

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 15 additions & 13 deletions hbase-shaded-protobuf/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,15 @@
Pulls down protobuf, patches it, compiles, and then relocates/shades.
</description>
<build>
<resources>
<resource>
<directory>src/main/java</directory>
<includes>
<!-- include the protos -->
<include>google/**</include>
</includes>
</resource>
</resources>
<plugins>
<plugin>
<!--Clean needs to purge src/main/java since this is where
Expand Down Expand Up @@ -77,6 +86,12 @@
<goal>unpack</goal>
</goals>
<configuration>
<!--
The protobuf-java has no compile or runtime dependency so we
only depend it here, without adding it to our dependencies
section. Need to review later if protobuf-java has compile or
runtime dependencies in the future.
-->
<artifactItems>
<artifactItem>
<groupId>com.google.protobuf</groupId>
Expand Down Expand Up @@ -146,12 +161,6 @@
<configuration>
<shadeSourcesContent>true</shadeSourcesContent>
<createSourcesJar>true</createSourcesJar>
<artifactSet>
<excludes>
<!-- We will compile our own version, so exclude the original one -->
<exclude>com.google.protobuf:protobuf-java</exclude>
</excludes>
</artifactSet>
<relocations>
<relocation>
<pattern>com.google.protobuf</pattern>
Expand All @@ -175,11 +184,4 @@
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>${protobuf.version}</version>
</dependency>
</dependencies>
</project>