[netty] 01/07: Build the netty-transport-native-epoll module

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository netty.

commit 235eec64520abfd034e100b4787925442fc5d74b
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Aug 2 13:45:44 2016 +0200

    Build the netty-transport-native-epoll module
---
 debian/changelog                                   |  1 +
 debian/libnetty-java.poms                          |  2 +-
 debian/maven.ignoreRules                           |  2 +-
 debian/maven.rules                                 |  1 +
 debian/patches/06-remove-tcnative-classifier.patch | 10 +++++
 debian/patches/07-netty-all-epoll-dependency.patch | 45 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 7 files changed, 60 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c796bed..e394b38 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 netty (1:4.0.37-2) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Build the netty-transport-native-epoll module
   * Removed the unused dependency on libbcel-java
 
  -- Emmanuel Bourg <ebourg at apache.org>  Sun, 19 Jun 2016 23:25:58 +0200
diff --git a/debian/libnetty-java.poms b/debian/libnetty-java.poms
index 41f7917..0b07754 100644
--- a/debian/libnetty-java.poms
+++ b/debian/libnetty-java.poms
@@ -26,7 +26,6 @@
 #     Empty by default. [mh_install]
 #
 pom.xml --no-parent --has-package-version
-transport-native-epoll/pom.xml --ignore
 common/pom.xml --has-package-version
 buffer/pom.xml --has-package-version
 codec/pom.xml --has-package-version
@@ -34,6 +33,7 @@ codec-haproxy/pom.xml --has-package-version
 codec-http/pom.xml --has-package-version
 codec-socks/pom.xml --has-package-version
 transport/pom.xml --has-package-version
+transport-native-epoll/pom.xml --has-package-version
 transport-rxtx/pom.xml --ignore
 transport-sctp/pom.xml --has-package-version
 transport-udt/pom.xml --ignore
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 032e963..f357525 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -67,6 +67,6 @@ org.jboss.marshalling jboss-marshalling * * * *
 # Missing modules referenced by netty-all
 io.netty netty-build * * * *
 io.netty netty-example * * * *
-io.netty netty-transport-native-epoll * * * *
+io.netty netty-testsuite * * * *
 io.netty netty-transport-rxtx * * * *
 io.netty netty-transport-udt * * * *
diff --git a/debian/maven.rules b/debian/maven.rules
index e6a3381..2ae8444 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -23,6 +23,7 @@ org.apache.maven.scm maven-scm-api jar s/.*/debian/ * *
 org.apache.maven.scm maven-scm-provider-gitexe jar s/.*/debian/ * *
 commons-logging s/commons-logging-api/commons-logging/ * s/.*/debian/ * *
 io.netty s/\$\{tcnative.artifactId\}/netty-tcnative/ * s/.*/debian/ s/.*// *
+s/\$\{project.groupId\}/io.netty/ s/\$\{tcnative.artifactId\}/netty-tcnative/ * s/.*/debian/ * *
 s/jboss/javassist/ javassist * s/.*/debian/ * *
 log4j log4j * s/1\.2\..*/1.2.x/ * *
 org.bouncycastle s/bcpkix-jdk15on/bcpkix/ * s/.*/debian/ * *
diff --git a/debian/patches/06-remove-tcnative-classifier.patch b/debian/patches/06-remove-tcnative-classifier.patch
index 67c4a24..648a0e0 100644
--- a/debian/patches/06-remove-tcnative-classifier.patch
+++ b/debian/patches/06-remove-tcnative-classifier.patch
@@ -22,3 +22,13 @@ Forwarded: not-needed
        <optional>true</optional>
      </dependency>
      <dependency>
+--- a/transport-native-epoll/pom.xml
++++ b/transport-native-epoll/pom.xml
+@@ -51,7 +51,6 @@
+     <dependency>
+       <groupId>${project.groupId}</groupId>
+       <artifactId>${tcnative.artifactId}</artifactId>
+-      <classifier>${tcnative.classifier}</classifier>
+       <scope>test</scope>
+     </dependency>
+   </dependencies>
diff --git a/debian/patches/07-netty-all-epoll-dependency.patch b/debian/patches/07-netty-all-epoll-dependency.patch
new file mode 100644
index 0000000..702956d
--- /dev/null
+++ b/debian/patches/07-netty-all-epoll-dependency.patch
@@ -0,0 +1,45 @@
+Description: Moves the netty-transport-native-epoll out of the profiles
+ since it doesn't work with Gradle (required for the projectreactor package)
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/all/pom.xml
++++ b/all/pom.xml
+@@ -81,25 +81,6 @@
+         </plugins>
+       </build>
+     </profile>
+-    <profile>
+-      <id>linux</id>
+-      <activation>
+-        <os>
+-          <family>linux</family>
+-        </os>
+-      </activation>
+-      <dependencies>
+-        <!-- All release modules -->
+-        <dependency>
+-          <groupId>${project.groupId}</groupId>
+-          <artifactId>netty-transport-native-epoll</artifactId>
+-          <version>${project.version}</version>
+-          <classifier>${epoll.classifier}</classifier>
+-          <scope>compile</scope>
+-          <optional>true</optional>
+-        </dependency>
+-      </dependencies>
+-    </profile>
+   </profiles>
+ 
+   <dependencies>
+@@ -107,6 +88,12 @@
+     <!-- All release modules -->
+     <dependency>
+       <groupId>${project.groupId}</groupId>
++      <artifactId>netty-transport-native-epoll</artifactId>
++      <version>${project.version}</version>
++      <scope>compile</scope>
++    </dependency>
++    <dependency>
++      <groupId>${project.groupId}</groupId>
+       <artifactId>netty-buffer</artifactId>
+       <version>${project.version}</version>
+       <scope>compile</scope>
diff --git a/debian/patches/series b/debian/patches/series
index f45cc65..d74c289 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 04-netty-all-light.patch
 05-reproducible-versions-properties.patch
 06-remove-tcnative-classifier.patch
+07-netty-all-epoll-dependency.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/netty.git