Use netty-jni-util via maven central (#10877)
Motivation: netty-jni-util is now also hosted on maven central. Let's use it Modifications: Adjust plugins to just unpack netty-jni-util and use it Result: Be able to use what is in the maven cache for netty-jni-util
This commit is contained in:
parent
6a057338ee
commit
c4a07aee40
8
pom.xml
8
pom.xml
@ -404,6 +404,14 @@
|
||||
|
||||
<dependencyManagement>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>io.netty</groupId>
|
||||
<artifactId>netty-jni-util</artifactId>
|
||||
<version>0.0.2.Final</version>
|
||||
<classifier>sources</classifier>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>${project.groupId}</groupId>
|
||||
<artifactId>netty-dev-tools</artifactId>
|
||||
|
@ -23,7 +23,8 @@
|
||||
# LIB_NAME - the name of the native library
|
||||
|
||||
SRC_DIR = src/main/c
|
||||
UTIL_SRC_DIR = target/netty-jni-util/src/c
|
||||
SRC_INTERNAL_DIR = src/main/c/internal
|
||||
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
|
||||
|
@ -37,8 +37,7 @@
|
||||
<exe.archiver>ar</exe.archiver>
|
||||
<nativeLibName>libnetty-unix-common</nativeLibName>
|
||||
<nativeIncludeDir>${project.basedir}/src/main/c</nativeIncludeDir>
|
||||
<jniUtilCheckoutDir>${project.build.directory}/netty-jni-util</jniUtilCheckoutDir>
|
||||
<jniUtilIncludeDir>${project.build.directory}/netty-jni-util/src/c</jniUtilIncludeDir>
|
||||
<jniUtilIncludeDir>${project.build.directory}/netty-jni-util/</jniUtilIncludeDir>
|
||||
<nativeJarWorkdir>${project.build.directory}/native-jar-work</nativeJarWorkdir>
|
||||
<nativeObjsOnlyDir>${project.build.directory}/native-objs-only</nativeObjsOnlyDir>
|
||||
<nativeLibOnlyDir>${project.build.directory}/native-lib-only</nativeLibOnlyDir>
|
||||
@ -48,30 +47,30 @@
|
||||
|
||||
<build>
|
||||
<plugins>
|
||||
<!-- Download the netty-jni-util source -->
|
||||
<plugin>
|
||||
<artifactId>maven-scm-plugin</artifactId>
|
||||
<version>1.11.2</version>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-dependency-plugin</artifactId>
|
||||
<executions>
|
||||
<!-- unpack netty-jni-util files -->
|
||||
<execution>
|
||||
<id>get-netty-jni-util</id>
|
||||
<id>unpack</id>
|
||||
<phase>generate-sources</phase>
|
||||
<goals>
|
||||
<goal>checkout</goal>
|
||||
<goal>unpack-dependencies</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<checkoutDirectory>${jniUtilCheckoutDir}</checkoutDirectory>
|
||||
<connectionType>developerConnection</connectionType>
|
||||
<developerConnectionUrl>scm:git:https://github.com/netty/netty-jni-util.git</developerConnectionUrl>
|
||||
<scmVersion>0.0.1</scmVersion>
|
||||
<scmVersionType>tag</scmVersionType>
|
||||
<skipCheckoutIfExists>true</skipCheckoutIfExists>
|
||||
<includeGroupIds>io.netty</includeGroupIds>
|
||||
<includeArtifactIds>netty-jni-util</includeArtifactIds>
|
||||
<classifier>sources</classifier>
|
||||
<outputDirectory>${jniUtilIncludeDir}</outputDirectory>
|
||||
<includes>**.h,**.c</includes>
|
||||
<overWriteReleases>false</overWriteReleases>
|
||||
<overWriteSnapshots>true</overWriteSnapshots>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
|
||||
|
||||
<!-- Also include c files in source jar -->
|
||||
<plugin>
|
||||
<groupId>org.codehaus.mojo</groupId>
|
||||
@ -462,6 +461,12 @@
|
||||
</profiles>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>io.netty</groupId>
|
||||
<artifactId>netty-jni-util</artifactId>
|
||||
<classifier>sources</classifier>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.netty</groupId>
|
||||
<artifactId>netty-common</artifactId>
|
||||
|
Loading…
Reference in New Issue
Block a user