Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to RocksDB 5.5.5 with Apache License 2.0 #587

Merged
merged 1 commit into from
Jul 21, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 0 additions & 74 deletions all/licenses/LICENSE-RocksDB.txt

This file was deleted.

4 changes: 1 addition & 3 deletions all/src/assemble/LICENSE.bin.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
7 changes: 7 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down