diff options
| author |   Ed Warnicke <hagbard@gmail.com> | 2017-04-12 13:54:46 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2017-04-12 13:54:46 +0000 |
| commit | 21a64e3b6471610e808568fa9159b7f28cb10671 (patch) | |
| tree | 611da47a44d47955e91400079ef75abba7b9b772 /jjb | |
| parent | 46a463c10ba5f2721132f6b5920e8fedbceca8a0 (diff) | |
| parent | 566f32b61fd95276ae5f9a3a3520dd77dc586e9e (diff) | |
Merge "read jvpp version from file in hc2vpp"
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/hc2vpp/include-raw-hc2vpp-integration-prebuild.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/jjb/hc2vpp/include-raw-hc2vpp-integration-prebuild.sh b/jjb/hc2vpp/include-raw-hc2vpp-integration-prebuild.sh index ee6b82ea6..8c9aed4ef 100644 --- a/jjb/hc2vpp/include-raw-hc2vpp-integration-prebuild.sh +++ b/jjb/hc2vpp/include-raw-hc2vpp-integration-prebuild.sh @@ -60,6 +60,8 @@ fi rm vpp-api-java* # install jvpp jars into maven repo, so that maven picks them up when building hc2vpp +version=`./jvpp-version` + current_dir=`pwd` cd /usr/share/java @@ -69,7 +71,6 @@ for item in jvpp*.jar; do # Version = 17.01 basefile=$(basename -s .jar "$item") artifactId=$(echo "$basefile" | cut -d '-' -f 1-2) - version=$(echo "$basefile" | cut -d '-' -f 3) mvn install:install-file -Dfile=${item} -DgroupId=io.fd.vpp -DartifactId=${artifactId} -Dversion=${version} -Dpackaging=jar -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r done |