From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Wed, 8 Jul 2015 15:45:13 +0000 (-0400)
Subject: Remove source:jar and javadoc:jar from goals
X-Git-Tag: release/lithium-sr1~58^2
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F10%2F23910%2F1;p=releng%2Fbuilder.git

Remove source:jar and javadoc:jar from goals

With the merge of https://git.opendaylight.org/gerrit/23905/
there is no longer a need for JJB to explicitly run source:jar
and javadoc:jar as odlparent will force all projects to build
these.

Change-Id: I2bf53cbdd76eeeba7f571483e718496d3ccd2ed7
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
---

diff --git a/jjb-templates/daily.yaml b/jjb-templates/daily.yaml
index 286b806ef4..1e6784b1d4 100644
--- a/jjb-templates/daily.yaml
+++ b/jjb-templates/daily.yaml
@@ -45,7 +45,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'POM'
-        goals: 'MAVEN_GOALS source:jar javadoc:jar'
+        goals: 'MAVEN_GOALS'
         maven-opts: 'MAVEN_OPTS'
         settings: '{PROJECT-settings}'
         global-settings: '{odl-global-settings}'
diff --git a/jjb-templates/distribution.yaml b/jjb-templates/distribution.yaml
index 8a27bbc246..b2a6db8fc9 100644
--- a/jjb-templates/distribution.yaml
+++ b/jjb-templates/distribution.yaml
@@ -38,7 +38,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install source:jar javadoc:jar'
+        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
         settings: '{integration-settings}'
         global-settings: '{odl-global-settings}'
diff --git a/jjb-templates/integration.yaml b/jjb-templates/integration.yaml
index b2b499d526..84e23522a6 100644
--- a/jjb-templates/integration.yaml
+++ b/jjb-templates/integration.yaml
@@ -49,7 +49,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'POM'
-        goals: 'MAVEN_GOALS source:jar javadoc:jar'
+        goals: 'MAVEN_GOALS'
         maven-opts: 'MAVEN_OPTS'
         settings: '{PROJECT-settings}'
         global-settings: '{odl-global-settings}'
diff --git a/jjb-templates/merge.yaml b/jjb-templates/merge.yaml
index 0320ff21dd..1a28721994 100644
--- a/jjb-templates/merge.yaml
+++ b/jjb-templates/merge.yaml
@@ -47,7 +47,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'POM'
-        goals: 'MAVEN_GOALS source:jar javadoc:jar -Dmerge'
+        goals: 'MAVEN_GOALS -Dmerge'
         maven-opts: 'MAVEN_OPTS'
         settings: '{PROJECT-settings}'
         global-settings: '{odl-global-settings}'