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

Author: adamretter

java/rocksjni/backup_engine_options.cc

@@ -14,10 +14,10 @@
 #include <string>
 #include <vector>
 
-#include "include/org_rocksdb_BackupEngineOptions.h"
+#include "org_rocksdb_BackupEngineOptions.h"
 #include "rocksdb/utilities/backup_engine.h"
-#include "rocksjni/cplusplus_to_java_convert.h"
-#include "rocksjni/portal.h"
+#include "cplusplus_to_java_convert.h"
+#include "portal.h"
 
 ///////////////////////////////////////////////////////////////////////////
 // BackupDBOptions

java/rocksjni/backupenginejni.cc

@@ -10,10 +10,10 @@
 
 #include <vector>
 
-#include "include/org_rocksdb_BackupEngine.h"
+#include "org_rocksdb_BackupEngine.h"
 #include "rocksdb/utilities/backup_engine.h"
-#include "rocksjni/cplusplus_to_java_convert.h"
-#include "rocksjni/portal.h"
+#include "cplusplus_to_java_convert.h"
+#include "portal.h"
 
 /*
  * Class:     org_rocksdb_BackupEngine

java/rocksjni/cache.cc

@@ -8,7 +8,7 @@
 
 #include <jni.h>
 
-#include "include/org_rocksdb_Cache.h"
+#include "org_rocksdb_Cache.h"
 #include "rocksdb/advanced_cache.h"
 
 /*

java/rocksjni/cassandra_compactionfilterjni.cc

@@ -5,8 +5,8 @@
 
 #include <jni.h>
 
-#include "include/org_rocksdb_CassandraCompactionFilter.h"
-#include "rocksjni/cplusplus_to_java_convert.h"
+#include "org_rocksdb_CassandraCompactionFilter.h"
+#include "cplusplus_to_java_convert.h"
 #include "utilities/cassandra/cassandra_compaction_filter.h"
 
 /*

java/rocksjni/cassandra_value_operator.cc

@@ -10,16 +10,16 @@
 #include <memory>
 #include <string>
 
-#include "include/org_rocksdb_CassandraValueMergeOperator.h"
+#include "org_rocksdb_CassandraValueMergeOperator.h"
 #include "rocksdb/db.h"
 #include "rocksdb/memtablerep.h"
 #include "rocksdb/merge_operator.h"
 #include "rocksdb/options.h"
 #include "rocksdb/slice_transform.h"
 #include "rocksdb/statistics.h"
 #include "rocksdb/table.h"
-#include "rocksjni/cplusplus_to_java_convert.h"
-#include "rocksjni/portal.h"
+#include "cplusplus_to_java_convert.h"
+#include "portal.h"
 #include "utilities/cassandra/merge_operator.h"
 
 /*

java/rocksjni/checkpoint.cc

@@ -14,10 +14,10 @@
 
 #include <string>
 
-#include "include/org_rocksdb_Checkpoint.h"
+#include "org_rocksdb_Checkpoint.h"
 #include "rocksdb/db.h"
-#include "rocksjni/cplusplus_to_java_convert.h"
-#include "rocksjni/portal.h"
+#include "cplusplus_to_java_convert.h"
+#include "portal.h"
 /*
  * Class:     org_rocksdb_Checkpoint
  * Method:    newCheckpoint

java/rocksjni/clock_cache.cc

@@ -10,8 +10,8 @@
 
 #include <jni.h>
 
-#include "include/org_rocksdb_ClockCache.h"
-#include "rocksjni/cplusplus_to_java_convert.h"
+#include "org_rocksdb_ClockCache.h"
+#include "cplusplus_to_java_convert.h"
 
 /*
  * Class:     org_rocksdb_ClockCache

java/rocksjni/columnfamilyhandle.cc

@@ -10,8 +10,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "include/org_rocksdb_ColumnFamilyHandle.h"
-#include "rocksjni/portal.h"
+#include "org_rocksdb_ColumnFamilyHandle.h"
+#include "portal.h"
 
 /*
  * Class:     org_rocksdb_ColumnFamilyHandle

java/rocksjni/compact_range_options.cc

@@ -8,10 +8,10 @@
 
 #include <jni.h>
 
-#include "include/org_rocksdb_CompactRangeOptions.h"
+#include "org_rocksdb_CompactRangeOptions.h"
 #include "rocksdb/options.h"
-#include "rocksjni/cplusplus_to_java_convert.h"
-#include "rocksjni/portal.h"
+#include "cplusplus_to_java_convert.h"
+#include "portal.h"
 #include "util/coding.h"
 
 /**

java/rocksjni/compaction_filter.cc

@@ -10,7 +10,7 @@
 
 #include <jni.h>
 
-#include "include/org_rocksdb_AbstractCompactionFilter.h"
+#include "org_rocksdb_AbstractCompactionFilter.h"
 
 // <editor-fold desc="org.rocksdb.AbstractCompactionFilter">