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

tisonkun pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/datasketches-java.git


The following commit(s) were added to refs/heads/main by this push:
     new 5ff11f69b Javadoc footer: resolve the abbreviated commit id (#797)
5ff11f69b is described below

commit 5ff11f69b715abf3c499558e906f9a67900c2ace
Author: Lee Rhodes <[email protected]>
AuthorDate: Tue Nov 10 21:39:47 2026 -0800

    Javadoc footer: resolve the abbreviated commit id (#797)
    
    The footer showed a literal ${git.commit.id.abbrev}, and "Foundation.All"
    had no space.
    
    - The git-commit-id plugin's includeOnlyProperties dropped
      git.commit.id.abbrev, so the property was never defined.
    - The plugin produced git.commit.id but not git.commit.id.full, which the
      manifests use. Release builds worked only because
      mvn_clean_install_or_deploy.sh passes -Dgit.commit.id.full.
    
    This sets commitIdGenerationMode to full and keeps git.commit.id.full and
    git.commit.id.abbrev. It puts the footer on one line, and the release
    script also passes -Dgit.commit.id.abbrev (7 characters, or unknown without
    a .git directory).
    
    Co-authored-by: Claude Opus 5.5 <[email protected]>
---
 pom.xml                              | 7 ++++---
 tools/mvn_clean_install_or_deploy.sh | 3 +++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index fce945fcc..6c812beaf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -425,8 +425,7 @@ under the License.
             </archive>
             <bottom>
               <![CDATA[
-                Copyright &#169; {inceptionYear}&#8211;{currentYear} The 
Apache Software Foundation. 
-                All rights reserved. (Commit Time: ${git.commit.time}, Commit: 
${git.commit.id.abbrev})
+                Copyright &#169; {inceptionYear}&#8211;{currentYear} The 
Apache Software Foundation. All rights reserved. (Commit Time: 
${git.commit.time}, Commit: ${git.commit.id.abbrev})
               ]]>
             </bottom>
           </configuration>
@@ -576,11 +575,13 @@ under the License.
           <configuration>
             <!-- Maven commands are sometimes run on the release artifact 
directly, which is not a Git repository -->
             <failOnNoGitDirectory>false</failOnNoGitDirectory>
+            <commitIdGenerationMode>full</commitIdGenerationMode>
             <generateGitPropertiesFile>true</generateGitPropertiesFile>
             
<generateGitPropertiesFilename>${project.basedir}/git.properties</generateGitPropertiesFilename>
             <includeOnlyProperties>
               <includeOnlyProperty>^git\.branch$</includeOnlyProperty>
-              <includeOnlyProperty>^git\.commit\.id$</includeOnlyProperty>
+              
<includeOnlyProperty>^git\.commit\.id\.full$</includeOnlyProperty>
+              
<includeOnlyProperty>^git\.commit\.id\.abbrev$</includeOnlyProperty>
               <includeOnlyProperty>^git\.commit\.time$</includeOnlyProperty>
               
<includeOnlyProperty>^git\.build\.user\.email$</includeOnlyProperty>
             </includeOnlyProperties>
diff --git a/tools/mvn_clean_install_or_deploy.sh 
b/tools/mvn_clean_install_or_deploy.sh
index f311acea4..be7593817 100755
--- a/tools/mvn_clean_install_or_deploy.sh
+++ b/tools/mvn_clean_install_or_deploy.sh
@@ -24,12 +24,14 @@ if git rev-parse --is-inside-work-tree >/dev/null 2>&1; then
   [ "$BRANCH" = "HEAD" ] && BRANCH=$(git name-rev --name-only HEAD 2>/dev/null)
 
   COMMIT=$(git rev-parse HEAD 2>/dev/null || echo "unknown")
+  ABBREV=$(git rev-parse --short=7 HEAD 2>/dev/null || echo "unknown")
   TIME=$(git log -1 --format=%cI 2>/dev/null || echo "unknown")
   EMAIL=$(git config user.email 2>/dev/null)
   [ -z "$EMAIL" ] && EMAIL="unknown"
 else
   BRANCH="source-release-no-git"
   COMMIT="unknown"
+  ABBREV="unknown"
   TIME="unknown"
   EMAIL="unknown"
 fi
@@ -39,6 +41,7 @@ exec mvn clean "$GOAL" \
   "${EXTRA_ARGS[@]}" \
   -Dgit.branch="${BRANCH:-source-release-no-git}" \
   -Dgit.commit.id.full="${COMMIT:-unknown}" \
+  -Dgit.commit.id.abbrev="${ABBREV:-unknown}" \
   -Dgit.commit.time="${TIME:-unknown}" \
   -Dgit.build.user.email="${EMAIL:-unknown}" \
   "$@"


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to