126 files changed, 77 insertions, 54 deletions

diff --git a/Makefile b/Makefile
index 298046dfa89..f271811df26 100644
--- a/Makefile
+++ b/Makefile
@@ -382,7 +382,7 @@ test-all:
 	$(call test,vpp,vpp,test)
 
 test-ext:
-	$(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=vpp TAG=vpp_debug vom-install,)
+	$(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=vpp TAG=vpp_debug vom-install japi-install,)
 	$(eval EXTENDED_TESTS=yes)
 	$(call test,vpp,vpp_debug,test-ext)
 
@@ -533,6 +533,8 @@ verify: install-dep $(BR)/.deps.ok dpdk-install-dev
 	@make -C build-root PLATFORM=vpp TAG=vpp sample-plugin-install
 	$(call banner,"Building libmemif")
 	@make -C build-root PLATFORM=vpp TAG=vpp libmemif-install
+	$(call banner,"Building JAPI")
+	@make -C build-root PLATFORM=vpp TAG=vpp japi-install
 	$(call banner,"Building VOM")
 	@make -C build-root PLATFORM=vpp TAG=vpp vom-install
 	$(call banner,"Building $(PKG) packages")
diff --git a/build-data/packages/japi.mk b/build-data/packages/japi.mk
new file mode 100644
index 00000000000..d6435930f4a
--- /dev/null
+++ b/build-data/packages/japi.mk
@@ -0,0 +1,6 @@
+japi_configure_depend = vpp-install
+japi_source = extras
+japi_configure_subdir = japi
+japi_CPPFLAGS = $(call installed_includes_fn, vpp) $(call installed_includes_fn, vpp)/vpp_plugins
+japi_LDFLAGS = $(call installed_libs_fn, vpp)
+
diff --git a/build-data/platforms.mk b/build-data/platforms.mk
index d555f2ab3eb..a8bd44ee15b 100644
--- a/build-data/platforms.mk
+++ b/build-data/platforms.mk
@@ -86,7 +86,7 @@ install-deb: $(patsubst %,%-find-source,$(ROOT_PACKAGES))
 	   >> deb/debian/vpp-dev.install ;				\
 	echo ../$(INSTALL_PREFIX)$(ARCH)/vpp/share/vpp/JSON.py /usr/share/vpp \
 	   >> deb/debian/vpp-dev.install ;				\
