Fix packagine issues in all-in-one JAR
Motivation: - dependencyVersionsDir property is not resolved during the build process. The build doesn't fail because of this, but it creates an ugly directory. - All-in-one JAR contains libnetty-tcnative.so, which is not part of the all-in-one JAR. Modifications: - Fix an incorrect property name (dependencyVersionDir -> dependencyVersionsDir) - Exclude libnetty-tcnative.so - Remove unnecessary includes in source expanding configuration Result: - Cleaner pom.xml - We do not ship libnetty-tcnative.so in all-in-one JAR anymore, which is correct, because strictly speaking the native library belongs to org.apache.tomcat.jni package.
This commit is contained in:
parent
37931306d5
commit
60a83fc6ac
@ -31,7 +31,7 @@
|
|||||||
<properties>
|
<properties>
|
||||||
<quickbuild>true</quickbuild>
|
<quickbuild>true</quickbuild>
|
||||||
<generatedSourceDir>${project.build.directory}/src</generatedSourceDir>
|
<generatedSourceDir>${project.build.directory}/src</generatedSourceDir>
|
||||||
<dependencyVersionDir>${project.build.directory}/versions</dependencyVersionDir>
|
<dependencyVersionsDir>${project.build.directory}/versions</dependencyVersionsDir>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<profiles>
|
<profiles>
|
||||||
@ -256,7 +256,7 @@
|
|||||||
</goals>
|
</goals>
|
||||||
<configuration>
|
<configuration>
|
||||||
<classifier>sources</classifier>
|
<classifier>sources</classifier>
|
||||||
<includes>io/netty/**,META-INF/native/**</includes>
|
<includes>io/netty/**</includes>
|
||||||
<includeGroupIds>${project.groupId}</includeGroupIds>
|
<includeGroupIds>${project.groupId}</includeGroupIds>
|
||||||
<outputDirectory>${generatedSourceDir}</outputDirectory>
|
<outputDirectory>${generatedSourceDir}</outputDirectory>
|
||||||
</configuration>
|
</configuration>
|
||||||
@ -270,8 +270,9 @@
|
|||||||
<goal>unpack-dependencies</goal>
|
<goal>unpack-dependencies</goal>
|
||||||
</goals>
|
</goals>
|
||||||
<configuration>
|
<configuration>
|
||||||
|
<excludes>io/netty/example/**,META-INF/native/libnetty-tcnative*</excludes>
|
||||||
<includes>io/netty/**,META-INF/native/**</includes>
|
<includes>io/netty/**,META-INF/native/**</includes>
|
||||||
<excludes>io/netty/example/**</excludes>
|
<includeGroupIds>${project.groupId}</includeGroupIds>
|
||||||
<outputDirectory>${project.build.outputDirectory}</outputDirectory>
|
<outputDirectory>${project.build.outputDirectory}</outputDirectory>
|
||||||
</configuration>
|
</configuration>
|
||||||
</execution>
|
</execution>
|
||||||
@ -323,7 +324,7 @@
|
|||||||
<configuration>
|
<configuration>
|
||||||
<target>
|
<target>
|
||||||
<delete dir="${generatedSourceDir}" quiet="true" />
|
<delete dir="${generatedSourceDir}" quiet="true" />
|
||||||
<delete dir="${dependencyVersionDir}" quiet="true" />
|
<delete dir="${dependencyVersionsDir}" quiet="true" />
|
||||||
<delete dir="${project.build.outputDirectory}" quiet="true" />
|
<delete dir="${project.build.outputDirectory}" quiet="true" />
|
||||||
</target>
|
</target>
|
||||||
</configuration>
|
</configuration>
|
||||||
|
Loading…
Reference in New Issue
Block a user