[netty] 06/07: Disabled lz4, lzma and protobuf nano support due to missing dependencies

[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 f477db7cd1d2f1da091877deb96a7a7f51a3efce
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Jan 16 09:11:42 2017 +0100

    Disabled lz4, lzma and protobuf nano support due to missing dependencies
---
 debian/changelog                             |  1 +
 debian/maven.ignoreRules                     |  5 +++++
 debian/patches/09-ignore-lz4.patch           | 13 +++++++++++++
 debian/patches/10-ignore-lzma.patch          | 13 +++++++++++++
 debian/patches/11-ignore-protobuf-nano.patch | 23 +++++++++++++++++++++++
 debian/patches/series                        |  3 +++
 6 files changed, 58 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index efb12e2..9fef16e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ netty (1:4.1.7-1) UNRELEASED; urgency=medium
     - New dependency: groovy, libgoogle-gson-java
     - Adapted codegen.groovy to run without the groovy-maven-plugin
     - Ignore the new test dependencies
+    - Disabled lz4, lzma and protobuf nano support due to missing dependencies
 
  -- Emmanuel Bourg <ebourg at apache.org>  Mon, 16 Jan 2017 02:08:28 +0100
 
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index c6dfcb8..77bc961 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -30,6 +30,11 @@ org.codehaus.gmaven groovy-maven-plugin * * * *
 org.codehaus.mojo animal-sniffer-maven-plugin * * * *
 org.codehaus.mojo xml-maven-plugin * * * *
 
+# Missing optional dependencies
+net.jpountz.lz4 lz4 * * * *
+com.google.protobuf.nano protobuf-javanano * * * *
+com.github.jponge lzma-java * * * *
+
 # No tests
 ch.qos.logback logback-classic * * * *
 com.google.caliper caliper * * * *
diff --git a/debian/patches/09-ignore-lz4.patch b/debian/patches/09-ignore-lz4.patch
new file mode 100644
index 0000000..ef1468b
--- /dev/null
+++ b/debian/patches/09-ignore-lz4.patch
@@ -0,0 +1,13 @@
+Description: Disables lz4 support (missing dependency)
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/codec/pom.xml
++++ b/codec/pom.xml
+@@ -98,6 +98,7 @@
+         <configuration>
+           <excludes>
+             <exclude>**/marshalling/*.java</exclude>
++            <exclude>**/compression/Lz4*.java</exclude>
+           </excludes>
+         </configuration>
+       </plugin>
diff --git a/debian/patches/10-ignore-lzma.patch b/debian/patches/10-ignore-lzma.patch
new file mode 100644
index 0000000..dd38159
--- /dev/null
+++ b/debian/patches/10-ignore-lzma.patch
@@ -0,0 +1,13 @@
+Description: Disables lzma support (missing dependency)
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/codec/pom.xml
++++ b/codec/pom.xml
+@@ -99,6 +99,7 @@
+           <excludes>
+             <exclude>**/marshalling/*.java</exclude>
+             <exclude>**/compression/Lz4*.java</exclude>
++            <exclude>**/compression/Lzma*.java</exclude>
+           </excludes>
+         </configuration>
+       </plugin>
diff --git a/debian/patches/11-ignore-protobuf-nano.patch b/debian/patches/11-ignore-protobuf-nano.patch
new file mode 100644
index 0000000..188dc0b
--- /dev/null
+++ b/debian/patches/11-ignore-protobuf-nano.patch
@@ -0,0 +1,23 @@
+Description: Disables protobuf nano support (missing dependency)
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/codec/pom.xml
++++ b/codec/pom.xml
+@@ -100,6 +100,7 @@
+             <exclude>**/marshalling/*.java</exclude>
+             <exclude>**/compression/Lz4*.java</exclude>
+             <exclude>**/compression/Lzma*.java</exclude>
++            <exclude>**/Protobuf*Nano.java</exclude>
+           </excludes>
+         </configuration>
+       </plugin>
+--- a/codec/src/main/java/io/netty/handler/codec/protobuf/ProtobufVarint32FrameDecoder.java
++++ b/codec/src/main/java/io/netty/handler/codec/protobuf/ProtobufVarint32FrameDecoder.java
+@@ -16,7 +16,6 @@
+ package io.netty.handler.codec.protobuf;
+ 
+ import com.google.protobuf.CodedInputStream;
+-import com.google.protobuf.nano.CodedInputByteBufferNano;
+ import io.netty.buffer.ByteBuf;
+ import io.netty.channel.ChannelHandlerContext;
+ import io.netty.handler.codec.ByteToMessageDecoder;
diff --git a/debian/patches/series b/debian/patches/series
index 9617277..ba518a3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,6 @@
 06-remove-tcnative-classifier.patch
 07-netty-all-epoll-dependency.patch
 08-codegen-without-groovy-plugin.patch
+09-ignore-lz4.patch
+10-ignore-lzma.patch
+11-ignore-protobuf-nano.patch

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