summaryrefslogtreecommitdiffstats
path: root/vpp-integration
diff options
context:
space:
mode:
authorMaros Marsalek <mmarsale@cisco.com>2016-08-16 11:04:00 +0200
committerMaros Marsalek <mmarsale@cisco.com>2016-08-19 12:49:56 +0200
commitcc9fb398ae2436bc2df071213d02a63e2d573155 (patch)
tree306ad5cf3a14bea49e7bb94f189c680b1346ff18 /vpp-integration
parent23a5fe799bb20911f32b5574c71cc26446db493b (diff)
HONEYCOMB-22: Remove karaf based distribution and wiring
Change-Id: I48aafb726de53b6ad3fb9b97c202f712dfa4a540 Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
Diffstat (limited to 'vpp-integration')
-rw-r--r--vpp-integration/features/pom.xml59
-rw-r--r--vpp-integration/features/src/main/features/features.xml46
-rw-r--r--vpp-integration/karaf/pom.xml92
-rw-r--r--vpp-integration/pom.xml2
4 files changed, 0 insertions, 199 deletions
diff --git a/vpp-integration/features/pom.xml b/vpp-integration/features/pom.xml
deleted file mode 100644
index 9e8930dec..000000000
--- a/vpp-integration/features/pom.xml
+++ /dev/null
@@ -1,59 +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>features-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <relativePath>../../common/features-parent</relativePath>
- </parent>
- <groupId>io.fd.honeycomb.vpp.integration</groupId>
- <artifactId>vpp-integration-features</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <name>${project.artifactId}</name>
- <modelVersion>4.0.0</modelVersion>
- <prerequisites>
- <maven>3.1.1</maven>
- </prerequisites>
- <dependencies>
- <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>io.fd.honeycomb.vpp</groupId>
- <artifactId>vpp-common-features</artifactId>
- <version>${project.version}</version>
- <classifier>features</classifier>
- <type>xml</type>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>io.fd.honeycomb.v3po</groupId>
- <artifactId>v3po-features</artifactId>
- <version>${project.version}</version>
- <classifier>features</classifier>
- <type>xml</type>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/vpp-integration/features/src/main/features/features.xml b/vpp-integration/features/src/main/features/features.xml
deleted file mode 100644
index 3dcc7c67a..000000000
--- a/vpp-integration/features/src/main/features/features.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
- 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.
--->
-<features name="honeycomb-integration-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
-
- <!-- infra -->
- <repository>mvn:io.fd.honeycomb/honeycomb-features/${project.version}/xml/features</repository>
- <!-- VPP HC plugin common code -->
- <repository>mvn:io.fd.honeycomb.vpp/vpp-common-features/${project.version}/xml/features</repository>
- <!-- V3PO plugin -->
- <repository>mvn:io.fd.honeycomb.v3po/v3po-features/${project.version}/xml/features</repository>
-
- <feature name='honeycomb-vpp-integration-api' version='${project.version}' description='OpenDaylight :: v3po :: api'>
- <feature version='${project.version}'>honeycomb-api</feature>
- <feature version='${project.version}'>honeycomb-v3po-api</feature>
- </feature>
-
- <feature name='honeycomb-vpp-integration' version='${project.version}' description='OpenDaylight :: v3po'>
- <feature version='${project.version}'>honeycomb-vpp-integration-api</feature>
- <feature version='${project.version}'>honeycomb</feature>
- <feature version='${project.version}'>honeycomb-vpp-common</feature>
- <feature version='${project.version}'>honeycomb-v3po</feature>
- </feature>
-
- <feature name='honeycomb-vpp-integration-rest' version='${project.version}' description='OpenDaylight :: v3po :: rest'>
- <feature version='${project.version}'>honeycomb-vpp-integration</feature>
- <feature version='${project.version}'>honeycomb-rest</feature>
- <feature version='${project.version}'>honeycomb-v3po</feature>
- </feature>
-
-</features>
diff --git a/vpp-integration/karaf/pom.xml b/vpp-integration/karaf/pom.xml
deleted file mode 100644
index 1232e7375..000000000
--- a/vpp-integration/karaf/pom.xml
+++ /dev/null
@@ -1,92 +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.vpp.integration</groupId>
- <artifactId>vpp-integration-karaf</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <name>${project.artifactId}</name>
- <prerequisites>
- <maven>3.1.1</maven>
- </prerequisites>
- <properties>
- <karaf.localFeature>honeycomb-vpp-integration-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>io.fd.honeycomb.vpp</groupId>
- <artifactId>vpp-common-features</artifactId>
- <version>${project.version}</version>
- <classifier>features</classifier>
- <type>xml</type>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>io.fd.honeycomb.v3po</groupId>
- <artifactId>v3po-features</artifactId>
- <version>${project.version}</version>
- <classifier>features</classifier>
- <type>xml</type>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>io.fd.honeycomb.vpp.integration</groupId>
- <artifactId>vpp-integration-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/vpp-integration/pom.xml b/vpp-integration/pom.xml
index e087abd86..741951b38 100644
--- a/vpp-integration/pom.xml
+++ b/vpp-integration/pom.xml
@@ -31,8 +31,6 @@
<maven>3.1.1</maven>
</prerequisites>
<modules>
- <!--<module>features</module>-->
- <!--<module>karaf</module>-->
<module>minimal-distribution</module>
</modules>
<!-- DO NOT install or deploy the repo root pom as it's only needed to initiate a build -->