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 286b806ef4a2cad79dd82854ff5a179f4f34696f..1e6784b1d4d4f6921bf27f647f6281fb8ed31547 100644 (file)
--- 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 8a27bbc246774f50ed85ffa023ab55fdbbb3d0cf..b2a6db8fc962e887a8d1d037d33d640e588d21e4 100644 (file)
--- 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 b2b499d526b79bf72b30ff5034a1868e6cd5fbe4..84e23522a6e5014a717adcd7ab29c1ab15bb95fb 100644 (file)
--- 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 0320ff21dd4a636560b1d3ec54e6c6664c29f7fb..1a2872199415bf30b584fdec2b4e1ed2bd0904bf 100644 (file)
--- 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}'