summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorselias <samelias@cisco.com>2017-04-11 18:01:58 +0200
committerSamuel Eliáš <samelias@cisco.com>2017-04-12 08:39:47 +0000
commit566f32b61fd95276ae5f9a3a3520dd77dc586e9e (patch)
treee19c968df4fc99105de654eb09074a69bde972b6
parent1b797acf7607fe9c61af3dcef8acb172847f53fa (diff)
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 <samelias@cisco.com>
-rw-r--r--jjb/hc2vpp/include-raw-hc2vpp-integration-prebuild.sh3
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