diff options
| author |   Andrew Grimberg <agrimberg@linuxfoundation.org> | 2017-02-20 23:25:03 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@openecomp.org> | 2017-02-20 23:25:03 +0000 |
| commit | d9ae2c87bd67e37d1cda0c3a48970c9914c311d1 (patch) | |
| tree | f32335bb4793246f2d15115dce0ace6ccb623fcd | |
| parent | c55fc861c53fe09f12067f4d1418d7e918808b26 (diff) | |
| parent | dfe622cb6f4cde00c139cdcd7c02f9b83ab4ba3d (diff) | |
Merge "Changed mvn to ${MVN} to find the right exec."
| -rwxr-xr-x | jjb/dcae/script-collectors-ves-daily-release.sh | 2 | ||||
| -rwxr-xr-x | jjb/dcae/script-collectors-ves-merge.sh | 2 | ||||
| -rwxr-xr-x | jjb/dcae/script-collectors-ves-verify.sh | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/jjb/dcae/script-collectors-ves-daily-release.sh b/jjb/dcae/script-collectors-ves-daily-release.sh index 53fb06e82..a08d13903 100755 --- a/jjb/dcae/script-collectors-ves-daily-release.sh +++ b/jjb/dcae/script-collectors-ves-daily-release.sh @@ -18,7 +18,7 @@ FORMAT='zip' SCOPE='runtime' ARTIFACT_FQID="${GROUP_ID}:${ARTIFACT_ID}:${VERSION}:${FORMAT}:${SCOPE}" ARTIFACT_FILENAME="${ARTIFACT_ID}-${VERSION}-${SCOPE}.${FORMAT}" -mvn -s "$SETTINGS_FILE" \ +${MVN} -s "$SETTINGS_FILE" \ org.apache.maven.plugins:maven-dependency-plugin:2.10:copy \ -Dartifact="${ARTIFACT_FQID}" -DoutputDirectory=/tmp DCM_AR="/tmp/${ARTIFACT_FILENAME}" diff --git a/jjb/dcae/script-collectors-ves-merge.sh b/jjb/dcae/script-collectors-ves-merge.sh index 53fb06e82..a08d13903 100755 --- a/jjb/dcae/script-collectors-ves-merge.sh +++ b/jjb/dcae/script-collectors-ves-merge.sh @@ -18,7 +18,7 @@ FORMAT='zip' SCOPE='runtime' ARTIFACT_FQID="${GROUP_ID}:${ARTIFACT_ID}:${VERSION}:${FORMAT}:${SCOPE}" ARTIFACT_FILENAME="${ARTIFACT_ID}-${VERSION}-${SCOPE}.${FORMAT}" -mvn -s "$SETTINGS_FILE" \ +${MVN} -s "$SETTINGS_FILE" \ org.apache.maven.plugins:maven-dependency-plugin:2.10:copy \ -Dartifact="${ARTIFACT_FQID}" -DoutputDirectory=/tmp DCM_AR="/tmp/${ARTIFACT_FILENAME}" diff --git a/jjb/dcae/script-collectors-ves-verify.sh b/jjb/dcae/script-collectors-ves-verify.sh index b39efbe8f..f502cc951 100755 --- a/jjb/dcae/script-collectors-ves-verify.sh +++ b/jjb/dcae/script-collectors-ves-verify.sh @@ -24,7 +24,7 @@ FORMAT='zip' SCOPE='runtime' ARTIFACT_FQID="${GROUP_ID}:${ARTIFACT_ID}:${VERSION}:${FORMAT}:${SCOPE}" ARTIFACT_FILENAME="${ARTIFACT_ID}-${VERSION}-${SCOPE}.${FORMAT}" -mvn -s "$SETTINGS_FILE" \ +${MVN} -s "$SETTINGS_FILE" \ org.apache.maven.plugins:maven-dependency-plugin:2.10:copy \ -Dartifact="${ARTIFACT_FQID}" -DoutputDirectory=/tmp DCM_AR="/tmp/${ARTIFACT_FILENAME}" |