From b948097d41700ece775718102dca10d408916ad5 Mon Sep 17 00:00:00 2001
From: Michael Vorburger <vorburger@redhat.com>
Date: Tue, 16 Jan 2018 02:38:02 +0100
Subject: [PATCH] Exclude leveldb-api from odl-akka-leveldb-0.7

to fix this (correct) complaint from ClasspathHellDuplicatesCheckRule:

file:/.../org/iq80/leveldb/leveldb-api/0.7/leveldb-api-0.7.jar overlaps
with
file:/.../leveldbjni/leveldbjni-all/1.8-odl/leveldbjni-all-1.8-odl.jar
- total overlapping classes: 13 - same classloader ! This is an ERROR!

Change-Id: I929fb28606a8f6456747229ac2ceee6a90a9f04e
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Signed-off-by: Stephen Kitt <skitt@redhat.com>
(cherry picked from commit a16ccdc6a4f74e98c46cdd346577f5ae61cd6699)
---
 features/odl-akka-leveldb-0.7/pom.xml                      | 7 +++++++
 .../odl-akka-leveldb-0.7/src/main/history/dependencies.xml | 1 -
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/features/odl-akka-leveldb-0.7/pom.xml b/features/odl-akka-leveldb-0.7/pom.xml
index 8d7dd0986..8bfe89bcd 100644
--- a/features/odl-akka-leveldb-0.7/pom.xml
+++ b/features/odl-akka-leveldb-0.7/pom.xml
@@ -41,6 +41,13 @@
         <dependency>
             <groupId>org.iq80.leveldb</groupId>
             <artifactId>leveldb</artifactId>
+            <exclusions>
+              <exclusion>
+                <!-- To avoid classpath duplicates, because leveldbjni-all shades a (not bit identical version of) the 13 API classes in org.iq80.leveldb -->
+                <groupId>org.iq80.leveldb</groupId>
+                <artifactId>leveldb-api</artifactId>
+              </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.fusesource.leveldbjni</groupId>
diff --git a/features/odl-akka-leveldb-0.7/src/main/history/dependencies.xml b/features/odl-akka-leveldb-0.7/src/main/history/dependencies.xml
index 4313e4528..63dffd126 100644
--- a/features/odl-akka-leveldb-0.7/src/main/history/dependencies.xml
+++ b/features/odl-akka-leveldb-0.7/src/main/history/dependencies.xml
@@ -4,7 +4,6 @@
         <feature prerequisite="false" dependency="false">odl-guava-23</feature>
         <feature prerequisite="false" dependency="false">wrap</feature>
         <bundle>mvn:org.fusesource.leveldbjni/leveldbjni-all/1.8-odl</bundle>
-        <bundle>wrap:mvn:org.iq80.leveldb/leveldb-api/0.7</bundle>
         <bundle>wrap:mvn:org.iq80.leveldb/leveldb/0.7</bundle>
     </feature>
 </features>
-- 
2.36.6