diff options
author | Ed Warnicke <hagbard@gmail.com> | 2016-12-05 13:35:21 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@fd.io> | 2016-12-05 13:35:21 +0000 |
commit | 82086ef901b1e5ab790d61f0fd171464d6f0d27e (patch) | |
tree | ce603689f794537c3719330b6e69315b58622480 | |
parent | 57ffdb734a39d9b1e45fb80f17f37acee0ab4158 (diff) | |
parent | 8c9f12fffea795835d1da8769846301a38bdd3a9 (diff) |
Merge "Remove references to karaf in hc2vpp and honeycomb jobs"
-rw-r--r-- | jjb/hc2vpp/hc2vpp.yaml | 8 | ||||
-rw-r--r-- | jjb/honeycomb/honeycomb.yaml | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/jjb/hc2vpp/hc2vpp.yaml b/jjb/hc2vpp/hc2vpp.yaml index 18d7300a7..0b8f67c60 100644 --- a/jjb/hc2vpp/hc2vpp.yaml +++ b/jjb/hc2vpp/hc2vpp.yaml @@ -63,7 +63,7 @@ maven: maven-name: 'mvn33' root-pom: 'pom.xml' - goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dmerge -Dkaraf.keep.unpack=true site' + goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dmerge site' maven-opts: '-Xmx2048m -Dmaven.compile.fork=true' settings: 'hc2vpp-settings' settings-type: cfp @@ -129,7 +129,7 @@ maven: maven-name: 'mvn33' root-pom: 'pom.xml' - goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dmerge -Dkaraf.keep.unpack=true' + goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dmerge' maven-opts: '-Xmx2048m -Dmaven.compile.fork=true' settings: 'hc2vpp-settings' settings-type: cfp @@ -183,7 +183,7 @@ maven: maven-name: 'mvn33' root-pom: 'pom.xml' - goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dmerge -Dkaraf.keep.unpack=true -Dsonar -Ddocs.hc.folder=io/fd/hc2vpp -Dmaven.site.skip={skip-site} site -Dmaven.site.deploy.skip={skip-site} site:deploy' + goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dmerge -Dsonar -Ddocs.hc.folder=io/fd/hc2vpp -Dmaven.site.skip={skip-site} site -Dmaven.site.deploy.skip={skip-site} site:deploy' maven-opts: '-Xmx2048m -Dmaven.compile.fork=true' settings: 'hc2vpp-settings' settings-type: cfp @@ -248,7 +248,7 @@ maven: maven-name: 'mvn33' root-pom: 'pom.xml' - goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dmerge -Dkaraf.keep.unpack=true' + goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dmerge' maven-opts: '-Xmx2048m -Dmaven.compile.fork=true' settings: 'hc2vpp-settings' settings-type: cfp diff --git a/jjb/honeycomb/honeycomb.yaml b/jjb/honeycomb/honeycomb.yaml index 91cc14815..6135f7592 100644 --- a/jjb/honeycomb/honeycomb.yaml +++ b/jjb/honeycomb/honeycomb.yaml @@ -59,7 +59,7 @@ maven: maven-name: 'mvn33' root-pom: 'pom.xml' - goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dmerge -Dkaraf.keep.unpack=true site' + goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dmerge site' maven-opts: '-Xmx2048m -Dmaven.compile.fork=true' settings: 'honeycomb-settings' settings-type: cfp @@ -113,7 +113,7 @@ maven: maven-name: 'mvn33' root-pom: 'pom.xml' - goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dmerge -Dkaraf.keep.unpack=true -Dsonar -Dmaven.site.skip={skip-site} site -Dmaven.site.deploy.skip={skip-site} site:deploy' + goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dmerge -Dsonar -Dmaven.site.skip={skip-site} site -Dmaven.site.deploy.skip={skip-site} site:deploy' maven-opts: '-Xmx2048m -Dmaven.compile.fork=true' settings: 'honeycomb-settings' settings-type: cfp |