[AMQ-7502] Remove leveldb

NikitaShupletsov · Mar 25, 2021 · 52a2bd4 · 52a2bd4
1 parent fc0999c
commit 52a2bd4
Show file tree

Hide file tree

Showing 152 changed files with 195 additions and 16,657 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,14 +16,9 @@ activemq-unit-tests/KahaDB
 activemq-unit-tests/broker
 activemq-unit-tests/derby.log
 activemq-unit-tests/derbyDb
-activemq-unit-tests/LevelDB
 activemq-unit-tests/networkedBroker
 activemq-unit-tests/shared
 activemq-data
-activemq-leveldb-store/.cache
-activemq-leveldb-store/.cache-main
-activemq-leveldb-store/.cache-tests
-activemq-leveldb-store/.tmpBin
 activemq-runtime-config/src/main/resources/activemq.xsd
 activemq-amqp/amqp-trace.txt
 data/

diff --git a/activemq-all/pom.xml b/activemq-all/pom.xml
@@ -59,10 +59,6 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>activemq-jdbc-store</artifactId>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>activemq-leveldb-store</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-annotation_1.0_spec</artifactId>
@@ -109,7 +105,6 @@
                   <include>${project.groupId}:activemq-mqtt</include>
                   <include>${project.groupId}:activemq-stomp</include>
                   <include>${project.groupId}:activemq-kahadb-store</include>
-                  <include>${project.groupId}:activemq-leveldb-store</include>
                   <include>${project.groupId}:activemq-jdbc-store</include>
                   <include>org.apache.activemq.protobuf:activemq-protobuf</include>
                   <include>org.fusesource.hawtbuf:hawtbuf</include>
@@ -314,13 +309,6 @@
           <classifier>sources</classifier>
           <optional>true</optional>
         </dependency>
-        <dependency>
-          <groupId>${project.groupId}</groupId>
-          <artifactId>activemq-leveldb-store</artifactId>
-          <version>${project.version}</version>
-          <classifier>sources</classifier>
-          <optional>true</optional>
-        </dependency>
         <dependency>
           <groupId>org.apache.activemq.protobuf</groupId>
           <artifactId>activemq-protobuf</artifactId>

diff --git a/activemq-amqp/pom.xml b/activemq-amqp/pom.xml
@@ -114,11 +114,6 @@
       <artifactId>spring-context</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.activemq</groupId>
-      <artifactId>activemq-leveldb-store</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.activemq.tooling</groupId>
       <artifactId>activemq-junit</artifactId>

diff --git a/activemq-http/pom.xml b/activemq-http/pom.xml
@@ -90,6 +90,17 @@
       <artifactId>activemq-jaas</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activemq-kahadb-store</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+      <version>${commons-lang-version}</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

diff --git a/activemq-http/src/test/java/org/apache/activemq/bugs/AMQ5816Test.java b/activemq-http/src/test/java/org/apache/activemq/bugs/AMQ5816Test.java
diff --git a/activemq-karaf-itest/src/test/resources/org/apache/activemq/karaf/itest/activemq.xml b/activemq-karaf-itest/src/test/resources/org/apache/activemq/karaf/itest/activemq.xml
diff --git a/activemq-karaf/src/main/resources/features-core.xml b/activemq-karaf/src/main/resources/features-core.xml
@@ -71,6 +71,5 @@
       <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/${jackson-version}</bundle>
       <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/${jackson-databind-version}</bundle>
       <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson-version}</bundle>
-      <bundle dependency="true">mvn:org.scala-lang/scala-library/${scala-version}</bundle>
     </feature>
 </features>
diff --git a/activemq-leveldb-store/kahadb-vs-leveldb.png b/activemq-leveldb-store/kahadb-vs-leveldb.png