-	echo ../../src/vpp-api/java/jvpp/gen/jvpp_gen.py /usr/bin	\
+	echo ../../extras/japi/java/jvpp/gen/jvpp_gen.py /usr/bin	\
 	   >> deb/debian/vpp-dev.install ;				\
 	for i in $$(ls ../src/vpp-api/java/jvpp/gen/jvppgen/*.py); do	\
 	   echo ../$${i} /usr/lib/python2.7/dist-packages/jvppgen	\
diff --git a/build-data/platforms/vpp.mk b/build-data/platforms/vpp.mk
index 5e4980aad12..0687946dbb9 100644
--- a/build-data/platforms/vpp.mk
+++ b/build-data/platforms/vpp.mk
@@ -26,7 +26,7 @@ vpp_uses_dpdk = yes
 # Uncoment to enable building unit tests
 # vpp_enable_tests = yes
 
-vpp_root_packages = vpp vom
+vpp_root_packages = vpp vom japi
 
 # DPDK configuration parameters
 # vpp_uses_dpdk_mlx4_pmd = yes
diff --git a/build-root/scripts/find-vpp-api-java-contents b/build-root/scripts/find-vpp-api-java-contents
index 6309c6cbee7..b4cf52fcf58 100755
--- a/build-root/scripts/find-vpp-api-java-contents
+++ b/build-root/scripts/find-vpp-api-java-contents
@@ -15,7 +15,7 @@
 
 rm -f $2
 
-for i in $(find ${1}/vpp/share/java/ -type f -print); do
+for i in $(find ${1}/japi/share/java/ -type f -print); do
   echo ../${i} /usr/share/java >> ${2}
 done
 
diff --git a/extras/japi/Makefile.am b/extras/japi/Makefile.am
new file mode 100644
index 00000000000..81ff5bb049e
--- /dev/null
+++ b/extras/japi/Makefile.am
@@ -0,0 +1,5 @@
+
+
+AUTOMAKE_OPTIONS = foreign subdir-objects
+
+SUBDIRS = java
diff --git a/extras/japi/configure.ac b/extras/japi/configure.ac
new file mode 100644
index 00000000000..08f0897af14
--- /dev/null
+++ b/extras/japi/configure.ac
@@ -0,0 +1,36 @@
+AC_INIT(japi, 18.10)
+LT_INIT
+AM_INIT_AUTOMAKE
+AM_SILENT_RULES([yes])
+AC_PREFIX_DEFAULT([/usr])
+
+PKG_CHECK_MODULES([CHECK], [check], [HAVE_CHECK=1], [HAVE_CHECK=0])
+AM_CONDITIONAL([USE_CHECK],[test "$HAVE_CHECK" -eq 1])
+
+AC_PROG_CC
+AC_PROG_CXX
+
+AM_CONDITIONAL(ENABLE_ACL_PLUGIN, test "yes" = "yes")
+AM_CONDITIONAL(ENABLE_NAT_PLUGIN, test "yes" = "yes")
+AM_CONDITIONAL(ENABLE_L2E_PLUGIN, test "yes" = "yes")
+AM_CONDITIONAL(ENABLE_GBP_PLUGIN, test "yes" = "yes")
+AM_CONDITIONAL(ENABLE_PPPOE_PLUGIN, test "yes" = "yes")
+AM_CONDITIONAL(ENABLE_GTPU_PLUGIN, test "yes" = "yes")
+AM_CONDITIONAL(ENABLE_IOAM_PLUGIN, test "yes" = "yes")
+
+AX_VPP_FIND_JDK8
+AC_SUBST(JAVA_HOME)
+AC_SUBST(JAVAC)
+AC_SUBST(JAVAH)
+AC_SUBST(JAR)
+
+AS_CASE([$host_cpu],
+	[x86_64], [CPU_FLAGS="-march=corei7 -mtune=corei7-avx"],
+	[aarch64], [CPU_FLAGS="-march=armv8-a+crc"],
+	[CPU_FLAGS=""],
+)
+AC_SUBST([CPU_FLAGS])
+
+AC_OUTPUT([Makefile java/Makefile])
+
+AC_CONFIG_MACRO_DIR([m4])
diff --git a/src/vpp-api/java/.gitignore b/extras/japi/java/.gitignore
index 62165b48184..62165b48184 100644
--- a/src/vpp-api/java/.gitignore
+++ b/extras/japi/java/.gitignore
diff --git a/src/vpp-api/java/Makefile.am b/extras/japi/java/Makefile.am
index 321ba33cb53..7ef42ba740c 100644
--- a/src/vpp-api/java/Makefile.am
+++ b/extras/japi/java/Makefile.am
@@ -11,7 +11,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign subdir-objects
 ACLOCAL_AMFLAGS = -I m4
 AM_LIBTOOLFLAGS = --quiet
 
@@ -36,14 +36,11 @@ nobase_include_HEADERS =                \
 
 lib_LTLIBRARIES = libjvpp_common.la
 libjvpp_common_la_SOURCES = jvpp-common/jvpp_common.c
-libjvpp_common_la_LDFLAGS = shared -rpath /none -no-undefined
+libjvpp_common_la_LDFLAGS = shared -rpath /none -no-undefined -lvppinfra
 
 JVPP_LIBS = \
   libjvpp_common.la \
-  $(top_builddir)/libvppinfra.la \
-  $(top_builddir)/libvlibmemoryclient.la \
-  $(top_builddir)/libsvm.la \
-  -lpthread -lm -lrt
+  -lvppinfra -lvlibmemoryclient -lsvm -lpthread -lm -lrt
 
 #
 # jvpp-registry (connection management + plugin registry)
@@ -99,8 +96,8 @@ JAR_FILES += jvpp-core-$(PACKAGE_VERSION).jar
 CLEANDIRS += jvpp-core/target
 
 # Include all VPP API files
-jvpp_core_json_files = $(shell find @top_builddir@/vnet/ -type f -name '*.api.json')
-jvpp_core_json_files += $(shell find @top_builddir@/vpp/ -type f -name '*.api.json')
+jvpp_core_json_files = $(shell find @top_builddir@/../vpp/vnet  -type f -name '*.api.json')
+jvpp_core_json_files += $(shell find @top_builddir@/../vpp/vpp -type f -name '*.api.json')
 # except for plugins and unsupported ones:
 # jvpp_core_json_files += @top_builddir@/vlibmemory/memclnt.api.json
 
@@ -121,7 +118,7 @@ BUILT_SOURCES += jvpp-acl/io_fd_vpp_jvpp_acl_JVppAclImpl.h
 JAR_FILES += jvpp-acl-$(PACKAGE_VERSION).jar
 CLEANDIRS += jvpp-acl/target
 
-jvpp_acl_json_files = @top_builddir@/plugins/acl/acl.api.json
+jvpp_acl_json_files = @top_builddir@/../vpp/plugins/acl/acl.api.json
 
 jvpp-acl/io_fd_vpp_jvpp_acl_JVppAclImpl.h: $(jvpp_registry_ok) $(jvpp_acl_json_files)
 	$(call japigen,acl,JVppAclImpl)
@@ -141,7 +138,7 @@ BUILT_SOURCES += jvpp-gtpu/io_fd_vpp_jvpp_gtpu_JVppGtpuImpl.h
 JAR_FILES += jvpp-gtpu-$(PACKAGE_VERSION).jar
 CLEANDIRS += jvpp-gtpu/target
 
-jvpp_gtpu_json_files = @top_builddir@/plugins/gtpu/gtpu.api.json
+jvpp_gtpu_json_files = @top_builddir@/../vpp/plugins/gtpu/gtpu.api.json
 
 jvpp-gtpu/io_fd_vpp_jvpp_gtpu_JVppGtpuImpl.h: $(jvpp_registry_ok) $(jvpp_gtpu_json_files)
 	$(call japigen,gtpu,JVppGtpuImpl)
@@ -161,7 +158,7 @@ BUILT_SOURCES += jvpp-pppoe/io_fd_vpp_jvpp_pppoe_JVppPppoeImpl.h
 JAR_FILES += jvpp-pppoe-$(PACKAGE_VERSION).jar
 CLEANDIRS += jvpp-pppoe/target
 
-jvpp_pppoe_json_files = @top_builddir@/plugins/pppoe/pppoe.api.json
+jvpp_pppoe_json_files = @top_builddir@/../vpp/plugins/pppoe/pppoe.api.json
 
 jvpp-pppoe/io_fd_vpp_jvpp_pppoe_JVppPppoeImpl.h: $(jvpp_registry_ok) $(jvpp_pppoe_json_files)
 	$(call japigen,pppoe,JVppPppoeImpl)
@@ -181,7 +178,7 @@ BUILT_SOURCES += jvpp-nat/io_fd_vpp_jvpp_nat_JVppNatImpl.h
 JAR_FILES += jvpp-nat-$(PACKAGE_VERSION).jar
 CLEANDIRS += jvpp-nat/target
 
-jvpp_nat_json_files = @top_builddir@/plugins/nat/nat.api.json
+jvpp_nat_json_files = @top_builddir@/../vpp/plugins/nat/nat.api.json
 
 jvpp-nat/io_fd_vpp_jvpp_nat_JVppNatImpl.h: $(jvpp_registry_ok) $(jvpp_nat_json_files)
 	$(call japigen,nat,JVppNatImpl)
@@ -200,7 +197,7 @@ BUILT_SOURCES += jvpp-ioamtrace/io_fd_vpp_jvpp_ioamtrace_JVppIoamtraceImpl.h
 JAR_FILES += jvpp-ioamtrace-$(PACKAGE_VERSION).jar
 CLEANDIRS += jvpp-ioamtrace/target
 
-jvpp_ioamtrace_json_files = @top_builddir@/plugins/ioam/lib-trace/trace.api.json
+jvpp_ioamtrace_json_files = @top_builddir@/../vpp/plugins/ioam/lib-trace/trace.api.json
 
 jvpp-ioamtrace/io_fd_vpp_jvpp_ioamtrace_JVppIoamtraceImpl.h: $(jvpp_registry_ok) $(jvpp_ioamtrace_json_files)
 	$(call japigen,ioamtrace,JVppIoamtraceImpl)
@@ -217,7 +214,7 @@ BUILT_SOURCES += jvpp-ioampot/io_fd_vpp_jvpp_ioampot_JVppIoampotImpl.h
 JAR_FILES += jvpp-ioampot-$(PACKAGE_VERSION).jar
 CLEANDIRS += jvpp-ioampot/target
 
-jvpp_ioampot_json_files = @top_builddir@/plugins/ioam/lib-pot/pot.api.json
+jvpp_ioampot_json_files = @top_builddir@/../vpp/plugins/ioam/lib-pot/pot.api.json
 
 jvpp-ioampot/io_fd_vpp_jvpp_ioampot_JVppIoampotImpl.h: $(jvpp_registry_ok) $(jvpp_ioampot_json_files)
 	$(call japigen,ioampot,JVppIoampotImpl)
@@ -234,7 +231,7 @@ BUILT_SOURCES += jvpp-ioamexport/io_fd_vpp_jvpp_ioamexport_JVppIoamexportImpl.h
 JAR_FILES += jvpp-ioamexport-$(PACKAGE_VERSION).jar
 CLEANDIRS += jvpp-ioamexport/target
 
-jvpp_ioamexport_json_files = @top_builddir@/plugins/ioam/export/ioam_export.api.json
+jvpp_ioamexport_json_files = @top_builddir@/../vpp/plugins/ioam/export/ioam_export.api.json
 
 jvpp-ioamexport/io_fd_vpp_jvpp_ioamexport_JVppIoamexportImpl.h: $(jvpp_registry_ok) $(jvpp_ioamexport_json_files)
 	$(call japigen,ioamexport,JVppIoamexportImpl)
diff --git a/src/vpp-api/java/Readme.txt b/extras/japi/java/Readme.txt
index 689b9b37a46..689b9b37a46 100644
--- a/src/vpp-api/java/Readme.txt
+++ b/extras/japi/java/Readme.txt
diff --git a/src/vpp-api/java/jvpp-acl/io/fd/vpp/jvpp/acl/examples/AclExpectedDumpData.java b/extras/japi/java/jvpp-acl/io/fd/vpp/jvpp/acl/examples/AclExpectedDumpData.java
index 4806052f5b7..4806052f5b7 100644
--- a/src/vpp-api/java/jvpp-acl/io/fd/vpp/jvpp/acl/examples/AclExpectedDumpData.java
+++ b/extras/japi/java/jvpp-acl/io/fd/vpp/jvpp/acl/examples/AclExpectedDumpData.java
diff --git a/src/vpp-api/java/jvpp-acl/io/fd/vpp/jvpp/acl/examples/AclTestData.java b/extras/japi/java/jvpp-acl/io/fd/vpp/jvpp/acl/examples/AclTestData.java
index 199b1b6bf2c..199b1b6bf2c 100644
--- a/src/vpp-api/java/jvpp-acl/io/fd/vpp/jvpp/acl/examples/AclTestData.java
+++ b/extras/japi/java/jvpp-acl/io/fd/vpp/jvpp/acl/examples/AclTestData.java
diff --git a/src/vpp-api/java/jvpp-acl/io/fd/vpp/jvpp/acl/examples/AclTestRequests.java b/extras/japi/java/jvpp-acl/io/fd/vpp/jvpp/acl/examples/AclTestRequests.java
index 149ea46ea0a..149ea46ea0a 100644
--- a/src/vpp-api/java/jvpp-acl/io/fd/vpp/jvpp/acl/examples/AclTestRequests.java
+++ b/extras/japi/java/jvpp-acl/io/fd/vpp/jvpp/acl/examples/AclTestRequests.java
diff --git a/src/vpp-api/java/jvpp-acl/io/fd/vpp/jvpp/acl/examples/FutureApiExample.java b/extras/japi/java/jvpp-acl/io/fd/vpp/jvpp/acl/examples/FutureApiExample.java
index 862df8df4b9..862df8df4b9 100644
--- a/src/vpp-api/java/jvpp-acl/io/fd/vpp/jvpp/acl/examples/FutureApiExample.java
+++ b/extras/japi/java/jvpp-acl/io/fd/vpp/jvpp/acl/examples/FutureApiExample.java
diff --git a/src/vpp-api/java/jvpp-acl/io/fd/vpp/jvpp/acl/examples/Readme.txt b/extras/japi/java/jvpp-acl/io/fd/vpp/jvpp/acl/examples/Readme.txt
index d17fbfc2cd2..d17fbfc2cd2 100644
--- a/src/vpp-api/java/jvpp-acl/io/fd/vpp/jvpp/acl/examples/Readme.txt
+++ b/extras/japi/java/jvpp-acl/io/fd/vpp/jvpp/acl/examples/Readme.txt
diff --git a/src/vpp-api/java/jvpp-acl/io/fd/vpp/jvpp/acl/test/CallbackApiTest.java b/extras/japi/java/jvpp-acl/io/fd/vpp/jvpp/acl/test/CallbackApiTest.java
index a7bbb7f4181..a7bbb7f4181 100644
--- a/src/vpp-api/java/jvpp-acl/io/fd/vpp/jvpp/acl/test/CallbackApiTest.java
+++ b/extras/japi/java/jvpp-acl/io/fd/vpp/jvpp/acl/test/CallbackApiTest.java
diff --git a/src/vpp-api/java/jvpp-acl/io/fd/vpp/jvpp/acl/test/FutureApiTest.java b/extras/japi/java/jvpp-acl/io/fd/vpp/jvpp/acl/test/FutureApiTest.java
index ff1c73c441b..ff1c73c441b 100644
--- a/src/vpp-api/java/jvpp-acl/io/fd/vpp/jvpp/acl/test/FutureApiTest.java
+++ b/extras/japi/java/jvpp-acl/io/fd/vpp/jvpp/acl/test/FutureApiTest.java
diff --git a/src/vpp-api/java/jvpp-acl/io/fd/vpp/jvpp/acl/test/Readme.txt b/extras/japi/java/jvpp-acl/io/fd/vpp/jvpp/acl/test/Readme.txt
index 1b46585185c..1b46585185c 100644
--- a/src/vpp-api/java/jvpp-acl/io/fd/vpp/jvpp/acl/test/Readme.txt
+++ b/extras/japi/java/jvpp-acl/io/fd/vpp/jvpp/acl/test/Readme.txt
diff --git a/src/vpp-api/java/jvpp-acl/jvpp_acl.c b/extras/japi/java/jvpp-acl/jvpp_acl.c
index 22e44f1db5a..22e44f1db5a 100644
--- a/src/vpp-api/java/jvpp-acl/jvpp_acl.c
+++ b/extras/japi/java/jvpp-acl/jvpp_acl.c
diff --git a/src/vpp-api/java/jvpp-acl/jvpp_acl.h b/extras/japi/java/jvpp-acl/jvpp_acl.h
index d1ec78feb19..d1ec78feb19 100644
--- a/src/vpp-api/java/jvpp-acl/jvpp_acl.h
+++ b/extras/japi/java/jvpp-acl/jvpp_acl.h
diff --git a/src/vpp-api/java/jvpp-common/jvpp_common.c b/extras/japi/java/jvpp-common/jvpp_common.c
index 2425607c582..2425607c582 100644
--- a/src/vpp-api/java/jvpp-common/jvpp_common.c
+++ b/extras/japi/java/jvpp-common/jvpp_common.c
diff --git a/src/vpp-api/java/jvpp-common/jvpp_common.h b/extras/japi/java/jvpp-common/jvpp_common.h
index 14027a96f78..14027a96f78 100644
--- a/src/vpp-api/java/jvpp-common/jvpp_common.h
+++ b/extras/japi/java/jvpp-common/jvpp_common.h
diff --git a/src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/examples/CallbackApiExample.java b/extras/japi/java/jvpp-core/io/fd/vpp/jvpp/core/examples/CallbackApiExample.java
index b99979cf301..b99979cf301 100644
--- a/src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/examples/CallbackApiExample.java
+++ b/extras/japi/java/jvpp-core/io/fd/vpp/jvpp/core/examples/CallbackApiExample.java
diff --git a/src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/examples/CallbackApiReadPerfTest.java b/extras/japi/java/jvpp-core/io/fd/vpp/jvpp/core/examples/CallbackApiReadPerfTest.java
index 6ff440dccc0..6ff440dccc0 100644
--- a/src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/examples/CallbackApiReadPerfTest.java
+++ b/extras/japi/java/jvpp-core/io/fd/vpp/jvpp/core/examples/CallbackApiReadPerfTest.java
diff --git a/src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/examples/CallbackApiWritePerfTest.java b/extras/japi/java/jvpp-core/io/fd/vpp/jvpp/core/examples/CallbackApiWritePerfTest.java
index 1940ddcf378..1940ddcf378 100644
--- a/src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/examples/CallbackApiWritePerfTest.java
+++ b/extras/japi/java/jvpp-core/io/fd/vpp/jvpp/core/examples/CallbackApiWritePerfTest.java
diff --git a/src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/examples/CallbackJVppFacadeExample.java b/extras/japi/java/jvpp-core/io/fd/vpp/jvpp/core/examples/CallbackJVppFacadeExample.java
index dc2bdcba569..dc2bdcba569 100644
--- a/src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/examples/CallbackJVppFacadeExample.java
+++ b/extras/japi/java/jvpp-core/io/fd/vpp/jvpp/core/examples/CallbackJVppFacadeExample.java
diff --git a/src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/examples/CallbackJVppFacadeNotificationExample.java b/extras/japi/java/jvpp-core/io/fd/vpp/jvpp/core/examples/CallbackJVppFacadeNotificationExample.java
index 832464a22cb..832464a22cb 100644
--- a/src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/examples/CallbackJVppFacadeNotificationExample.java
+++ b/extras/japi/java/jvpp-core/io/fd/vpp/jvpp/core/examples/CallbackJVppFacadeNotificationExample.java
diff --git a/src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/examples/CallbackNotificationApiExample.java b/extras/japi/java/jvpp-core/io/fd/vpp/jvpp/core/examples/CallbackNotificationApiExample.java
index 9ed418eaa22..9ed418eaa22 100644
--- a/src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/examples/CallbackNotificationApiExample.java
+++ b/extras/japi/java/jvpp-core/io/fd/vpp/jvpp/core/examples/CallbackNotificationApiExample.java
diff --git a/src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/examples/CreateSubInterfaceExample.java b/extras/japi/java/jvpp-core/io/fd/vpp/jvpp/core/examples/CreateSubInterfaceExample.java
index 3db6d30a13e..3db6d30a13e 100644
--- a/src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/examples/CreateSubInterfaceExample.java
+++ b/extras/japi/java/jvpp-core/io/fd/vpp/jvpp/core/examples/CreateSubInterfaceExample.java
diff --git a/src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/examples/FutureApiExample.java b/extras/japi/java/jvpp-core/io/fd/vpp/jvpp/core/examples/FutureApiExample.java
index 931c9b337aa..931c9b337aa 100644
--- a/src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/examples/FutureApiExample.java
+++ b/extras/japi/java/jvpp-core/io/fd/vpp/jvpp/core/examples/FutureApiExample.java
diff --git a/src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/examples/FutureApiNotificationExample.java b/extras/japi/java/jvpp-core/io/fd/vpp/jvpp/core/examples/FutureApiNotificationExample.java
index 3c84fd7276e..3c84fd7276e 100644
--- a/src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/examples/FutureApiNotificationExample.java
+++ b/extras/japi/java/jvpp-core/io/fd/vpp/jvpp/core/examples/FutureApiNotificationExample.java
diff --git a/src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/examples/FutureApiReadPerfTest.java b/extras/japi/java/jvpp-core/io/fd/vpp/jvpp/core/examples/FutureApiReadPerfTest.java
index f335b28dfa3..f335b28dfa3 100644
--- a/src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/examples/FutureApiReadPerfTest.java
+++ b/extras/japi/java/jvpp-core/io/fd/vpp/jvpp/core/examples/FutureApiReadPerfTest.java
diff --git a/src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/examples/L2AclExample.java b/extras/japi/java/jvpp-core/io/fd/vpp/jvpp/core/examples/L2AclExample.java
index f89043a3b0a..f89043a3b0a 100644
--- a/src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/examples/L2AclExample.java
+++ b/extras/japi/java/jvpp-core/io/fd/vpp/jvpp/core/examples/L2AclExample.java
diff --git a/src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/examples/LispAdjacencyExample.java b/extras/japi/java/jvpp-core/io/fd/vpp/jvpp/core/examples/LispAdjacencyExample.java
index f637669dae1..f637669dae1 100644
--- a/src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/examples/LispAdjacencyExample.java
+++ b/extras/japi/java/jvpp-core/io/fd/vpp/jvpp/core/examples/LispAdjacencyExample.java
diff --git a/src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/examples/NotificationUtils.java b/extras/japi/java/jvpp-core/io/fd/vpp/jvpp/core/examples/NotificationUtils.java
index e963d631d61..e963d631d61 100644
--- a/src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/examples/NotificationUtils.java
+++ b/extras/japi/java/jvpp-core/io/fd/vpp/jvpp/core/examples/NotificationUtils.java
diff --git a/src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/examples/Readme.txt b/extras/japi/java/jvpp-core/io/fd/vpp/jvpp/core/examples/Readme.txt
index 9fe3c7ac702..9fe3c7ac702 100644
--- a/src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/examples/Readme.txt
+++ b/extras/japi/java/jvpp-core/io/fd/vpp/jvpp/core/examples/Readme.txt
diff --git a/src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/CallbackApiTest.java b/extras/japi/java/jvpp-core/io/fd/vpp/jvpp/core/test/CallbackApiTest.java
index 493116c8574..493116c8574 100644
--- a/src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/CallbackApiTest.java
+++ b/extras/japi/java/jvpp-core/io/fd/vpp/jvpp/core/test/CallbackApiTest.java
diff --git a/src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/FutureApiTest.java b/extras/japi/java/jvpp-core/io/fd/vpp/jvpp/core/test/FutureApiTest.java
index d3acecc29b4..d3acecc29b4 100644
--- a/src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/FutureApiTest.java
+++ b/extras/japi/java/jvpp-core/io/fd/vpp/jvpp/core/test/FutureApiTest.java
diff --git a/src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/Readme.txt b/extras/japi/java/jvpp-core/io/fd/vpp/jvpp/core/test/Readme.txt
index b74cf60ae29..b74cf60ae29 100644
--- a/src/vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/Readme.txt
+++ b/extras/japi/java/jvpp-core/io/fd/vpp/jvpp/core/test/Readme.txt
diff --git a/src/vpp-api/java/jvpp-core/jvpp_core.c b/extras/japi/java/jvpp-core/jvpp_core.c
index 09d753026d7..09d753026d7 100644
--- a/src/vpp-api/java/jvpp-core/jvpp_core.c
+++ b/extras/japi/java/jvpp-core/jvpp_core.c
diff --git a/src/vpp-api/java/jvpp-gtpu/jvpp_gtpu.c b/extras/japi/java/jvpp-gtpu/jvpp_gtpu.c
index 8e523caa9f8..8e523caa9f8 100644
--- a/src/vpp-api/java/jvpp-gtpu/jvpp_gtpu.c
+++ b/extras/japi/java/jvpp-gtpu/jvpp_gtpu.c
diff --git a/src/vpp-api/java/jvpp-gtpu/jvpp_gtpu.h b/extras/japi/java/jvpp-gtpu/jvpp_gtpu.h
index fa7c8b7c53b..fa7c8b7c53b 100644
--- a/src/vpp-api/java/jvpp-gtpu/jvpp_gtpu.h
+++ b/extras/japi/java/jvpp-gtpu/jvpp_gtpu.h
diff --git a/src/vpp-api/java/jvpp-ioamexport/io/fd/vpp/jvpp/ioamexport/examples/IoamExportApiExample.java b/extras/japi/java/jvpp-ioamexport/io/fd/vpp/jvpp/ioamexport/examples/IoamExportApiExample.java
index 2f5b7dbb8d3..2f5b7dbb8d3 100644
--- a/src/vpp-api/java/jvpp-ioamexport/io/fd/vpp/jvpp/ioamexport/examples/IoamExportApiExample.java
+++ b/extras/japi/java/jvpp-ioamexport/io/fd/vpp/jvpp/ioamexport/examples/IoamExportApiExample.java
diff --git a/src/vpp-api/java/jvpp-ioamexport/io/fd/vpp/jvpp/ioamexport/examples/Readme.txt b/extras/japi/java/jvpp-ioamexport/io/fd/vpp/jvpp/ioamexport/examples/Readme.txt
index f2dfe917e82..f2dfe917e82 100644
--- a/src/vpp-api/java/jvpp-ioamexport/io/fd/vpp/jvpp/ioamexport/examples/Readme.txt
+++ b/extras/japi/java/jvpp-ioamexport/io/fd/vpp/jvpp/ioamexport/examples/Readme.txt
diff --git a/src/vpp-api/java/jvpp-ioamexport/io/fd/vpp/jvpp/ioamexport/test/CallbackApiTest.java b/extras/japi/java/jvpp-ioamexport/io/fd/vpp/jvpp/ioamexport/test/CallbackApiTest.java
index ba49d77d03d..ba49d77d03d 100644
--- a/src/vpp-api/java/jvpp-ioamexport/io/fd/vpp/jvpp/ioamexport/test/CallbackApiTest.java
+++ b/extras/japi/java/jvpp-ioamexport/io/fd/vpp/jvpp/ioamexport/test/CallbackApiTest.java
diff --git a/src/vpp-api/java/jvpp-ioamexport/io/fd/vpp/jvpp/ioamexport/test/FutureApiTest.java b/extras/japi/java/jvpp-ioamexport/io/fd/vpp/jvpp/ioamexport/test/FutureApiTest.java
index 048d244590e..048d244590e 100644
--- a/src/vpp-api/java/jvpp-ioamexport/io/fd/vpp/jvpp/ioamexport/test/FutureApiTest.java
+++ b/extras/japi/java/jvpp-ioamexport/io/fd/vpp/jvpp/ioamexport/test/FutureApiTest.java
diff --git a/src/vpp-api/java/jvpp-ioamexport/io/fd/vpp/jvpp/ioamexport/test/Readme.txt b/extras/japi/java/jvpp-ioamexport/io/fd/vpp/jvpp/ioamexport/test/Readme.txt
index 820071a8215..820071a8215 100644
--- a/src/vpp-api/java/jvpp-ioamexport/io/fd/vpp/jvpp/ioamexport/test/Readme.txt
+++ b/extras/japi/java/jvpp-ioamexport/io/fd/vpp/jvpp/ioamexport/test/Readme.txt
diff --git a/src/vpp-api/java/jvpp-ioamexport/jvpp_ioam_export.c b/extras/japi/java/jvpp-ioamexport/jvpp_ioam_export.c
index 74ae438e136..74ae438e136 100644
--- a/src/vpp-api/java/jvpp-ioamexport/jvpp_ioam_export.c
+++ b/extras/japi/java/jvpp-ioamexport/jvpp_ioam_export.c
diff --git a/src/vpp-api/java/jvpp-ioamexport/jvpp_ioam_export.h b/extras/japi/java/jvpp-ioamexport/jvpp_ioam_export.h
index 596a05400e9..596a05400e9 100644
--- a/src/vpp-api/java/jvpp-ioamexport/jvpp_ioam_export.h
+++ b/extras/japi/java/jvpp-ioamexport/jvpp_ioam_export.h
diff --git a/src/vpp-api/java/jvpp-ioampot/io/fd/vpp/jvpp/ioampot/examples/IoamPotApiExample.java b/extras/japi/java/jvpp-ioampot/io/fd/vpp/jvpp/ioampot/examples/IoamPotApiExample.java
index b9ed7d03afd..b9ed7d03afd 100644
--- a/src/vpp-api/java/jvpp-ioampot/io/fd/vpp/jvpp/ioampot/examples/IoamPotApiExample.java
+++ b/extras/japi/java/jvpp-ioampot/io/fd/vpp/jvpp/ioampot/examples/IoamPotApiExample.java
diff --git a/src/vpp-api/java/jvpp-ioampot/io/fd/vpp/jvpp/ioampot/examples/Readme.txt b/extras/japi/java/jvpp-ioampot/io/fd/vpp/jvpp/ioampot/examples/Readme.txt
index e91550bf475..e91550bf475 100644
--- a/src/vpp-api/java/jvpp-ioampot/io/fd/vpp/jvpp/ioampot/examples/Readme.txt
+++ b/extras/japi/java/jvpp-ioampot/io/fd/vpp/jvpp/ioampot/examples/Readme.txt
diff --git a/src/vpp-api/java/jvpp-ioampot/io/fd/vpp/jvpp/ioampot/test/CallbackApiTest.java b/extras/japi/java/jvpp-ioampot/io/fd/vpp/jvpp/ioampot/test/CallbackApiTest.java
index 20b85d89760..20b85d89760 100644
--- a/src/vpp-api/java/jvpp-ioampot/io/fd/vpp/jvpp/ioampot/test/CallbackApiTest.java
+++ b/extras/japi/java/jvpp-ioampot/io/fd/vpp/jvpp/ioampot/test/CallbackApiTest.java
diff --git a/src/vpp-api/java/jvpp-ioampot/io/fd/vpp/jvpp/ioampot/test/FutureApiTest.java b/extras/japi/java/jvpp-ioampot/io/fd/vpp/jvpp/ioampot/test/FutureApiTest.java
index 6401c678aad..6401c678aad 100644
--- a/src/vpp-api/java/jvpp-ioampot/io/fd/vpp/jvpp/ioampot/test/FutureApiTest.java
+++ b/extras/japi/java/jvpp-ioampot/io/fd/vpp/jvpp/ioampot/test/FutureApiTest.java
diff --git a/src/vpp-api/java/jvpp-ioampot/io/fd/vpp/jvpp/ioampot/test/Readme.txt b/extras/japi/java/jvpp-ioampot/io/fd/vpp/jvpp/ioampot/test/Readme.txt
index f3cae262b20..f3cae262b20 100644
--- a/src/vpp-api/java/jvpp-ioampot/io/fd/vpp/jvpp/ioampot/test/Readme.txt
+++ b/extras/japi/java/jvpp-ioampot/io/fd/vpp/jvpp/ioampot/test/Readme.txt
diff --git a/src/vpp-api/java/jvpp-ioampot/jvpp_ioam_pot.c b/extras/japi/java/jvpp-ioampot/jvpp_ioam_pot.c
index ce1da6979e7..ce1da6979e7 100644
--- a/src/vpp-api/java/jvpp-ioampot/jvpp_ioam_pot.c
+++ b/extras/japi/java/jvpp-ioampot/jvpp_ioam_pot.c
diff --git a/src/vpp-api/java/jvpp-ioampot/jvpp_ioam_pot.h b/extras/japi/java/jvpp-ioampot/jvpp_ioam_pot.h
index 51db3da83b5..51db3da83b5 100644
--- a/src/vpp-api/java/jvpp-ioampot/jvpp_ioam_pot.h
+++ b/extras/japi/java/jvpp-ioampot/jvpp_ioam_pot.h
diff --git a/src/vpp-api/java/jvpp-ioamtrace/io/fd/vpp/jvpp/ioamtrace/examples/IoamTraceApiExample.java b/extras/japi/java/jvpp-ioamtrace/io/fd/vpp/jvpp/ioamtrace/examples/IoamTraceApiExample.java
index d63d1372698..d63d1372698 100644
--- a/src/vpp-api/java/jvpp-ioamtrace/io/fd/vpp/jvpp/ioamtrace/examples/IoamTraceApiExample.java
+++ b/extras/japi/java/jvpp-ioamtrace/io/fd/vpp/jvpp/ioamtrace/examples/IoamTraceApiExample.java
diff --git a/src/vpp-api/java/jvpp-ioamtrace/io/fd/vpp/jvpp/ioamtrace/examples/Readme.txt b/extras/japi/java/jvpp-ioamtrace/io/fd/vpp/jvpp/ioamtrace/examples/Readme.txt
index e8c3907ec45..e8c3907ec45 100644
--- a/src/vpp-api/java/jvpp-ioamtrace/io/fd/vpp/jvpp/ioamtrace/examples/Readme.txt
+++ b/extras/japi/java/jvpp-ioamtrace/io/fd/vpp/jvpp/ioamtrace/examples/Readme.txt
diff --git a/src/vpp-api/java/jvpp-ioamtrace/io/fd/vpp/jvpp/ioamtrace/test/CallbackApiTest.java b/extras/japi/java/jvpp-ioamtrace/io/fd/vpp/jvpp/ioamtrace/test/CallbackApiTest.java
index 4a71db52c32..4a71db52c32 100644
--- a/src/vpp-api/java/jvpp-ioamtrace/io/fd/vpp/jvpp/ioamtrace/test/CallbackApiTest.java
+++ b/extras/japi/java/jvpp-ioamtrace/io/fd/vpp/jvpp/ioamtrace/test/CallbackApiTest.java
diff --git a/src/vpp-api/java/jvpp-ioamtrace/io/fd/vpp/jvpp/ioamtrace/test/FutureApiTest.java b/extras/japi/java/jvpp-ioamtrace/io/fd/vpp/jvpp/ioamtrace/test/FutureApiTest.java
index 4e13ed1fa15..4e13ed1fa15 100644
--- a/src/vpp-api/java/jvpp-ioamtrace/io/fd/vpp/jvpp/ioamtrace/test/FutureApiTest.java
+++ b/extras/japi/java/jvpp-ioamtrace/io/fd/vpp/jvpp/ioamtrace/test/FutureApiTest.java
diff --git a/src/vpp-api/java/jvpp-ioamtrace/io/fd/vpp/jvpp/ioamtrace/test/Readme.txt b/extras/japi/java/jvpp-ioamtrace/io/fd/vpp/jvpp/ioamtrace/test/Readme.txt
index 9a1ba829e4f..9a1ba829e4f 100644
--- a/src/vpp-api/java/jvpp-ioamtrace/io/fd/vpp/jvpp/ioamtrace/test/Readme.txt
+++ b/extras/japi/java/jvpp-ioamtrace/io/fd/vpp/jvpp/ioamtrace/test/Readme.txt
diff --git a/src/vpp-api/java/jvpp-ioamtrace/jvpp_ioam_trace.c b/extras/japi/java/jvpp-ioamtrace/jvpp_ioam_trace.c
index 3532d91e3a4..3532d91e3a4 100644
--- a/src/vpp-api/java/jvpp-ioamtrace/jvpp_ioam_trace.c
+++ b/extras/japi/java/jvpp-ioamtrace/jvpp_ioam_trace.c
diff --git a/src/vpp-api/java/jvpp-ioamtrace/jvpp_ioam_trace.h b/extras/japi/java/jvpp-ioamtrace/jvpp_ioam_trace.h
index 752b599f4b8..752b599f4b8 100644
--- a/src/vpp-api/java/jvpp-ioamtrace/jvpp_ioam_trace.h
+++ b/extras/japi/java/jvpp-ioamtrace/jvpp_ioam_trace.h
diff --git a/src/vpp-api/java/jvpp-nat/io/fd/vpp/jvpp/nat/examples/CallbackApiExample.java b/extras/japi/java/jvpp-nat/io/fd/vpp/jvpp/nat/examples/CallbackApiExample.java
index e0d93ff466d..e0d93ff466d 100644
--- a/src/vpp-api/java/jvpp-nat/io/fd/vpp/jvpp/nat/examples/CallbackApiExample.java
+++ b/extras/japi/java/jvpp-nat/io/fd/vpp/jvpp/nat/examples/CallbackApiExample.java
diff --git a/src/vpp-api/java/jvpp-nat/io/fd/vpp/jvpp/nat/examples/Readme.txt b/extras/japi/java/jvpp-nat/io/fd/vpp/jvpp/nat/examples/Readme.txt
index ac75e04eac5..ac75e04eac5 100644
--- a/src/vpp-api/java/jvpp-nat/io/fd/vpp/jvpp/nat/examples/Readme.txt
+++ b/extras/japi/java/jvpp-nat/io/fd/vpp/jvpp/nat/examples/Readme.txt
diff --git a/src/vpp-api/java/jvpp-nat/io/fd/vpp/jvpp/nat/test/CallbackApiTest.java b/extras/japi/java/jvpp-nat/io/fd/vpp/jvpp/nat/test/CallbackApiTest.java
index a6f82148adc..a6f82148adc 100644
--- a/src/vpp-api/java/jvpp-nat/io/fd/vpp/jvpp/nat/test/CallbackApiTest.java
+++ b/extras/japi/java/jvpp-nat/io/fd/vpp/jvpp/nat/test/CallbackApiTest.java
diff --git a/src/vpp-api/java/jvpp-nat/io/fd/vpp/jvpp/nat/test/FutureApiTest.java b/extras/japi/java/jvpp-nat/io/fd/vpp/jvpp/nat/test/FutureApiTest.java
index 26d6b98e443..26d6b98e443 100644
--- a/src/vpp-api/java/jvpp-nat/io/fd/vpp/jvpp/nat/test/FutureApiTest.java
+++ b/extras/japi/java/jvpp-nat/io/fd/vpp/jvpp/nat/test/FutureApiTest.java
diff --git a/src/vpp-api/java/jvpp-nat/io/fd/vpp/jvpp/nat/test/Readme.txt b/extras/japi/java/jvpp-nat/io/fd/vpp/jvpp/nat/test/Readme.txt
index 6f7580894e9..6f7580894e9 100644
--- a/src/vpp-api/java/jvpp-nat/io/fd/vpp/jvpp/nat/test/Readme.txt
+++ b/extras/japi/java/jvpp-nat/io/fd/vpp/jvpp/nat/test/Readme.txt
diff --git a/src/vpp-api/java/jvpp-nat/jvpp_nat.c b/extras/japi/java/jvpp-nat/jvpp_nat.c
index bdae1e64913..bdae1e64913 100644
--- a/src/vpp-api/java/jvpp-nat/jvpp_nat.c
+++ b/extras/japi/java/jvpp-nat/jvpp_nat.c
diff --git a/src/vpp-api/java/jvpp-nat/jvpp_nat.h b/extras/japi/java/jvpp-nat/jvpp_nat.h
index 9bff974a976..9bff974a976 100644
--- a/src/vpp-api/java/jvpp-nat/jvpp_nat.h
+++ b/extras/japi/java/jvpp-nat/jvpp_nat.h
diff --git a/src/vpp-api/java/jvpp-pppoe/jvpp_pppoe.c b/extras/japi/java/jvpp-pppoe/jvpp_pppoe.c
index 02bd20e6bb4..02bd20e6bb4 100644
--- a/src/vpp-api/java/jvpp-pppoe/jvpp_pppoe.c
+++ b/extras/japi/java/jvpp-pppoe/jvpp_pppoe.c
diff --git a/src/vpp-api/java/jvpp-pppoe/jvpp_pppoe.h b/extras/japi/java/jvpp-pppoe/jvpp_pppoe.h
index 7606a7ef86e..7606a7ef86e 100644
--- a/src/vpp-api/java/jvpp-pppoe/jvpp_pppoe.h
+++ b/extras/japi/java/jvpp-pppoe/jvpp_pppoe.h
diff --git a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/AbstractCallbackApiTest.java b/extras/japi/java/jvpp-registry/io/fd/vpp/jvpp/AbstractCallbackApiTest.java
index d221d1e0c71..d221d1e0c71 100644
--- a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/AbstractCallbackApiTest.java
+++ b/extras/japi/java/jvpp-registry/io/fd/vpp/jvpp/AbstractCallbackApiTest.java
diff --git a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/Assertions.java b/extras/japi/java/jvpp-registry/io/fd/vpp/jvpp/Assertions.java
index f8b591f5ef2..f8b591f5ef2 100644
--- a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/Assertions.java
+++ b/extras/japi/java/jvpp-registry/io/fd/vpp/jvpp/Assertions.java
diff --git a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/JVpp.java b/extras/japi/java/jvpp-registry/io/fd/vpp/jvpp/JVpp.java
index 55f25a7bd2e..55f25a7bd2e 100644
--- a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/JVpp.java
+++ b/extras/japi/java/jvpp-registry/io/fd/vpp/jvpp/JVpp.java
diff --git a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/JVppRegistry.java b/extras/japi/java/jvpp-registry/io/fd/vpp/jvpp/JVppRegistry.java
index 6535db02358..6535db02358 100644
--- a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/JVppRegistry.java
+++ b/extras/japi/java/jvpp-registry/io/fd/vpp/jvpp/JVppRegistry.java
diff --git a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/JVppRegistryImpl.java b/extras/japi/java/jvpp-registry/io/fd/vpp/jvpp/JVppRegistryImpl.java
index baef14c3865..baef14c3865 100644
--- a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/JVppRegistryImpl.java
+++ b/extras/japi/java/jvpp-registry/io/fd/vpp/jvpp/JVppRegistryImpl.java
diff --git a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/NativeLibraryLoader.java b/extras/japi/java/jvpp-registry/io/fd/vpp/jvpp/NativeLibraryLoader.java
index ce6d1bfc982..ce6d1bfc982 100644
--- a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/NativeLibraryLoader.java
+++ b/extras/japi/java/jvpp-registry/io/fd/vpp/jvpp/NativeLibraryLoader.java
diff --git a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/VppBaseCallException.java b/extras/japi/java/jvpp-registry/io/fd/vpp/jvpp/VppBaseCallException.java
index 7fc1682ba73..7fc1682ba73 100644
--- a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/VppBaseCallException.java
+++ b/extras/japi/java/jvpp-registry/io/fd/vpp/jvpp/VppBaseCallException.java
diff --git a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/VppCallbackException.java b/extras/japi/java/jvpp-registry/io/fd/vpp/jvpp/VppCallbackException.java
index adcc5d26268..adcc5d26268 100644
--- a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/VppCallbackException.java
+++ b/extras/japi/java/jvpp-registry/io/fd/vpp/jvpp/VppCallbackException.java
diff --git a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/VppConnection.java b/extras/japi/java/jvpp-registry/io/fd/vpp/jvpp/VppConnection.java
index e6fd3bdb257..e6fd3bdb257 100644
--- a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/VppConnection.java
+++ b/extras/japi/java/jvpp-registry/io/fd/vpp/jvpp/VppConnection.java
diff --git a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/VppInvocationException.java b/extras/japi/java/jvpp-registry/io/fd/vpp/jvpp/VppInvocationException.java
index a7ccb197e00..a7ccb197e00 100644
--- a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/VppInvocationException.java
+++ b/extras/japi/java/jvpp-registry/io/fd/vpp/jvpp/VppInvocationException.java
diff --git a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/VppJNIConnection.java b/extras/japi/java/jvpp-registry/io/fd/vpp/jvpp/VppJNIConnection.java
index 6a414f36b88..6a414f36b88 100644
--- a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/VppJNIConnection.java
+++ b/extras/japi/java/jvpp-registry/io/fd/vpp/jvpp/VppJNIConnection.java
diff --git a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/callback/ControlPingCallback.java b/extras/japi/java/jvpp-registry/io/fd/vpp/jvpp/callback/ControlPingCallback.java
index efddfdbb96c..efddfdbb96c 100644
--- a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/callback/ControlPingCallback.java
+++ b/extras/japi/java/jvpp-registry/io/fd/vpp/jvpp/callback/ControlPingCallback.java
diff --git a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/callback/JVppCallback.java b/extras/japi/java/jvpp-registry/io/fd/vpp/jvpp/callback/JVppCallback.java
index ae02063bb2f..ae02063bb2f 100644
--- a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/callback/JVppCallback.java
+++ b/extras/japi/java/jvpp-registry/io/fd/vpp/jvpp/callback/JVppCallback.java
diff --git a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/callback/JVppNotificationCallback.java b/extras/japi/java/jvpp-registry/io/fd/vpp/jvpp/callback/JVppNotificationCallback.java
index 8ab0cb2140f..8ab0cb2140f 100644
--- a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/callback/JVppNotificationCallback.java
+++ b/extras/japi/java/jvpp-registry/io/fd/vpp/jvpp/callback/JVppNotificationCallback.java
diff --git a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/coverity/SuppressFBWarnings.java b/extras/japi/java/jvpp-registry/io/fd/vpp/jvpp/coverity/SuppressFBWarnings.java
index 1e780bb459e..1e780bb459e 100644
--- a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/coverity/SuppressFBWarnings.java
+++ b/extras/japi/java/jvpp-registry/io/fd/vpp/jvpp/coverity/SuppressFBWarnings.java
diff --git a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/ControlPing.java b/extras/japi/java/jvpp-registry/io/fd/vpp/jvpp/dto/ControlPing.java
index 984e1674e83..984e1674e83 100644
--- a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/ControlPing.java
+++ b/extras/japi/java/jvpp-registry/io/fd/vpp/jvpp/dto/ControlPing.java
diff --git a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/ControlPingReply.java b/extras/japi/java/jvpp-registry/io/fd/vpp/jvpp/dto/ControlPingReply.java
index 61e4d0e423b..61e4d0e423b 100644
--- a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/ControlPingReply.java
+++ b/extras/japi/java/jvpp-registry/io/fd/vpp/jvpp/dto/ControlPingReply.java
diff --git a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppDump.java b/extras/japi/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppDump.java
index 60b98984d9e..60b98984d9e 100644
--- a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppDump.java
+++ b/extras/japi/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppDump.java
diff --git a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppReply.java b/extras/japi/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppReply.java
index 73f512d42d6..73f512d42d6 100644
--- a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppReply.java
+++ b/extras/japi/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppReply.java
diff --git a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppReplyDump.java b/extras/japi/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppReplyDump.java
index 15111395f9c..15111395f9c 100644
--- a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppReplyDump.java
+++ b/extras/japi/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppReplyDump.java
diff --git a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppRequest.java b/extras/japi/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppRequest.java
index 9b301da20cf..9b301da20cf 100644
--- a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppRequest.java
+++ b/extras/japi/java/jvpp-registry/io/fd/vpp/jvpp/dto/JVppRequest.java
diff --git a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/future/AbstractFutureJVppInvoker.java b/extras/japi/java/jvpp-registry/io/fd/vpp/jvpp/future/AbstractFutureJVppInvoker.java
index ac85f5309ec..ac85f5309ec 100644
--- a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/future/AbstractFutureJVppInvoker.java
+++ b/extras/japi/java/jvpp-registry/io/fd/vpp/jvpp/future/AbstractFutureJVppInvoker.java
diff --git a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/future/FutureJVppInvoker.java b/extras/japi/java/jvpp-registry/io/fd/vpp/jvpp/future/FutureJVppInvoker.java
index 65250ed5a8f..65250ed5a8f 100644
--- a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/future/FutureJVppInvoker.java
+++ b/extras/japi/java/jvpp-registry/io/fd/vpp/jvpp/future/FutureJVppInvoker.java
diff --git a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/notification/EventRegistry.java b/extras/japi/java/jvpp-registry/io/fd/vpp/jvpp/notification/EventRegistry.java
index 12515a519e7..12515a519e7 100644
--- a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/notification/EventRegistry.java
+++ b/extras/japi/java/jvpp-registry/io/fd/vpp/jvpp/notification/EventRegistry.java
diff --git a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/notification/EventRegistryProvider.java b/extras/japi/java/jvpp-registry/io/fd/vpp/jvpp/notification/EventRegistryProvider.java
index 1ac5d55335b..1ac5d55335b 100644
--- a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/notification/EventRegistryProvider.java
+++ b/extras/japi/java/jvpp-registry/io/fd/vpp/jvpp/notification/EventRegistryProvider.java
diff --git a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/test/ConnectionTest.java b/extras/japi/java/jvpp-registry/io/fd/vpp/jvpp/test/ConnectionTest.java
index 27b4d29f866..27b4d29f866 100644
--- a/src/vpp-api/java/jvpp-registry/io/fd/vpp/jvpp/test/ConnectionTest.java
+++ b/extras/japi/java/jvpp-registry/io/fd/vpp/jvpp/test/ConnectionTest.java
diff --git a/src/vpp-api/java/jvpp-registry/jvpp_registry.c b/extras/japi/java/jvpp-registry/jvpp_registry.c
index bbe9719c30f..bbe9719c30f 100644
--- a/src/vpp-api/java/jvpp-registry/jvpp_registry.c
+++ b/extras/japi/java/jvpp-registry/jvpp_registry.c
diff --git a/src/vpp-api/java/jvpp/gen/jvpp_gen.py b/extras/japi/java/jvpp/gen/jvpp_gen.py
index 067a92f86be..067a92f86be 100755
--- a/src/vpp-api/java/jvpp/gen/jvpp_gen.py
+++ b/extras/japi/java/jvpp/gen/jvpp_gen.py
diff --git a/src/vpp-api/java/jvpp/gen/jvppgen/__init__.py b/extras/japi/java/jvpp/gen/jvppgen/__init__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/src/vpp-api/java/jvpp/gen/jvppgen/__init__.py
+++ b/extras/japi/java/jvpp/gen/jvppgen/__init__.py
diff --git a/src/vpp-api/java/jvpp/gen/jvppgen/callback_gen.py b/extras/japi/java/jvpp/gen/jvppgen/callback_gen.py
index 14aa8b760a5..14aa8b760a5 100755
--- a/src/vpp-api/java/jvpp/gen/jvppgen/callback_gen.py
+++ b/extras/japi/java/jvpp/gen/jvppgen/callback_gen.py
diff --git a/src/vpp-api/java/jvpp/gen/jvppgen/dto_gen.py b/extras/japi/java/jvpp/gen/jvppgen/dto_gen.py
index ca015a30456..ca015a30456 100755
--- a/src/vpp-api/java/jvpp/gen/jvppgen/dto_gen.py
+++ b/extras/japi/java/jvpp/gen/jvppgen/dto_gen.py
diff --git a/src/vpp-api/java/jvpp/gen/jvppgen/enums_gen.py b/extras/japi/java/jvpp/gen/jvppgen/enums_gen.py
index 8ba96558428..8ba96558428 100755
--- a/src/vpp-api/java/jvpp/gen/jvppgen/enums_gen.py
+++ b/extras/japi/java/jvpp/gen/jvppgen/enums_gen.py
diff --git a/src/vpp-api/java/jvpp/gen/jvppgen/jni_common_gen.py b/extras/japi/java/jvpp/gen/jvppgen/jni_common_gen.py
index 397b92b528f..397b92b528f 100755
--- a/src/vpp-api/java/jvpp/gen/jvppgen/jni_common_gen.py
+++ b/extras/japi/java/jvpp/gen/jvppgen/jni_common_gen.py
diff --git a/src/vpp-api/java/jvpp/gen/jvppgen/jni_gen.py b/extras/japi/java/jvpp/gen/jvppgen/jni_gen.py
index ad6c2614062..ad6c2614062 100755
--- a/src/vpp-api/java/jvpp/gen/jvppgen/jni_gen.py
+++ b/extras/japi/java/jvpp/gen/jvppgen/jni_gen.py
diff --git a/src/vpp-api/java/jvpp/gen/jvppgen/jni_impl_gen.py b/extras/japi/java/jvpp/gen/jvppgen/jni_impl_gen.py
index bf7523670a4..bf7523670a4 100755
--- a/src/vpp-api/java/jvpp/gen/jvppgen/jni_impl_gen.py
+++ b/extras/japi/java/jvpp/gen/jvppgen/jni_impl_gen.py
diff --git a/src/vpp-api/java/jvpp/gen/jvppgen/jni_msg_handlers_gen.py b/extras/japi/java/jvpp/gen/jvppgen/jni_msg_handlers_gen.py
index 8f6410f1af2..8f6410f1af2 100755
--- a/src/vpp-api/java/jvpp/gen/jvppgen/jni_msg_handlers_gen.py
+++ b/extras/japi/java/jvpp/gen/jvppgen/jni_msg_handlers_gen.py
diff --git a/src/vpp-api/java/jvpp/gen/jvppgen/jni_type_handlers_gen.py b/extras/japi/java/jvpp/gen/jvppgen/jni_type_handlers_gen.py
index a76aadf468c..a76aadf468c 100755
--- a/src/vpp-api/java/jvpp/gen/jvppgen/jni_type_handlers_gen.py
+++ b/extras/japi/java/jvpp/gen/jvppgen/jni_type_handlers_gen.py
diff --git a/src/vpp-api/java/jvpp/gen/jvppgen/jvpp_callback_facade_gen.py b/extras/japi/java/jvpp/gen/jvppgen/jvpp_callback_facade_gen.py
index c5634de2e48..c5634de2e48 100644
--- a/src/vpp-api/java/jvpp/gen/jvppgen/jvpp_callback_facade_gen.py
+++ b/extras/japi/java/jvpp/gen/jvppgen/jvpp_callback_facade_gen.py
diff --git a/src/vpp-api/java/jvpp/gen/jvppgen/jvpp_common_gen.py b/extras/japi/java/jvpp/gen/jvppgen/jvpp_common_gen.py
index 83226ea78ac..83226ea78ac 100755
--- a/src/vpp-api/java/jvpp/gen/jvppgen/jvpp_common_gen.py
+++ b/extras/japi/java/jvpp/gen/jvppgen/jvpp_common_gen.py
diff --git a/src/vpp-api/java/jvpp/gen/jvppgen/jvpp_future_facade_gen.py b/extras/japi/java/jvpp/gen/jvppgen/jvpp_future_facade_gen.py
index 47a9985144d..47a9985144d 100644
--- a/src/vpp-api/java/jvpp/gen/jvppgen/jvpp_future_facade_gen.py
+++ b/extras/japi/java/jvpp/gen/jvppgen/jvpp_future_facade_gen.py
diff --git a/src/vpp-api/java/jvpp/gen/jvppgen/jvpp_ifc_gen.py b/extras/japi/java/jvpp/gen/jvppgen/jvpp_ifc_gen.py
index e2b2922ed20..e2b2922ed20 100755
--- a/src/vpp-api/java/jvpp/gen/jvppgen/jvpp_ifc_gen.py
+++ b/extras/japi/java/jvpp/gen/jvppgen/jvpp_ifc_gen.py
diff --git a/src/vpp-api/java/jvpp/gen/jvppgen/jvpp_impl_gen.py b/extras/japi/java/jvpp/gen/jvppgen/jvpp_impl_gen.py
index aff8d7fc99c..aff8d7fc99c 100755
--- a/src/vpp-api/java/jvpp/gen/jvppgen/jvpp_impl_gen.py
+++ b/extras/japi/java/jvpp/gen/jvppgen/jvpp_impl_gen.py
diff --git a/src/vpp-api/java/jvpp/gen/jvppgen/jvpp_model.py b/extras/japi/java/jvpp/gen/jvppgen/jvpp_model.py
index 299796b908b..299796b908b 100755
--- a/src/vpp-api/java/jvpp/gen/jvppgen/jvpp_model.py
+++ b/extras/japi/java/jvpp/gen/jvppgen/jvpp_model.py
diff --git a/src/vpp-api/java/jvpp/gen/jvppgen/notification_gen.py b/extras/japi/java/jvpp/gen/jvppgen/notification_gen.py
index 69e870ed33d..69e870ed33d 100644
--- a/src/vpp-api/java/jvpp/gen/jvppgen/notification_gen.py
+++ b/extras/japi/java/jvpp/gen/jvppgen/notification_gen.py
diff --git a/src/vpp-api/java/jvpp/gen/jvppgen/types_gen.py b/extras/japi/java/jvpp/gen/jvppgen/types_gen.py
index 3767b530347..3767b530347 100755
--- a/src/vpp-api/java/jvpp/gen/jvppgen/types_gen.py
+++ b/extras/japi/java/jvpp/gen/jvppgen/types_gen.py
diff --git a/src/vpp-api/java/jvpp/gen/jvppgen/unions_gen.py b/extras/japi/java/jvpp/gen/jvppgen/unions_gen.py
index f67704f2426..f67704f2426 100755
--- a/src/vpp-api/java/jvpp/gen/jvppgen/unions_gen.py
+++ b/extras/japi/java/jvpp/gen/jvppgen/unions_gen.py
diff --git a/src/m4/ax_vpp_find_jdk8.m4 b/extras/japi/m4/ax_vpp_find_jdk8.m4
index 94b785038f7..94b785038f7 100644
--- a/src/m4/ax_vpp_find_jdk8.m4
+++ b/extras/japi/m4/ax_vpp_find_jdk8.m4
diff --git a/extras/rpm/vpp-suse.spec b/extras/rpm/vpp-suse.spec
index ea62eee7f9b..7fea9fe5331 100644
--- a/extras/rpm/vpp-suse.spec
+++ b/extras/rpm/vpp-suse.spec
@@ -227,7 +227,7 @@ done
 
 # Java bindings
 mkdir -p -m755 %{buildroot}%{_datadir}/java
-for file in $(find %{_vpp_install_dir}/vpp/share/java -type f -name '*.jar' -print )
+for file in $(find %{_vpp_install_dir}/japi/share/java -type f -name '*.jar' -print )
 do
         install -p -m 644 $file %{buildroot}%{_datadir}/java
 done
@@ -258,8 +258,8 @@ do
 done
 
 mkdir -p -m755 %{buildroot}%{python_sitelib}/jvppgen
-install -p -m755 %{_vpp_build_dir}/../src/vpp-api/java/jvpp/gen/jvpp_gen.py %{buildroot}%{_prefix}/bin
-for i in $(ls %{_vpp_build_dir}/../src/vpp-api/java/jvpp/gen/jvppgen/*.py); do
+install -p -m755 %{_vpp_build_dir}/../extras/japi/java/jvpp/gen/jvpp_gen.py %{buildroot}%{_prefix}/bin
+for i in $(ls %{_vpp_build_dir}/../extras/japi/java/jvpp/gen/jvppgen/*.py); do
    install -p -m755 ${i} %{buildroot}%{python_sitelib}/jvppgen
 done;
 
diff --git a/extras/rpm/vpp.spec b/extras/rpm/vpp.spec
index c6951bf4fab..69d4d6b1cb1 100644
--- a/extras/rpm/vpp.spec
+++ b/extras/rpm/vpp.spec
@@ -223,7 +223,7 @@ done
 
 # Java bindings
 mkdir -p -m755 %{buildroot}/usr/share/java
-for file in $(find %{_mu_build_dir}/%{_vpp_install_dir}/vpp/share/java -type f -name '*.jar' -print )
+for file in $(find %{_mu_build_dir}/%{_vpp_install_dir}/japi/share/java -type f -name '*.jar' -print )
 do
 	install -p -m 644 $file %{buildroot}/usr/share/java
 done
@@ -260,8 +260,8 @@ do
 done
 
 mkdir -p -m755 %{buildroot}%{python2_sitelib}/jvppgen
-install -p -m755 %{_mu_build_dir}/../src/vpp-api/java/jvpp/gen/jvpp_gen.py %{buildroot}/usr/bin
-for i in $(ls %{_mu_build_dir}/../src/vpp-api/java/jvpp/gen/jvppgen/*.py); do
+install -p -m755 %{_mu_build_dir}/../extras/japi/java/jvpp/gen/jvpp_gen.py %{buildroot}/usr/bin
+for i in $(ls %{_mu_build_dir}/../extras/japi/java/jvpp/gen/jvppgen/*.py); do
    install -p -m666 ${i} %{buildroot}%{python2_sitelib}/jvppgen
 done;
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 68cff7852ef..f5fa3398ea4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -78,10 +78,6 @@ include vpp-api.am
 SUBDIRS += vpp-api/python
 endif
 
-if ENABLE_JAPI
-SUBDIRS += vpp-api/java
-endif
-
 ###############################################################################
 # API
 ###############################################################################
diff --git a/src/configure.ac b/src/configure.ac
index d4c7a7576d3..7733daa6599 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -7,7 +7,6 @@ AC_CONFIG_FILES([ \
   Makefile \
   plugins/Makefile \
   vpp-api/python/Makefile \
-  vpp-api/java/Makefile \
   vpp-api/vapi/Makefile \
   vlib/config.h \
   vppinfra/config.h \
@@ -197,7 +196,6 @@ ENABLE_ARG(dlmalloc,    [Enable dlmalloc])
 DISABLE_ARG(vlib,	[Disable vlib and dependant libs and binaries])
 DISABLE_ARG(svm,	[Disable svm and dependant libs and binaries])
 DISABLE_ARG(papi,	[Disable Python API bindings])
-DISABLE_ARG(japi,	[Disable Java API bindings])
 
 # --with-X
 
@@ -417,19 +415,6 @@ AM_COND_IF([WITH_LIBSSL],
 ])
 
 ###############################################################################
-# JAVA
-###############################################################################
-
-AM_COND_IF([ENABLE_JAPI],
-[
-  AX_VPP_FIND_JDK8
-  AC_SUBST(JAVA_HOME)
-  AC_SUBST(JAVAC)
-  AC_SUBST(JAVAH)
-  AC_SUBST(JAR)
-])
-
-###############################################################################
 # PYTHON
 ###############################################################################
 
@@ -454,11 +439,6 @@ PRINT_VAL([CPPFLAGS], ${CPPFLAGS})
 PRINT_VAL([LDFLAGS], ${LDFLAGS})
 PRINT_VAL([LOG2_CACHE_LINE_BYTES], ${with_log2_cache_line_bytes})
 PRINT_VAL([DLMALLOC], ${enable_dlmalloc})
-AM_COND_IF([ENABLE_JAPI],
-[
-  PRINT_VAL([JAVA_VERSION], ${JAVA_VERSION})
-  PRINT_VAL([JAVA_HOME], ${JAVA_HOME})
-])
 
 AC_MSG_RESULT([])
 AC_MSG_RESULT([with:])
diff --git a/src/plugins/ioam.am b/src/plugins/ioam.am
index 4ac69aacd53..dd59736c028 100644
--- a/src/plugins/ioam.am
+++ b/src/plugins/ioam.am
@@ -70,7 +70,6 @@ IOAM_TRACE_SRC =				\
 	ioam/lib-trace/trace_api.c
 
 IOAM_TRACE_NOINST_HDR =                 \
-  ioam/export/ioam_export_all_api_h.h   \
   ioam/lib-trace/trace_all_api_h.h	\
   ioam/lib-trace/trace_msg_enum.h	\
   ioam/lib-trace/trace.api.h		\
@@ -107,7 +106,6 @@ IOAM_VXLAN_GPE_SRC =					\
 	ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_thread.c
 
 IOAM_VXLAN_GPE_NOINST_HDR =                       		\
-  ioam/export/ioam_export_all_api_h.h   			\
   ioam/lib-vxlan-gpe/vxlan_gpe_all_api_h.h			\
   ioam/lib-vxlan-gpe/vxlan_gpe_msg_enum.h			\
   ioam/lib-vxlan-gpe/ioam_vxlan_gpe.api.h			\
@@ -233,7 +231,7 @@ API_FILES +=				            \
         $(IOAM_IP6_MANYCAST_API)        \
 		$(UDP_PING_API)
 
-noinst_HEADERS +=                               \
+nobase_apiinclude_HEADERS +=                               \
         $(IOAM_POT_NOINST_HDR)                  \
         $(IOAM_EXPORT_NOINST_HDR)               \
         $(IOAM_TRACE_NOINST_HDR)                \
diff --git a/src/vppinfra.am b/src/vppinfra.am
index 840ce27fb5a..57f7a1f7e3b 100644
--- a/src/vppinfra.am
+++ b/src/vppinfra.am
@@ -237,6 +237,7 @@ nobase_include_HEADERS = \
   vppinfra/memcpy_avx512.h \
   vppinfra/mhash.h \
   vppinfra/mheap.h \
+  vppinfra/mheap_bootstrap.h \
   vppinfra/os.h \
   vppinfra/pipeline.h \
   vppinfra/pool.h \
diff --git a/test/test_jvpp.py b/test/test_jvpp.py
index 9cb787f1471..36dbdb2b391 100644
--- a/test/test_jvpp.py
+++ b/test/test_jvpp.py
@@ -2,16 +2,18 @@
 
 import os
 import subprocess
+import unittest
 
-from framework import VppTestCase
+from framework import VppTestCase, running_extended_tests
 
 # Api files path
-API_FILES_PATH = "vpp/vpp-api/java"
+API_FILES_PATH = "japi/java"
 
 # Registry jar file name prefix
 REGISTRY_JAR_PREFIX = "jvpp-registry"
 
 
+@unittest.skipUnless(running_extended_tests(), "part of extended tests")
 class TestJVpp(VppTestCase):
     """ JVPP Core Test Case """