Merge remote-tracking branch 'origin/1.x'

ao-apps · Sep 19, 2023 · 20cf32c · 20cf32c
2 parents b6f1e6c + 1fcb306
commit 20cf32c
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 10 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -461,7 +461,7 @@ if (!binding.hasVariable('failureEmailTo')) {
 }
 
 // Common settings
-def mvnCommon   = "-Dstyle.color=always -DrequireLastBuild=${params.requireLastBuild} -N -U -Pjenkins,POST-SNAPSHOT${extraProfiles.isEmpty() ? '' : (',' + extraProfiles.join(','))}"
+def mvnCommon   = "-Dstyle.color=always -Dmaven.gitcommitid.nativegit=true -DrequireLastBuild=${params.requireLastBuild} -N -U -Pjenkins,POST-SNAPSHOT${extraProfiles.isEmpty() ? '' : (',' + extraProfiles.join(','))}"
 def buildPhases = 'clean process-test-classes'
 
 // Determine nice command prefix or empty string for none

diff --git a/all b/all
diff --git a/bom b/bom
diff --git a/book/Jenkinsfile b/book/Jenkinsfile
@@ -476,7 +476,7 @@ if (!binding.hasVariable('failureEmailTo')) {
 }
 
 // Common settings
-def mvnCommon   = "-Dstyle.color=always -DrequireLastBuild=${params.requireLastBuild} -N -U -Pjenkins,POST-SNAPSHOT${extraProfiles.isEmpty() ? '' : (',' + extraProfiles.join(','))}"
+def mvnCommon   = "-Dstyle.color=always -Dmaven.gitcommitid.nativegit=true -DrequireLastBuild=${params.requireLastBuild} -N -U -Pjenkins,POST-SNAPSHOT${extraProfiles.isEmpty() ? '' : (',' + extraProfiles.join(','))}"
 def buildPhases = 'clean process-test-classes'
 
 // Determine nice command prefix or empty string for none

diff --git a/model b/model
diff --git a/renderer-html b/renderer-html
diff --git a/servlet b/servlet
diff --git a/style b/style
diff --git a/taglib b/taglib
diff --git a/view b/view