Upgrade to RocksDB 5.5.5 with Apache License 2.0 (#587)

apache · Jul 21, 2017 · ee65abe · ee65abe
1 parent f6ebbb2
commit ee65abe
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 77 deletions.
diff --git a/all/licenses/LICENSE-RocksDB.txt b/all/licenses/LICENSE-RocksDB.txt
diff --git a/all/src/assemble/LICENSE.bin.txt b/all/src/assemble/LICENSE.bin.txt
@@ -331,6 +331,7 @@ The Apache Software License, Version 2.0
  * AsyncHttpClient -- org.asynchttpclient-*.jar
  * Jetty - org.eclipse.jetty-*.jar
  * SnakeYaml -- org.yaml-snakeyaml-*.jar
+ * RocksDB - org.rocksdb.*.jar
 
 BSD 3-clause "New" or "Revised" License
  * EA Agent Loader -- com.ea.agentloader-*.jar -- licenses/LICENSE-EA-Agent-Loader.txt
@@ -341,9 +342,6 @@ BSD 2-Clause License
 BSD License
  * JLine -- jline-*.jar -- licenses/LICENSE.JLine.txt
 
-RocksDB License
-  * RocksDB - org.rocksdb.*.jar -- licenses/LICENSE-RocksDB.txt
-
 MIT License
  * Java SemVer -- com.github.zafarkhaja-java-semver-*.jar -- licenses/LICENSE-SemVer.txt
  * SLF4J -- org.slf4j.*.jar -- licenses/LICENSE-SLF4J.txt

diff --git a/pom.xml b/pom.xml
@@ -109,6 +109,7 @@ flexible messaging model and an intuitive client API.</description>
     <athenz.version>1.7.17</athenz.version>
     <prometheus.version>0.0.23</prometheus.version>
     <aspectj.version>1.8.9</aspectj.version>
+    <rocksdb.version>5.5.5</rocksdb.version>
   </properties>
 
   <dependencyManagement>
@@ -207,6 +208,12 @@ flexible messaging model and an intuitive client API.</description>
         <version>${bookkeeper.version}</version>
       </dependency>
 
+      <dependency>
+        <groupId>org.rocksdb</groupId>
+        <artifactId>rocksdbjni</artifactId>
+        <version>${rocksdb.version}</version>
+      </dependency>
+
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-server</artifactId>