diff --git a/pom.xml b/pom.xml index dd76cc2d42..7263f5a04d 100644 --- a/pom.xml +++ b/pom.xml @@ -452,6 +452,14 @@ + + io.netty + netty-jni-util + 0.0.2.Final + sources + true + + ${project.groupId} netty-dev-tools diff --git a/transport-native-unix-common/Makefile b/transport-native-unix-common/Makefile index 3d358a33ed..1bffba9ae4 100644 --- a/transport-native-unix-common/Makefile +++ b/transport-native-unix-common/Makefile @@ -24,7 +24,7 @@ SRC_DIR = src/main/c SRC_INTERNAL_DIR = src/main/c/internal -UTIL_SRC_DIR = target/netty-jni-util/src/c +UTIL_SRC_DIR = target/netty-jni-util JNI_INCLUDE_DIR = $(JAVA_HOME)/include JNI_INCLUDES = -I$(JNI_INCLUDE_DIR) -I$(JNI_INCLUDE_DIR)/$(JNI_PLATFORM) LIB = $(LIB_DIR)/$(LIB_NAME).a diff --git a/transport-native-unix-common/pom.xml b/transport-native-unix-common/pom.xml index 7cfe7650b7..f2a6b84449 100644 --- a/transport-native-unix-common/pom.xml +++ b/transport-native-unix-common/pom.xml @@ -37,8 +37,7 @@ ar libnetty-unix-common ${project.basedir}/src/main/c - ${project.build.directory}/netty-jni-util - ${project.build.directory}/netty-jni-util/src/c + ${project.build.directory}/netty-jni-util/ ${project.build.directory}/native-jar-work ${project.build.directory}/native-objs-only ${project.build.directory}/native-lib-only @@ -53,30 +52,30 @@ - - maven-scm-plugin - 1.11.2 + org.apache.maven.plugins + maven-dependency-plugin + - get-netty-jni-util + unpack generate-sources - checkout + unpack-dependencies - ${jniUtilCheckoutDir} - developerConnection - scm:git:https://github.com/netty/netty-jni-util.git - 0.0.1 - tag - true + io.netty + netty-jni-util + sources + ${jniUtilIncludeDir} + **.h,**.c + false + true - org.codehaus.mojo @@ -289,6 +288,12 @@ + + io.netty + netty-jni-util + sources + true + io.netty netty-common