From c9097d20606dceef8f296697a652ec198c55294a Mon Sep 17 00:00:00 2001 From: Marek Gradzki Date: Tue, 6 Dec 2016 10:58:56 +0100 Subject: api: set jvpp version to 17.01 Change-Id: Ib22a3a24f9b290465dc80fc683d903d58ba3804c Signed-off-by: Marek Gradzki --- plugins/ioam-plugin/Makefile.am | 2 +- plugins/ioam-plugin/ioam/jvpp/io/fd/vpp/jvpp/ioamtrace/test/Readme.txt | 2 +- plugins/snat-plugin/Makefile.am | 2 +- plugins/snat-plugin/snat/jvpp/io/fd/vpp/jvpp/snat/test/Readme.txt | 2 +- vpp-api/java/configure.ac | 2 +- vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/Readme.txt | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/ioam-plugin/Makefile.am b/plugins/ioam-plugin/Makefile.am index a9ed4ab46fa..02c8584e354 100644 --- a/plugins/ioam-plugin/Makefile.am +++ b/plugins/ioam-plugin/Makefile.am @@ -145,7 +145,7 @@ install-data-hook: # Java code generation # jvpp_registry_root = ../../vpp-api/java -jvpp_registry_version = 16.12 +jvpp_registry_version = 17.01 jioam_trace_jarfile = jvpp-ioam-trace-$(PACKAGE_VERSION).jar jvpp_package_dir = io/fd/vpp/jvpp/ioamtrace jvpp_root = ioam/jvpp diff --git a/plugins/ioam-plugin/ioam/jvpp/io/fd/vpp/jvpp/ioamtrace/test/Readme.txt b/plugins/ioam-plugin/ioam/jvpp/io/fd/vpp/jvpp/ioamtrace/test/Readme.txt index 1913f098fc4..17e45a81e66 100644 --- a/plugins/ioam-plugin/ioam/jvpp/io/fd/vpp/jvpp/ioamtrace/test/Readme.txt +++ b/plugins/ioam-plugin/ioam/jvpp/io/fd/vpp/jvpp/ioamtrace/test/Readme.txt @@ -1 +1 @@ -sudo java -cp build-vpp_debug-native/vpp-api/java/jvpp-registry-16.12.jar:build-vpp_debug-native/plugins/ioam-plugin/jvpp-ioam-trace-1.0.jar io.fd.vpp.jvpp.ioamtrace.test.IoamTraceApiTest +sudo java -cp build-vpp-native/vpp-api/java/jvpp-registry-17.01.jar:build-vpp-native/plugins/ioam-plugin/jvpp-ioam-trace-1.0.jar io.fd.vpp.jvpp.ioamtrace.test.IoamTraceApiTest diff --git a/plugins/snat-plugin/Makefile.am b/plugins/snat-plugin/Makefile.am index f10ba25e097..e798f978b5c 100644 --- a/plugins/snat-plugin/Makefile.am +++ b/plugins/snat-plugin/Makefile.am @@ -66,7 +66,7 @@ api_DATA = snat/snat.api.json # Java code generation # jvpp_registry_root = ../../vpp-api/java -jvpp_registry_version = 16.12 +jvpp_registry_version = 17.01 jsnat_jarfile = jvpp-snat-$(PACKAGE_VERSION).jar jvpp_package_dir = io/fd/vpp/jvpp/snat jvpp_root = snat/jvpp diff --git a/plugins/snat-plugin/snat/jvpp/io/fd/vpp/jvpp/snat/test/Readme.txt b/plugins/snat-plugin/snat/jvpp/io/fd/vpp/jvpp/snat/test/Readme.txt index dbd4c996265..a2b0c41f09d 100644 --- a/plugins/snat-plugin/snat/jvpp/io/fd/vpp/jvpp/snat/test/Readme.txt +++ b/plugins/snat-plugin/snat/jvpp/io/fd/vpp/jvpp/snat/test/Readme.txt @@ -1 +1 @@ -sudo java -cp build-vpp-native/vpp-api/java/jvpp-registry-16.12.jar:build-vpp-native/plugins/snat-plugin/jvpp-snat-1.0.jar io.fd.vpp.jvpp.snat.test.CallbackApiTest +sudo java -cp build-vpp-native/vpp-api/java/jvpp-registry-17.01.jar:build-vpp-native/plugins/snat-plugin/jvpp-snat-1.0.jar io.fd.vpp.jvpp.snat.test.CallbackApiTest diff --git a/vpp-api/java/configure.ac b/vpp-api/java/configure.ac index 54d26b507d8..556a899d192 100644 --- a/vpp-api/java/configure.ac +++ b/vpp-api/java/configure.ac @@ -1,4 +1,4 @@ -AC_INIT(jvpp, 16.12) +AC_INIT(jvpp, 17.01) LT_INIT AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE diff --git a/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/Readme.txt b/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/Readme.txt index c1b0c5aa2de..1344dc9ebdb 100644 --- a/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/Readme.txt +++ b/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/Readme.txt @@ -2,7 +2,7 @@ This package contains basic tests for jvpp. To run the tests: - Make sure VPP is running - From VPP's build-root/ folder execute: - - sudo java -cp build-vpp_debug-native/vpp-api/java/jvpp-registry-16.12.jar:build-vpp_debug-native/vpp-api/java/jvpp-core-16.12.jar io.fd.vpp.jvpp.core.test.[test name] + - sudo java -cp build-vpp-native/vpp-api/java/jvpp-registry-17.01.jar:build-vpp-native/vpp-api/java/jvpp-core-17.01.jar io.fd.vpp.jvpp.core.test.[test name] Available tests: CallbackApiTest - Similar to ControlPingTest, invokes more complex calls (e.g. interface dump) using low level JVpp APIs -- cgit 1.2.3-korg