diff options
| -rw-r--r-- | jjb/honeycomb/honeycomb.yaml | 10 | ||||
| -rw-r--r-- | jjb/scripts/maven_push_functions.sh | 8 |
2 files changed, 12 insertions, 6 deletions
diff --git a/jjb/honeycomb/honeycomb.yaml b/jjb/honeycomb/honeycomb.yaml index 8362ecc86..fe605b848 100644 --- a/jjb/honeycomb/honeycomb.yaml +++ b/jjb/honeycomb/honeycomb.yaml @@ -60,7 +60,7 @@ 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' - maven-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' + maven-opts: '-Xmx2048m -Dmaven.compile.fork=true' settings: 'honeycomb-settings' settings-type: cfp global-settings: 'global-settings' @@ -131,7 +131,7 @@ 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' - maven-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' + maven-opts: '-Xmx2048m -Dmaven.compile.fork=true' settings: 'honeycomb-settings' settings-type: cfp global-settings: 'global-settings' @@ -191,7 +191,7 @@ 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' - maven-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' + maven-opts: '-Xmx2048m -Dmaven.compile.fork=true' settings: 'honeycomb-settings' settings-type: cfp global-settings: 'global-settings' @@ -246,6 +246,8 @@ os: '{os}' - maven-project-parameter: maven: '{mvn33}' + - repo-name-parameter: + repo-name: '{repo-stream-part}.{repo-os-part}' scm: - git-scm: @@ -272,7 +274,7 @@ 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' - maven-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' + maven-opts: '-Xmx2048m -Dmaven.compile.fork=true' settings: 'honeycomb-settings' settings-type: cfp global-settings: 'global-settings' diff --git a/jjb/scripts/maven_push_functions.sh b/jjb/scripts/maven_push_functions.sh index 2d6ae791f..ad6248cf7 100644 --- a/jjb/scripts/maven_push_functions.sh +++ b/jjb/scripts/maven_push_functions.sh @@ -24,12 +24,16 @@ function push_file () version=$4 artifactId=$5 file_type=$6 - classifier=$7 - if [ "$classifier" ]; then + if [ -n "$7" ]; then d_classifier="-Dclassifier=$7" fi + if [ ! -f "$push_file" ] ; then + echo "file for deployment does not exist: $push_file" + exit 1; + fi + # Disable checks for doublequote to prevent glob / splitting # shellcheck disable=SC2086 $MVN org.apache.maven.plugins:maven-deploy-plugin:deploy-file \ |