zookeeper-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nkal...@apache.org
Subject [zookeeper] branch branch-3.5 updated: ZOOKEEPER-3727: Fix 3.5 source tarball to represent the git repository
Date Mon, 04 May 2020 12:13:05 GMT
This is an automated email from the ASF dual-hosted git repository.

nkalmar 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 2b85b9b  ZOOKEEPER-3727: Fix 3.5 source tarball to represent the git repository
2b85b9b is described below

commit 2b85b9bd1644660b70d33b46b1b891359dfdd101
Author: Mate Szalay-Beko <symat@apache.org>
AuthorDate: Mon May 4 14:12:57 2020 +0200

    ZOOKEEPER-3727: Fix 3.5 source tarball to represent the git repository
    
    Comparing the 3.5 source tarball with the freshly cloned branch-3.5,
    we see the following differences:
    
    ```
    diff --brief --recursive ./tarball/ ./cloned/
    
    Only in ./cloned: .git
    Only in ./cloned: .gitattributes
    Only in ./cloned: .gitignore
    Only in ./cloned: checkstyle.xml
    Only in ./tarball/zookeeper-server/src/main/java/org/apache/zookeeper/version: Info.java
    Only in ./tarball/zookeeper-server/src/main/resources: git.properties
    ```
    
    I added the `checkstyle.xml`, as it was missing due to a typo.
    
    The git related files / folders are not present in the 3.6 releases either, so I don't
think we
    should change the current behaviour on 3.5.
    
    The `Info.java` and `git.properties` files are generated by the Git-Commit-Id-Plugin during
    the build. We don't have these files generated on the 3.6 / master branches. I would suggest
    to keep them in the source tarball, as users who use the source tarball will not have
the
    git commit info as they didn't clone the repo from git.
    
    Author: Mate Szalay-Beko <symat@apache.org>
    
    Reviewers: Norbert Kalmar <nkalmar@apache.org>
    
    Closes #1344 from symat/ZOOKEEPER-3727
---
 zookeeper-assembly/src/main/assembly/source-package.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zookeeper-assembly/src/main/assembly/source-package.xml b/zookeeper-assembly/src/main/assembly/source-package.xml
index 7140424..2780596 100644
--- a/zookeeper-assembly/src/main/assembly/source-package.xml
+++ b/zookeeper-assembly/src/main/assembly/source-package.xml
@@ -101,7 +101,7 @@
         <include>ivysettings.xml</include>
         <include>excludeFindBugsFilter.xml</include>
         <include>owaspSuppressions.xml</include>
-        <include>checktyle.xml</include>
+        <include>checkstyle.xml</include>
         <include>checkstyleSuppressions.xml</include>
         <include>.travis.yml</include>
       </includes>


Mime
View raw message