From 41b0d0268c9b26d62d8f4ffaf8d9d61334254242 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 23 Feb 2018 15:04:25 +0100 Subject: [PATCH] Prepare for git-commit-id plugin upgrade We have an upgrade to 2.2.4 upcoming, which will eliminate gitid.skip property. Add its replacement, so we are ready for that change. Change-Id: I85a16b588a5a7b8312059170171353f3f8eb7e5c Signed-off-by: Robert Varga --- jjb/integration/integration-templates.yaml | 2 ++ jjb/integration/multipatch-distribution.sh | 1 + 2 files changed, 3 insertions(+) diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml index 1ce162a0f..bac9e13d2 100644 --- a/jjb/integration/integration-templates.yaml +++ b/jjb/integration/integration-templates.yaml @@ -1514,6 +1514,7 @@ clean install dependency:tree -Pq -Dgitid.skip=false + -Dmaven.gitcommitid.skip=false -DgenerateReports=false -Dstream={stream} {opendaylight-infra-mvn-opts} @@ -1531,6 +1532,7 @@ clean install dependency:tree -Pq -Dgitid.skip=false + -Dmaven.gitcommitid.skip=false {opendaylight-infra-mvn-opts} # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT. java-opts: diff --git a/jjb/integration/multipatch-distribution.sh b/jjb/integration/multipatch-distribution.sh index 0a0e355aa..95d4fedea 100644 --- a/jjb/integration/multipatch-distribution.sh +++ b/jjb/integration/multipatch-distribution.sh @@ -100,6 +100,7 @@ do -e -Pq \ -Dstream=oxygen \ -Dgitid.skip=false \ + -Dmaven.gitcommitid.skip=false \ --global-settings "$GLOBAL_SETTINGS_FILE" \ --settings "$SETTINGS_FILE" \ $MAVEN_OPTIONS -- 2.36.6