From 9042dd9e0c9c9c29d3918007305033fd9c17d669 Mon Sep 17 00:00:00 2001
From: Maros Marsalek <mmarsale@cisco.com>
Date: Fri, 29 Jul 2016 15:04:39 +0200
Subject: HONEYCOMB-130: Create vpp-integration distribution

And remove v3po-karaf. No need for plugins to create karaf distro,
instead plugins are required to add their features into vpp-integration

Change-Id: I74c29843ee7927bcc4456fbe2bfb52506225078f
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
---
 v3po/Readme.adoc   |  7 ++++++
 v3po/karaf/pom.xml | 74 ------------------------------------------------------
 v3po/pom.xml       |  1 -
 3 files changed, 7 insertions(+), 75 deletions(-)
 create mode 100644 v3po/Readme.adoc
 delete mode 100644 v3po/karaf/pom.xml

(limited to 'v3po')

diff --git a/v3po/Readme.adoc b/v3po/Readme.adoc
new file mode 100644
index 000000000..96d1d5a9b
--- /dev/null
+++ b/v3po/Readme.adoc
@@ -0,0 +1,7 @@
+= V3po
+
+This is a Honeycomb plugin providing mapping code between HC and VPP core APIs.
+
+== Usage
+
+Refer to postman_rest_collection.json for sample requests. All capabilities of V3po are demo-ed there
\ No newline at end of file
diff --git a/v3po/karaf/pom.xml b/v3po/karaf/pom.xml
deleted file mode 100644
index 1325a988d..000000000
--- a/v3po/karaf/pom.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2015 Cisco and/or its affiliates.
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at:
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <parent>
-    <groupId>io.fd.honeycomb.common</groupId>
-    <artifactId>karaf-parent</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <relativePath>../../common/karaf-parent</relativePath>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>io.fd.honeycomb.v3po</groupId>
-  <artifactId>v3po-karaf</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
-  <name>${project.artifactId}</name>
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
-  <properties>
-    <karaf.localFeature>odl-honeycomb-v3po-rest</karaf.localFeature>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <!-- scope is compile so all features (there is only one) are installed
-      into startup.properties and the feature repo itself is not installed -->
-      <groupId>org.apache.karaf.features</groupId>
-      <artifactId>framework</artifactId>
-      <type>kar</type>
-    </dependency>
-
-    <dependency>
-      <groupId>io.fd.honeycomb</groupId>
-      <artifactId>honeycomb-features</artifactId>
-      <version>${project.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>v3po-features</artifactId>
-      <version>${project.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-  </dependencies>
-  <!-- DO NOT install or deploy the karaf artifact -->
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/v3po/pom.xml b/v3po/pom.xml
index 0d356d47f..f7cb1c2ba 100644
--- a/v3po/pom.xml
+++ b/v3po/pom.xml
@@ -35,7 +35,6 @@
     <module>api</module>
     <module>v3po2vpp</module>
     <module>features</module>
-    <module>karaf</module>
   </modules>
   <!-- DO NOT install or deploy the repo root pom as it's only needed to initiate a build -->
   <build>
-- 
cgit 1.2.3-korg