Skip to content

Commit 8f68021

Browse files
adamretteradamretter
committed
fixup! fixup! fixup! Refactor to use Maven for building and publishing Java packages
1 parent 0d7c785 commit 8f68021

3 files changed

Lines changed: 142 additions & 18 deletions

File tree

‎java/Makefile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,26 +72,26 @@ build_samples:
7272
sample:
7373
$(MAVEN_CMD) -Psamples -DskipTests package
7474
$(AM_V_at)@rm -rf /tmp/rocksdbjni
75-
$(JAVA_CMD) $(JAVA_ARGS) -Djava.library.path=${JAVA_NATIVE_DIR} -cp target/rocksdbjni-$(ROCKSDB_JAVA_VERSION).jar:samples/target/rocksdbjni-samples-$(ROCKSDB_JAVA_VERSION).jar RocksDBSample /tmp/rocksdbjni
75+
$(JAVA_CMD) $(JAVA_ARGS) -Djava.library.path=${JAVA_NATIVE_DIR} -cp target/rocksdbjni-$(ROCKSDB_JAVA_VERSION).jar:samples/target/rocksdbjni-samples-0.0.0-SNAPSHOT.jar RocksDBSample /tmp/rocksdbjni
7676
$(AM_V_at)@rm -rf /tmp/rocksdbjni
7777
$(AM_V_at)@rm -rf /tmp/rocksdbjni_not_found
7878

7979
column_family_sample:
8080
$(MAVEN_CMD) -Psamples -DskipTests package
8181
$(AM_V_at)@rm -rf /tmp/rocksdbjni
82-
$(JAVA_CMD) $(JAVA_ARGS) -Djava.library.path=${JAVA_NATIVE_DIR} -cp target/rocksdbjni-$(ROCKSDB_JAVA_VERSION).jar:samples/target/rocksdbjni-samples-$(ROCKSDB_JAVA_VERSION).jar RocksDBColumnFamilySample /tmp/rocksdbjni
82+
$(JAVA_CMD) $(JAVA_ARGS) -Djava.library.path=${JAVA_NATIVE_DIR} -cp target/rocksdbjni-$(ROCKSDB_JAVA_VERSION).jar:samples/target/rocksdbjni-samples-0.0.0-SNAPSHOT.jar RocksDBColumnFamilySample /tmp/rocksdbjni
8383
$(AM_V_at)@rm -rf /tmp/rocksdbjni
8484

8585
transaction_sample:
8686
$(MAVEN_CMD) -Psamples -DskipTests package
8787
$(AM_V_at)@rm -rf /tmp/rocksdbjni
88-
$(JAVA_CMD) $(JAVA_ARGS) -Djava.library.path=${JAVA_NATIVE_DIR} -cp target/rocksdbjni-$(ROCKSDB_JAVA_VERSION).jar:samples/target/rocksdbjni-samples-$(ROCKSDB_JAVA_VERSION).jar TransactionSample /tmp/rocksdbjni
88+
$(JAVA_CMD) $(JAVA_ARGS) -Djava.library.path=${JAVA_NATIVE_DIR} -cp target/rocksdbjni-$(ROCKSDB_JAVA_VERSION).jar:samples/target/rocksdbjni-samples-0.0.0-SNAPSHOT.jar TransactionSample /tmp/rocksdbjni
8989
$(AM_V_at)@rm -rf /tmp/rocksdbjni
9090

