From a2cda1ab1b3c48f264487a96df555a855b8aa6d0 Mon Sep 17 00:00:00 2001 From: Sam Hague Date: Thu, 16 Mar 2017 16:21:18 -0400 Subject: [PATCH] Add option to not skip git.properties The q(uick) profile skips the git-commit-id-plugin. This patch adds the skip override so that the plugin wil run and the git.properties file included in the jars so that the distchanges tool works properly. There is also some cleanup to make the distribution builders be more consistent and use the quick profile. Change-Id: I5476f8c911ed7899a78577a6e61e1e88b620b747 Signed-off-by: Sam Hague --- jjb/integration/integration-templates.yaml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml index 8fc01a762..d8ed8ee87 100644 --- a/jjb/integration/integration-templates.yaml +++ b/jjb/integration/integration-templates.yaml @@ -1327,11 +1327,10 @@ maven-version: 'mvn33' pom: '{project}/pom.xml' goals: > - clean install dependency:tree -V -B -Djenkins - -DskipTests - -Dcheckstyle.skip=true - -Dmaven.javadoc.skip=true - -Dmaven.site.skip=true + clean install dependency:tree + -V -B -Pq + -Dgitid.skip=false + -Djenkins -DgenerateReports=false -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dstream={stream} @@ -1346,7 +1345,10 @@ maven-name: 'mvn33' root-pom: 'distribution/pom.xml' goals: > - clean install dependency:tree -V -B -Djenkins + clean install dependency:tree + -V -B -Pq + -Dgitid.skip=false + -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' settings: 'integration-settings' -- 2.36.6