From 9a0f8e8d412c59daaeb1c1b86af2f06a70c81e87 Mon Sep 17 00:00:00 2001
From: Trustin Lee <t@motd.kr>
Date: Thu, 22 May 2014 19:11:01 +0900
Subject: [PATCH] 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.
---
 all/pom.xml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/all/pom.xml b/all/pom.xml
index d1cde9da9c..c0e103195d 100644
--- a/all/pom.xml
+++ b/all/pom.xml
@@ -31,7 +31,7 @@
   <properties>
     <quickbuild>true</quickbuild>
     <generatedSourceDir>${project.build.directory}/src</generatedSourceDir>
-    <dependencyVersionDir>${project.build.directory}/versions</dependencyVersionDir>
+    <dependencyVersionsDir>${project.build.directory}/versions</dependencyVersionsDir>
   </properties>
 
   <profiles>
@@ -249,7 +249,7 @@
             </goals>
             <configuration>
               <classifier>sources</classifier>
-              <includes>io/netty/**,META-INF/native/**</includes>
+              <includes>io/netty/**</includes>
               <includeGroupIds>${project.groupId}</includeGroupIds>
               <outputDirectory>${generatedSourceDir}</outputDirectory>
             </configuration>
@@ -263,8 +263,9 @@
               <goal>unpack-dependencies</goal>
             </goals>
             <configuration>
+              <excludes>io/netty/example/**,META-INF/native/libnetty-tcnative*</excludes>
               <includes>io/netty/**,META-INF/native/**</includes>
-              <excludes>io/netty/example/**</excludes>
+              <includeGroupIds>${project.groupId}</includeGroupIds>
               <outputDirectory>${project.build.outputDirectory}</outputDirectory>
             </configuration>
           </execution>
@@ -316,7 +317,7 @@
             <configuration>
               <target>
                 <delete dir="${generatedSourceDir}" quiet="true" />
-                <delete dir="${dependencyVersionDir}" quiet="true" />
+                <delete dir="${dependencyVersionsDir}" quiet="true" />
                 <delete dir="${project.build.outputDirectory}" quiet="true" />
               </target>
             </configuration>