summaryrefslogtreecommitdiffstats
path: root/vespa-hadoop
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@verizonmedia.com>2021-03-24 15:20:53 +0100
committerBjørn Christian Seime <bjorncs@verizonmedia.com>2021-03-24 15:20:53 +0100
commitf71765ed0e6619b84ce82b685dbfa04205dbb962 (patch)
treeeffb4e37751ac92145bb99647784802669105546 /vespa-hadoop
parent77429da3edf53f376c53a66e387c550dc42cb3ec (diff)
Rename org.bouncycastle packages to avoid classpath conflict
Other JARs on the same classpath on Hadoop may use non-compatible version of BouncyCastle.
Diffstat (limited to 'vespa-hadoop')
-rw-r--r--vespa-hadoop/pom.xml4
1 files changed, 4 insertions, 0 deletions
diff --git a/vespa-hadoop/pom.xml b/vespa-hadoop/pom.xml
index 794eb038137..382c28dc884 100644
--- a/vespa-hadoop/pom.xml
+++ b/vespa-hadoop/pom.xml
@@ -135,6 +135,10 @@
<shadedPattern>shaded.vespa</shadedPattern>
</relocation>
<relocation>
+ <pattern>org.bouncycastle</pattern>
+ <shadedPattern>shaded.vespa.bouncycastle</shadedPattern>
+ </relocation>
+ <relocation>
<pattern>commons-codec</pattern>
<shadedPattern>shaded.vespa</shadedPattern>
</relocation>