diff --git a/CMakeLists.txt b/CMakeLists.txt index d420f9c22..ce7c98996 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -104,12 +104,12 @@ foreach(POM_LINE ${POM_FILE}) break() endif() endforeach() -configure_file(src/cpp/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h @ONLY) +configure_file(src/main/cpp/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h @ONLY) -add_library(jssc SHARED src/cpp/${JSSC_PLATFORM}/jssc.cpp) +add_library(jssc SHARED src/main/cpp/${JSSC_PLATFORM}/jssc.cpp) # Fall-back header for when maven is not available -list(APPEND JSSC_ADDITIONAL_INCLUDES src/cpp/) +list(APPEND JSSC_ADDITIONAL_INCLUDES src/main/cpp/) target_include_directories(jssc PRIVATE ${JNI_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ${JSSC_ADDITIONAL_INCLUDES}) set_target_properties(jssc PROPERTIES PUBLIC_HEADER ${CMAKE_CURRENT_BINARY_DIR}/jssc_SerialNativeInterface.h) diff --git a/pom.xml b/pom.xml index 4ce7e0fd5..eefc51715 100644 --- a/pom.xml +++ b/pom.xml @@ -4,9 +4,37 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.github.java-native.jssc + io.github.java-native jssc - 2.9.1 + 2.9.2-SNAPSHOT + + Java Simple Serial Connector + + A small, single Java library for working with serial ports across various systems + based on the work from scream3r/java-simple-serial-connector. + + https://github.com/java-native/jssc + + + + GNU LGPL 3 + http://www.gnu.org/licenses/lgpl.txt + repo + + + + + + Tres Finocchiaro + https://github.com/tresf + + + + + scm:git:https://github.com/java-native/jssc.git + scm:git:git@github.com:java-native/jssc.git + https://github.com/java-native/jssc + 1.6 @@ -46,19 +74,6 @@ 3.8.0 - - Java Native - https://github.com/java-native/ - - - - - GNU LGPL 3 - http://www.gnu.org/licenses/lgpl.txt - repo - - - org.scijava @@ -81,8 +96,6 @@ install - - src/java ${project.basedir}/src/main/resources-precompiled diff --git a/src/cpp/_nix_based/jssc.cpp b/src/main/cpp/_nix_based/jssc.cpp similarity index 100% rename from src/cpp/_nix_based/jssc.cpp rename to src/main/cpp/_nix_based/jssc.cpp diff --git a/src/cpp/jssc_SerialNativeInterface.h b/src/main/cpp/jssc_SerialNativeInterface.h similarity index 100% rename from src/cpp/jssc_SerialNativeInterface.h rename to src/main/cpp/jssc_SerialNativeInterface.h diff --git a/src/cpp/version.h.in b/src/main/cpp/version.h.in similarity index 100% rename from src/cpp/version.h.in rename to src/main/cpp/version.h.in diff --git a/src/cpp/windows/jssc.cpp b/src/main/cpp/windows/jssc.cpp similarity index 100% rename from src/cpp/windows/jssc.cpp rename to src/main/cpp/windows/jssc.cpp diff --git a/src/java/jssc/SerialNativeInterface.java b/src/main/java/jssc/SerialNativeInterface.java similarity index 100% rename from src/java/jssc/SerialNativeInterface.java rename to src/main/java/jssc/SerialNativeInterface.java diff --git a/src/java/jssc/SerialPort.java b/src/main/java/jssc/SerialPort.java similarity index 100% rename from src/java/jssc/SerialPort.java rename to src/main/java/jssc/SerialPort.java diff --git a/src/java/jssc/SerialPortEvent.java b/src/main/java/jssc/SerialPortEvent.java similarity index 100% rename from src/java/jssc/SerialPortEvent.java rename to src/main/java/jssc/SerialPortEvent.java diff --git a/src/java/jssc/SerialPortEventListener.java b/src/main/java/jssc/SerialPortEventListener.java similarity index 100% rename from src/java/jssc/SerialPortEventListener.java rename to src/main/java/jssc/SerialPortEventListener.java diff --git a/src/java/jssc/SerialPortException.java b/src/main/java/jssc/SerialPortException.java similarity index 100% rename from src/java/jssc/SerialPortException.java rename to src/main/java/jssc/SerialPortException.java diff --git a/src/java/jssc/SerialPortList.java b/src/main/java/jssc/SerialPortList.java similarity index 100% rename from src/java/jssc/SerialPortList.java rename to src/main/java/jssc/SerialPortList.java diff --git a/src/java/jssc/SerialPortTimeoutException.java b/src/main/java/jssc/SerialPortTimeoutException.java similarity index 100% rename from src/java/jssc/SerialPortTimeoutException.java rename to src/main/java/jssc/SerialPortTimeoutException.java