fixup! fixup! fixup! fixup! Refactor to use Maven for building and publishing Java packages

Author: adamretter

java/Makefile

@@ -56,7 +56,9 @@ ifneq ($(JAVAC_VERSION_GE_MIN),true)
 endif
 
 clean:
-	$(MAVEN_CMD) -Psamples clean
+	$(MAVEN_CMD) clean
+	cd benchmark; $(MAVEN_CMD) clean
+	cd samples; $(MAVEN_CMD) clean
 
 javadocs: java
 	$(MAVEN_CMD) -P javadoc-jar -DskipTests package
@@ -67,29 +69,29 @@ java: java-version
 	$(MAVEN_CMD) compile
 
 build_samples:
-	$(MAVEN_CMD) -Psamples -DskipTests package
+	cd benchmark; $(MAVEN_CMD) package
 
-sample:
-	$(MAVEN_CMD) -Psamples -DskipTests package
+sample: java
+	cd benchmark; $(MAVEN_CMD) package
 	$(AM_V_at)@rm -rf /tmp/rocksdbjni
 	$(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
 	$(AM_V_at)@rm -rf /tmp/rocksdbjni
 	$(AM_V_at)@rm -rf /tmp/rocksdbjni_not_found
 
-column_family_sample:
-	$(MAVEN_CMD) -Psamples -DskipTests package
+column_family_sample: java
+	cd benchmark; $(MAVEN_CMD) package
 	$(AM_V_at)@rm -rf /tmp/rocksdbjni
 	$(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
 	$(AM_V_at)@rm -rf /tmp/rocksdbjni
 
-transaction_sample:
-	$(MAVEN_CMD) -Psamples -DskipTests package
+transaction_sample: java
+	cd benchmark; $(MAVEN_CMD) package
 	$(AM_V_at)@rm -rf /tmp/rocksdbjni
 	$(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
 	$(AM_V_at)@rm -rf /tmp/rocksdbjni
 
-optimistic_transaction_sample:
-	$(MAVEN_CMD) -Psamples -DskipTests package
+optimistic_transaction_sample: java
+	cd benchmark; $(MAVEN_CMD) package
 	$(AM_V_at)@rm -rf /tmp/rocksdbjni
 	$(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
 	$(AM_V_at)@rm -rf /tmp/rocksdbjni
@@ -103,8 +105,8 @@ test:
 run_test:
 	$(MAVEN_CMD) test
 
-db_bench:
-	$(MAVEN_CMD) -Pbenchmark -DskipTests package
+db_bench: java
+	cd benchmark; $(MAVEN_CMD) package
 	$(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
 
 pmd:

java/pom.xml.template

@@ -266,20 +266,6 @@
 
     <profiles>
 
-        <profile>
-            <id>benchmark</id>
-            <modules>
-                <module>benchmark</module>
-            </modules>
-        </profile>
-
-        <profile>
-            <id>samples</id>
-            <modules>
-                <module>samples</module>
-            </modules>
-        </profile>
-
         <profile>
             <id>source-jar</id>
             <activation>