9191
optimistic_transaction_sample:
9292
$(MAVEN_CMD) -Psamples -DskipTests package
9393
$(AM_V_at)@rm -rf /tmp/rocksdbjni
94-
$(JAVA_CMD) $(JAVA_ARGS) -Djava.library.path=${JAVA_NATIVE_DIR} -cp target/rocksdbjni-$(ROCKSDB_JAVA_VERSION).jar:samples/target/rocksdbjni-samples-$(ROCKSDB_JAVA_VERSION).jar OptimisticTransactionSample /tmp/rocksdbjni
94+
$(JAVA_CMD) $(JAVA_ARGS) -Djava.library.path=${JAVA_NATIVE_DIR} -cp target/rocksdbjni-$(ROCKSDB_JAVA_VERSION).jar:samples/target/rocksdbjni-samples-0.0.0-SNAPSHOT.jar OptimisticTransactionSample /tmp/rocksdbjni
9595
$(AM_V_at)@rm -rf /tmp/rocksdbjni
9696

9797
java_test:
@@ -105,7 +105,7 @@ run_test:
105105

106106
db_bench:
107107
$(MAVEN_CMD) -Pbenchmark -DskipTests package
108-
$(JAVA_CMD) $(JAVA_ARGS) -Djava.library.path=${JAVA_NATIVE_DIR} -cp target/rocksdbjni-$(ROCKSDB_JAVA_VERSION).jar:benchmark/target/rocksdbjni-benchmark-$(ROCKSDB_JAVA_VERSION).jar org.rocksdb.benchmark.DbBenchmark
108+
$(JAVA_CMD) $(JAVA_ARGS) -Djava.library.path=${JAVA_NATIVE_DIR} -cp target/rocksdbjni-$(ROCKSDB_JAVA_VERSION).jar:benchmark/target/rocksdbjni-benchmark-0.0.0-SNAPSHOT.jar org.rocksdb.benchmark.DbBenchmark
109109

110110
pmd:
111111
$(MAVEN_CMD) pmd:pmd pmd:cpd pmd:check

‎java/benchmark/pom.xml‎

Lines changed: 68 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,79 @@
44
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
55
<modelVersion>4.0.0</modelVersion>
66

7-
<parent>
8-
<groupId>org.rocksdb</groupId>
9-
<artifactId>rocksdbjni</artifactId>
10-
<version>0.0.0-SNAPSHOT</version>
11-
</parent>
12-
7+
<groupId>org.rocksdb</groupId>
138
<artifactId>rocksdbjni-benchmark</artifactId>
9+
<version>0.0.0-SNAPSHOT</version>
1410

1511
<name>RocksDB JNI Benchmark</name>
1612
<description>Benchmark for RocksDB Java API</description>
1713
<url>https://rocksdb.org</url>
1814
<inceptionYear>2012</inceptionYear>
1915

16+
<licenses>
17+
<license>
18+
<name>Apache License 2.0</name>
19+
<url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
20+
<distribution>repo</distribution>
21+
</license>
22+
<license>
23+
<name>GNU General Public License, version 2</name>
24+
<url>http://www.gnu.org/licenses/gpl-2.0.html</url>
25+
<distribution>repo</distribution>
26+
</license>
27+
</licenses>
28+
29+
<scm>
30+
<connection>scm:git:https://github.com/facebook/rocksdb.git</connection>
31+
<developerConnection>scm:git:https://github.com/facebook/rocksdb.git</developerConnection>
32+
<url>scm:git:https://github.com/facebook/rocksdb.git</url>
33+
</scm>
34+
35+
<organization>
36+
<name>Facebook</name>
37+
<url>https://www.facebook.com</url>
38+
</organization>
39+
40+
<developers>
41+
<developer>
42+
<name>Facebook</name>
43+
<email>help@facebook.com</email>
44+
<timezone>-8</timezone>
45+
<roles>
46+
<role>architect</role>
47+
</roles>
48+
</developer>
49+
</developers>
50+
51+
<mailingLists>
52+
<mailingList>
53+
<name>rocksdb - Google Groups</name>
54+
<subscribe>rocksdb-subscribe@googlegroups.com</subscribe>
55+
<unsubscribe>rocksdb-unsubscribe@googlegroups.com</unsubscribe>
56+
<post>rocksdb@googlegroups.com</post>
57+
<archive>https://groups.google.com/forum/#!forum/rocksdb</archive>
58+
</mailingList>
59+
</mailingLists>
60+
61+
<properties>
62+
<project.build.source>1.8</project.build.source>
63+
<project.build.target>1.8</project.build.target>
64+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
65+
</properties>
66+
67+
<build>
68+
<plugins>
69+
<plugin>
70+
<groupId>org.apache.maven.plugins</groupId>
71+
<artifactId>maven-compiler-plugin</artifactId>
72+
<version>3.15.0</version>
73+
<configuration>
74+
<source>${project.build.source}</source>
75+
<target>${project.build.target}</target>
76+
<encoding>${project.build.sourceEncoding}</encoding>
77+
</configuration>
78+
</plugin>
79+
</plugins>
80+
</build>
81+
2082
</project>

