[kudu] branch master updated: [build] Fix Netty errors in verify_jars.pl

[gr...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

granthenke pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kudu.git


The following commit(s) were added to refs/heads/master by this push:
     new 4ed0dbb  [build] Fix Netty errors in verify_jars.pl
4ed0dbb is described below

commit 4ed0dbbd1a05cb337a0baebeb4c59de3e7bd5da1
Author: Grant Henke <gr...@apache.org>
AuthorDate: Wed Mar 4 09:12:00 2020 -0600

    [build] Fix Netty errors in verify_jars.pl
    
    This patch updates verify_jars.pl for Netty 4.
    
    When Netty was upgraded the package name changed causing
    verify_jars.pl to reported bad shaded classes & files.
    
    Change-Id: I335119057e0665f09134e526396c4c2080ec4285
    Reviewed-on: http://gerrit.cloudera.org:8080/15361
    Tested-by: Grant Henke <gr...@apache.org>
    Reviewed-by: Alexey Serbin <as...@cloudera.com>
---
 build-support/verify_jars.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build-support/verify_jars.pl b/build-support/verify_jars.pl
index fdb66ae..a1afd73 100755
--- a/build-support/verify_jars.pl
+++ b/build-support/verify_jars.pl
@@ -28,7 +28,7 @@ my $pat_kudu_shaded_prefix = qr{^org/apache/kudu/shaded/};
 
 # Allowed filenames of non-Java files in JARs.
 my $pat_allow_non_java =
-    qr{(?:\.(?:txt|xml|properties|proto|MF)|
+    qr{(?:\.(?:txt|xml|properties|json|proto|MF|jnilib|so|swp)|
           LICENSE|NOTICE|DEPENDENCIES|
           # The kudu-spark DataSourceRegister file.
           DataSourceRegister)$}x;
@@ -42,7 +42,7 @@ my $pat_allow_kudu_shaded =
            org/apache/(?:commons|http)|
            org/checkerframework|
            org/HdrHistogram|
-           org/jboss/netty|
+           io/netty|
            scopt)
       }x;