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

Author: adamretter

.gitignore

@@ -61,11 +61,8 @@ io_tracer_parser
 .vscode
 .clangd
 
-java/out
 java/target
-java/test-libs
 java/*.log
-java/include/org_rocksdb_*.h
 
 .idea/
 *.iml
@@ -75,8 +72,6 @@ rocksdb.h
 unity.cc
 java/crossbuild/.vagrant
 .vagrant/
-java/**/*.asc
-java/javadoc
 
 scan_build_report/
 t

Makefile

@@ -2318,7 +2318,7 @@ endif
 rocksdbjavastatic_javalib:
 	cd java; $(MAKE) javalib
 	rm -f $(JAVA_NATIVE_DIR)/$(ROCKSDBJNILIB)
-	$(CXX) $(CXXFLAGS) -I./java/. $(JAVA_INCLUDE) -shared -fPIC \
+	$(CXX) $(CXXFLAGS) -I./java/target/generated-sources/jni -I./java/rocksjni $(JAVA_INCLUDE) -shared -fPIC \
 	  -o $(JAVA_NATIVE_DIR)/$(ROCKSDBJNILIB) $(ALL_JNI_NATIVE_SOURCES) \
 	  $(LIB_OBJECTS) $(COVERAGEFLAGS) \
 	  $(JAVA_COMPRESSIONS) $(JAVA_STATIC_LDFLAGS)
@@ -2403,7 +2403,7 @@ ifeq ($(JAVA_HOME),)
 endif
 	$(AM_V_GEN)cd java; $(MAKE) javalib;
 	$(AM_V_at)rm -f ./$(JAVA_NATIVE_DIR)/$(ROCKSDBJNILIB)
-	$(AM_V_at)$(CXX) $(CXXFLAGS) -I./java/. -I./java/rocksjni $(JAVA_INCLUDE) $(ROCKSDB_PLUGIN_JNI_CXX_INCLUDEFLAGS) -shared -fPIC -o ./$(JAVA_NATIVE_DIR)/$(ROCKSDBJNILIB) $(ALL_JNI_NATIVE_SOURCES) $(LIB_OBJECTS) $(JAVA_LDFLAGS) $(COVERAGEFLAGS)
+	$(AM_V_at)$(CXX) $(CXXFLAGS) -I./java/target/generated-sources/jni -I./java/rocksjni $(JAVA_INCLUDE) $(ROCKSDB_PLUGIN_JNI_CXX_INCLUDEFLAGS) -shared -fPIC -o ./$(JAVA_NATIVE_DIR)/$(ROCKSDBJNILIB) $(ALL_JNI_NATIVE_SOURCES) $(LIB_OBJECTS) $(JAVA_LDFLAGS) $(COVERAGEFLAGS)
 	$(AM_V_at)cd java; $(MAVEN_CMD) package -DskipTests
 
 jclean: rocksdbjavageneratepom