‎java/samples/pom.xml‎

Lines changed: 69 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,79 @@
44
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
55
<modelVersion>4.0.0</modelVersion>
66

7-
<parent>
8-
<groupId>org.rocksdb</groupId>
9-
<artifactId>rocksdbjni</artifactId>
10-
<version>0.0.0-SNAPSHOT</version>
11-
</parent>
12-
7+
<groupId>org.rocksdb</groupId>
138
<artifactId>rocksdbjni-samples</artifactId>
9+
<version>0.0.0-SNAPSHOT</version>
1410

1511
<name>RocksDB JNI Samples</name>
1612
<description>Examples of using the RocksDB Java API</description>
1713
<url>https://rocksdb.org</url>
1814
<inceptionYear>2012</inceptionYear>
1915

20-
</project>
16+
<licenses>
17+
<license>
18+
<name>Apache License 2.0</name>
19+
<url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
20+
<distribution>repo</distribution>
21+
</license>
22+
<license>
23+
<name>GNU General Public License, version 2</name>
24+
<url>http://www.gnu.org/licenses/gpl-2.0.html</url>
25+
<distribution>repo</distribution>
26+
</license>
27+
</licenses>
28+
29+
<scm>
30+
<connection>scm:git:https://github.com/facebook/rocksdb.git</connection>
31+
<developerConnection>scm:git:https://github.com/facebook/rocksdb.git</developerConnection>
32+
<url>scm:git:https://github.com/facebook/rocksdb.git</url>
33+
</scm>
34+
35+
<organization>
36+
<name>Facebook</name>
37+
<url>https://www.facebook.com</url>
38+
</organization>
39+
40+
<developers>
41+
<developer>
42+
<name>Facebook</name>
43+
<email>help@facebook.com</email>
44+
<timezone>-8</timezone>
45+
<roles>
46+
<role>architect</role>
47+
</roles>
48+
</developer>
49+
</developers>
50+
51+
<mailingLists>
52+
<mailingList>
53+
<name>rocksdb - Google Groups</name>
54+
<subscribe>rocksdb-subscribe@googlegroups.com</subscribe>
55+
<unsubscribe>rocksdb-unsubscribe@googlegroups.com</unsubscribe>
56+
<post>rocksdb@googlegroups.com</post>
57+
<archive>https://groups.google.com/forum/#!forum/rocksdb</archive>
58+
</mailingList>
59+
</mailingLists>
60+
61+
<properties>
62+
<project.build.source>1.8</project.build.source>
63+
<project.build.target>1.8</project.build.target>
64+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
65+
</properties>
66+
67+
<build>
68+
<plugins>
69+
<plugin>
70+
<groupId>org.apache.maven.plugins</groupId>
71+
<artifactId>maven-compiler-plugin</artifactId>
72+
<version>3.15.0</version>
73+
<configuration>
74+
<source>${project.build.source}</source>
75+
<target>${project.build.target}</target>
76+
<encoding>${project.build.sourceEncoding}</encoding>
77+
</configuration>
78+
</plugin>
79+
</plugins>
80+
</build>
81+
82+
</project>

0 commit comments

Comments
 (0)