From a74c6b4692b690332b25b4c7e4311c014054cee4 Mon Sep 17 00:00:00 2001
From: Trustin Lee <t@motd.kr>
Date: Sat, 3 May 2014 17:28:28 +0900
Subject: [PATCH] Generate the default JAR to make oss.sonatype.org happy

Motivation:

oss.sonatype.org refuses to promote an artifact if it doesn't have the
default JAR (the JAR without classifier.)

Modifications:

- Generate both the default JAR and the native JAR to make
  oss.sonatype.org happy
- Rename the profile 'release' to 'restricted-release' which reflects
  what it really does better
- Remove the redundant <quickbuild>true</quickbuild> in all/pom.xml
  We specify the profile 'full' that triggers that property already
  in maven-release-plugin configuration.

Result:

oss.sonatype.org is happy.  Simpler pom.xml
---
 all/pom.xml                    |  6 ------
 pom.xml                        |  4 ++--
 transport-native-epoll/pom.xml | 25 +++++++++++++++++++++----
 3 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/all/pom.xml b/all/pom.xml
index be96713833..8e1a192ef5 100644
--- a/all/pom.xml
+++ b/all/pom.xml
@@ -41,12 +41,6 @@
         <quickbuild>false</quickbuild>
       </properties>
     </profile>
-    <profile>
-      <id>release</id>
-      <properties>
-        <quickbuild>false</quickbuild>
-      </properties>
-    </profile>
     <profile>
       <id>coverage</id>
       <build>
diff --git a/pom.xml b/pom.xml
index 235e600f70..491593b396 100644
--- a/pom.xml
+++ b/pom.xml
@@ -142,7 +142,7 @@
            will not run on older distributions.
     -->
     <profile>
-      <id>release</id>
+      <id>restricted-release</id>
       <build>
         <plugins>
           <plugin>
@@ -626,7 +626,7 @@
         <version>2.4.2</version>
         <configuration>
           <useReleaseProfile>false</useReleaseProfile>
-          <arguments>-P release,sonatype-oss-release,full</arguments>
+          <arguments>-P restricted-release,sonatype-oss-release,full</arguments>
           <autoVersionSubmodules>true</autoVersionSubmodules>
           <allowTimestampedSnapshots>false</allowTimestampedSnapshots>
           <tagNameFormat>netty-@{project.version}</tagNameFormat>
diff --git a/transport-native-epoll/pom.xml b/transport-native-epoll/pom.xml
index 3903b5722a..ec0e51187b 100644
--- a/transport-native-epoll/pom.xml
+++ b/transport-native-epoll/pom.xml
@@ -82,12 +82,29 @@
         </executions>
       </plugin>
 
-      <!-- Because the generated JAR is platform dependent, use the platform as a classifier. -->
       <plugin>
         <artifactId>maven-jar-plugin</artifactId>
-        <configuration>
-          <classifier>${os.detected.classifier}</classifier>
-        </configuration>
+        <executions>
+          <!-- Generate the fallback JAR that does not contain the native library. -->
+          <execution>
+            <id>default-jar</id>
+            <configuration>
+              <excludes>
+                <exclude>META-INF/native/**</exclude>
+              </excludes>
+            </configuration>
+          </execution>
+          <!-- Generate the JAR that contains the native library in it. -->
+          <execution>
+            <id>native-jar</id>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+            <configuration>
+              <classifier>${os.detected.classifier}</classifier>
+            </configuration>
+          </execution>
+        </executions>
       </plugin>
     </plugins>
   </build>