From 566f32b61fd95276ae5f9a3a3520dd77dc586e9e Mon Sep 17 00:00:00 2001 From: selias Date: Tue, 11 Apr 2017 18:01:58 +0200 Subject: read jvpp version from file in hc2vpp file added in https://gerrit.fd.io/r/6140, https://gerrit.fd.io/r/6139 Change-Id: Ic9ead2b863cf7c76b3a985c28cafefb524d23926 Signed-off-by: selias --- jjb/hc2vpp/include-raw-hc2vpp-integration-prebuild.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 -- cgit 1.2.3-korg