Merge pull request #318 from grighetto/316-fix-shaded-cqld3

#316 Properly shade classes in `driver-cqld3-shaded` module
This commit is contained in:
Jonathan Shook 2021-05-10 23:14:22 -05:00 committed by GitHub
commit b966c81a43
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 4 deletions

View File

@ -206,6 +206,7 @@
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>io.nosqlbench.engine.cli.NBCLI</mainClass> <mainClass>io.nosqlbench.engine.cli.NBCLI</mainClass>
</transformer> </transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
</transformers> </transformers>
<!-- <finalName>${project.artifactId}</finalName>--> <!-- <finalName>${project.artifactId}</finalName>-->
<filters> <filters>

View File

@ -184,10 +184,22 @@
<pattern>com.google.common</pattern> <pattern>com.google.common</pattern>
<shadedPattern>com.datastax.internal.com_google_common</shadedPattern> <shadedPattern>com.datastax.internal.com_google_common</shadedPattern>
</relocation> </relocation>
<!-- <relocation>--> <relocation>
<!-- <pattern>com.datastax</pattern>--> <pattern>com.datastax</pattern>
<!-- <shadedPattern>dse19.com.datastax</shadedPattern>--> <shadedPattern>com.datastax.cql3.shaded</shadedPattern>
<!-- </relocation>--> </relocation>
<relocation>
<pattern>io.nosqlbench.activitytype.cql</pattern>
<shadedPattern>io.nosqlbench.activitytype.cql3.shaded</shadedPattern>
</relocation>
<relocation>
<pattern>io.nosqlbench.endpoints.cql</pattern>
<shadedPattern>io.nosqlbench.endpoints.cql3.shaded</shadedPattern>
</relocation>
<relocation>
<pattern>io.nosqlbench.generators.cql</pattern>
<shadedPattern>io.nosqlbench.generators.cql3.shaded</shadedPattern>
</relocation>
<!-- <relocation>--> <!-- <relocation>-->
<!-- <pattern>io.netty</pattern>--> <!-- <pattern>io.netty</pattern>-->
<!-- <shadedPattern>dse19.io.netty</shadedPattern>--> <!-- <shadedPattern>dse19.io.netty</shadedPattern>-->
@ -202,6 +214,7 @@
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>io.nosqlbench.engine.cli.NBCLI</mainClass> <mainClass>io.nosqlbench.engine.cli.NBCLI</mainClass>
</transformer> </transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
</transformers> </transformers>
<!-- <finalName>${project.artifactId}</finalName>--> <!-- <finalName>${project.artifactId}</finalName>-->
<filters> <filters>