zookeeper-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From an...@apache.org
Subject [zookeeper] branch branch-3.5 updated: Fix for lincense files and contrib folder during release
Date Wed, 27 Feb 2019 11:30:27 GMT
This is an automated email from the ASF dual-hosted git repository.

andor pushed a commit to branch branch-3.5
in repository https://gitbox.apache.org/repos/asf/zookeeper.git


The following commit(s) were added to refs/heads/branch-3.5 by this push:
     new ffde45a  Fix for lincense files and contrib folder during release
ffde45a is described below

commit ffde45a7dccfd3e60a9509b5a97804cf7fc2aa29
Author: Andor Molnar <andor@apache.org>
AuthorDate: Wed Feb 27 12:30:08 2019 +0100

    Fix for lincense files and contrib folder during release
    
    This patch fixes the following issues that have been experiences in 3.4.14-rc3:
    - JLine license file is missing,
    - jsr305 jar files is included in the release, but should be excluded,
    
    This is going to backported to 3.5 and 3.4 branches too.
    
    Author: Andor Molnar <andor@apache.org>
    
    Reviewers: andor@apache.org
    
    Closes #835 from anmolnar/fix_license_contrib_master and squashes the following commits:
    
    bbe600f32 [Andor Molnar] jline-0.9.94 is not needed on master
    206a5603a [Andor Molnar] Fix for lincese files and contrib folder during release
    
    (cherry picked from commit 879c513a8d58ebbaa37342c532ec220ee1ab3939)
    Signed-off-by: Andor Molnar <andor@apache.org>
---
 build.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index d5e40e6..98f76c8 100644
--- a/build.xml
+++ b/build.xml
@@ -792,7 +792,9 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
         <fileset dir="${lib.dir}">
           <exclude name="**/ivy*.jar" />
         </fileset>
-        <fileset dir="${ivy.lib}"/>
+        <fileset dir="${ivy.lib}">
+          <exclude name="**/jsr305*.jar" />
+        </fileset>
       </copy>
 
       <subant target="package">


Mime
View raw message