Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/1.x'
Browse files Browse the repository at this point in the history
  • Loading branch information
ao-apps committed Sep 19, 2023
2 parents b6f1e6c + 1fcb306 commit 20cf32c
Show file tree
Hide file tree
Showing 10 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion all
Submodule all updated 2 files
+1 −1 Jenkinsfile
+1 −1 book/Jenkinsfile
2 changes: 1 addition & 1 deletion bom
Submodule bom updated 2 files
+1 −1 Jenkinsfile
+1 −1 book/Jenkinsfile
2 changes: 1 addition & 1 deletion book/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion model
Submodule model updated 2 files
+1 −1 Jenkinsfile
+1 −1 book/Jenkinsfile
2 changes: 1 addition & 1 deletion renderer-html
2 changes: 1 addition & 1 deletion servlet
Submodule servlet updated 2 files
+1 −1 Jenkinsfile
+1 −1 book/Jenkinsfile
2 changes: 1 addition & 1 deletion style
Submodule style updated 2 files
+1 −1 Jenkinsfile
+1 −1 book/Jenkinsfile
2 changes: 1 addition & 1 deletion taglib
Submodule taglib updated 2 files
+1 −1 Jenkinsfile
+1 −1 book/Jenkinsfile
2 changes: 1 addition & 1 deletion view
Submodule view updated 2 files
+1 −1 Jenkinsfile
+1 −1 book/Jenkinsfile

0 comments on commit 20cf32c

Please sign in to comment.