You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@impala.apache.org by st...@apache.org on 2024/06/16 22:36:44 UTC

(impala) branch branch-3.4.2 updated (8c53f574d -> cbb6fa1cf)

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

stigahuang pushed a change to branch branch-3.4.2
in repository https://gitbox.apache.org/repos/asf/impala.git


    from 8c53f574d Update GIT_HASH for version 3.4.2
     new dd62dd98b IMPALA-11648: validate-java-pom-versions.sh should skip pom.xml in toolchain
     new cbb6fa1cf Update GIT_HASH for version 3.4.2

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 bin/save-version.sh               | 2 +-
 bin/validate-java-pom-versions.sh | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)


(impala) 01/02: IMPALA-11648: validate-java-pom-versions.sh should skip pom.xml in toolchain

Posted by st...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

stigahuang pushed a commit to branch branch-3.4.2
in repository https://gitbox.apache.org/repos/asf/impala.git

commit dd62dd98b90f114cc0b1fbbce966a7194f30971a
Author: stiga-huang <hu...@gmail.com>
AuthorDate: Tue Oct 11 10:25:56 2022 +0800

    IMPALA-11648: validate-java-pom-versions.sh should skip pom.xml in toolchain
    
    bin/validate-java-pom-versions.sh validates the pom.xml files have
    consistent version strings. However, it checks all files in IMPALA_HOME
    when building from the tarball. There are some pom.xml files in the
    toolchain directory that should be skipped.
    
    This patch modifies the find command used in the script from
      find ${IMPALA_HOME} -name pom.xml
    to
      find ${IMPALA_HOME} -path ${IMPALA_TOOLCHAIN} -prune -o -name pom.xml -print
    to list pom.xml files excluding the toolchain directory. More examples
    about how to use `find -prune` can be found in this blog:
    https://www.theunixschool.com/2012/07/find-command-15-examples-to-exclude.html
    
    Tests:
     - Built from the tarball locally
     - Modified version strings in some pom.xml files and verified
       validate-java-pom-versions.sh is still able to find them.
    
    Change-Id: I55bbd9c85ab0e4a7c054ee2abd70eae0f55c8a01
    Reviewed-on: http://gerrit.cloudera.org:8080/19122
    Reviewed-by: Daniel Becker <da...@cloudera.com>
    Tested-by: Impala Public Jenkins <im...@cloudera.com>
---
 bin/validate-java-pom-versions.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/bin/validate-java-pom-versions.sh b/bin/validate-java-pom-versions.sh
index a996eb666..041601b1d 100755
--- a/bin/validate-java-pom-versions.sh
+++ b/bin/validate-java-pom-versions.sh
@@ -38,11 +38,12 @@ popd > /dev/null 2>&1
 
 RETVAL=0
 NO_MATCH_FILES=()
-for pom_file in $(find ${IMPALA_HOME} -name pom.xml); do
+for pom_file in $(find ${IMPALA_HOME} -path ${IMPALA_TOOLCHAIN} -prune \
+    -o -name pom.xml -print); do
   # If this is a git checkout, then only do the check for pom.xml
   # files known to git. If this is not a git checkout, then it should
   # be building from a tarball, and there should not be extra
-  # pom.xml files.
+  # pom.xml files except in the toolchain folder.
   if ${IS_GIT_CHECKOUT} &&
      ! git ls-files --error-unmatch ${pom_file} > /dev/null 2>&1 ; then
     # This pom.xml file is not known to git.


(impala) 02/02: Update GIT_HASH for version 3.4.2

Posted by st...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

stigahuang pushed a commit to branch branch-3.4.2
in repository https://gitbox.apache.org/repos/asf/impala.git

commit cbb6fa1cf2de5007751628677380a51f70052b53
Author: stiga-huang <hu...@gmail.com>
AuthorDate: Mon Jun 17 06:18:42 2024 +0800

    Update GIT_HASH for version 3.4.2
    
    Change-Id: I354685e72a8835abbf2e102b7c8192416324a394
---
 bin/save-version.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/save-version.sh b/bin/save-version.sh
index f98baf8dc..8515863b8 100755
--- a/bin/save-version.sh
+++ b/bin/save-version.sh
@@ -22,7 +22,7 @@
 # "-INTERNAL" appended. Parts of the code will look for this to distinguish
 # between released and internal versions.
 VERSION=${IMPALA_VERSION}
-GIT_HASH=a5e5aa16d887faedee4eea1bc809fba41d758f5b
+GIT_HASH=dd62dd98b90f114cc0b1fbbce966a7194f30971a
 if [ -z $GIT_HASH ]
 then
   GIT_HASH="Could not obtain git hash"