From 4e633e1043e867fd24badeb0405f794793beb9a9 Mon Sep 17 00:00:00 2001 From: Michal Cmarada Date: Thu, 31 Jan 2019 10:57:40 +0100 Subject: VPP-1504: Remove JVPP As part of JVPP migration this removes JVPP completely from VPP. Change-Id: I6b74e7961aa474ae471e63fe43a624cd9fc3659b Signed-off-by: Michal Cmarada --- docs/gettingstarted/developers/building.rst | 6 +-- .../developers/buildsystem/buildrootmakefile.rst | 2 +- docs/gettingstarted/installing/centos.rst | 2 +- docs/gettingstarted/installing/packages.rst | 5 --- docs/gettingstarted/installing/ubuntu.rst | 2 +- .../users/configutil/commandfour.rst | 2 - docs/reference/index.rst | 1 - docs/reference/jvpp.rst | 47 ---------------------- 8 files changed, 6 insertions(+), 61 deletions(-) delete mode 100644 docs/reference/jvpp.rst (limited to 'docs') diff --git a/docs/gettingstarted/developers/building.rst b/docs/gettingstarted/developers/building.rst index 37dacf1e2da..3c6c3b96e8f 100644 --- a/docs/gettingstarted/developers/building.rst +++ b/docs/gettingstarted/developers/building.rst @@ -159,9 +159,9 @@ Once the packages are built they can be found in the build-root directory. If the packages are built correctly, then this should be the corresponding output: vpp_18.07-rc0~456-gb361076_amd64.deb vpp-dbg_18.07-rc0~456-gb361076_amd64.deb - vpp-api-java_18.07-rc0~456-gb361076_amd64.deb vpp-dev_18.07-rc0~456-gb361076_amd64.deb - vpp-api-lua_18.07-rc0~456-gb361076_amd64.deb vpp-lib_18.07-rc0~456-gb361076_amd64.deb - vpp-api-python_18.07-rc0~456-gb361076_amd64.deb vpp-plugins_18.07-rc0~456-gb361076_amd64.deb + vpp-dev_18.07-rc0~456-gb361076_amd64.deb vpp-api-lua_18.07-rc0~456-gb361076_amd64.deb + vpp-lib_18.07-rc0~456-gb361076_amd64.deb vpp-api-python_18.07-rc0~456-gb361076_amd64.deb + vpp-plugins_18.07-rc0~456-gb361076_amd64.deb Finally, the created packages can be installed using the following commands. Install the package that correspnds to OS that VPP will be running on: diff --git a/docs/gettingstarted/developers/buildsystem/buildrootmakefile.rst b/docs/gettingstarted/developers/buildsystem/buildrootmakefile.rst index ef736220b25..089c15afefd 100644 --- a/docs/gettingstarted/developers/buildsystem/buildrootmakefile.rst +++ b/docs/gettingstarted/developers/buildsystem/buildrootmakefile.rst @@ -159,7 +159,7 @@ Here are the contents of .../build-data/platforms/vpp.mk: # Uncoment to enable building unit tests # vpp_enable_tests = yes - vpp_root_packages = vpp vom japi + vpp_root_packages = vpp vom # DPDK configuration parameters # vpp_uses_dpdk_mlx4_pmd = yes diff --git a/docs/gettingstarted/installing/centos.rst b/docs/gettingstarted/installing/centos.rst index 07268524a01..133d3093464 100644 --- a/docs/gettingstarted/installing/centos.rst +++ b/docs/gettingstarted/installing/centos.rst @@ -193,7 +193,7 @@ needed: .. code-block:: console - $ sudo yum install vpp-plugins vpp-devel vpp-api-python vpp-api-lua vpp-api-java + $ sudo yum install vpp-plugins vpp-devel vpp-api-python vpp-api-lua Starting VPP ============ diff --git a/docs/gettingstarted/installing/packages.rst b/docs/gettingstarted/installing/packages.rst index 55ddf05fdad..719fffb67f8 100644 --- a/docs/gettingstarted/installing/packages.rst +++ b/docs/gettingstarted/installing/packages.rst @@ -60,11 +60,6 @@ vpp-dev Vector Packet Processing development support. This package contains development support files for the VPP libraries. -vpp-api-java ------------- - -JAVA binding for the VPP Binary API. - vpp-api-python -------------- diff --git a/docs/gettingstarted/installing/ubuntu.rst b/docs/gettingstarted/installing/ubuntu.rst index f887597f1bb..32050334f5b 100644 --- a/docs/gettingstarted/installing/ubuntu.rst +++ b/docs/gettingstarted/installing/ubuntu.rst @@ -95,7 +95,7 @@ Install the optional packages by running the following command: .. code-block:: console - sudo apt-get install vpp-dbg vpp-dev vpp-api-java vpp-api-python vpp-api-lua + sudo apt-get install vpp-dbg vpp-dev vpp-api-python vpp-api-lua Uninstall the Packages diff --git a/docs/gettingstarted/users/configutil/commandfour.rst b/docs/gettingstarted/users/configutil/commandfour.rst index 6a1b82e1da5..ea7c0a29480 100644 --- a/docs/gettingstarted/users/configutil/commandfour.rst +++ b/docs/gettingstarted/users/configutil/commandfour.rst @@ -27,7 +27,6 @@ Uninstalling the packages: These packages are installed on node localhost Name Version vpp 18.04-release - vpp-api-java 18.04-release vpp-api-lua 18.04-release vpp-api-python 18.04-release vpp-dbg 18.04-release @@ -88,7 +87,6 @@ Installing the packages: These packages are installed on node localhost Name Version vpp 18.04-release - vpp-api-java 18.04-release vpp-api-lua 18.04-release vpp-api-python 18.04-release vpp-dbg 18.04-release diff --git a/docs/reference/index.rst b/docs/reference/index.rst index 8e143c5acc7..76156a2a07d 100644 --- a/docs/reference/index.rst +++ b/docs/reference/index.rst @@ -9,6 +9,5 @@ Reference cmdreference/index.rst vppvagrant/index.rst - jvpp.rst readthedocs/index.rst github/index.rst diff --git a/docs/reference/jvpp.rst b/docs/reference/jvpp.rst deleted file mode 100644 index 7dab4876782..00000000000 --- a/docs/reference/jvpp.rst +++ /dev/null @@ -1,47 +0,0 @@ -.. _jvpp: - -.. toctree:: - -Getting jvpp jar -================ - -VPP provides java bindings which can be downloaded at: - -* https://nexus.fd.io/content/repositories/fd.io.release/io/fd/vpp/jvpp-core/18.01/jvpp-core-18.01.jar - -Getting jvpp via maven ------------------------------------- - -**1. Add the following to the repositories section in your ~/.m2/settings.xml to pick up the fd.io maven repo:** - -.. code-block:: console - - - fd.io-release - fd.io-release - https://nexus.fd.io/content/repositories/fd.io.release/ - - false - - - true - - - -For more information on setting up maven repositories in settings.xml, please look at: - -* https://maven.apache.org/guides/mini/guide-multiple-repositories.html - -**2. Then you can get jvpp by putting in the dependencies section of your pom.xml file:** - -.. code-block:: console - - - io.fd.vpp - jvpp-core - 17.10 - - -For more information on maven dependency managment, please look at: - -* https://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html -- cgit 1.2.3-korg