From 77fa76b4b15ec6d74920349f9a066ec4597b2585 Mon Sep 17 00:00:00 2001
From: Maros Marsalek <mmarsale@cisco.com>
Date: Tue, 16 Aug 2016 11:04:00 +0200
Subject: HONEYCOMB-22: Remove karaf based distribution and wiring

Change-Id: I48aafb726de53b6ad3fb9b97c202f712dfa4a540
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
---
 common/features-parent/pom.xml                     | 81 ----------------------
 .../features-parent/src/main/features/features.xml | 16 -----
 common/karaf-parent/pom.xml                        | 81 ----------------------
 common/pom.xml                                     |  2 -
 4 files changed, 180 deletions(-)
 delete mode 100644 common/features-parent/pom.xml
 delete mode 100644 common/features-parent/src/main/features/features.xml
 delete mode 100644 common/karaf-parent/pom.xml

(limited to 'common')

diff --git a/common/features-parent/pom.xml b/common/features-parent/pom.xml
deleted file mode 100644
index b28661d8c..000000000
--- a/common/features-parent/pom.xml
+++ /dev/null
@@ -1,81 +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>org.opendaylight.odlparent</groupId>
-    <artifactId>features-parent</artifactId>
-    <version>1.6.2-Beryllium-SR2</version>
-    <relativePath/>
-  </parent>
-
-  <properties>
-    <nexusproxy>http://nexus.fd.io/content</nexusproxy>
-  </properties>
-
-  <groupId>io.fd.honeycomb.common</groupId>
-  <artifactId>features-parent</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
-  <modelVersion>4.0.0</modelVersion>
-  <packaging>pom</packaging>
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>${checkstyle.version}</version>
-        <executions>
-          <execution>
-            <id>check-license</id>
-            <goals>
-              <goal>check</goal>
-            </goals>
-            <phase>none</phase>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <version>2.10</version>
-        <executions>
-          <execution>
-            <id>unpack-license</id>
-            <phase>none</phase>
-            <goals><goal>unpack</goal></goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-  <distributionManagement>
-    <repository>
-      <id>fdio-release</id>
-      <url>${nexusproxy}/repositories/fd.io.release/</url>
-    </repository>
-    <snapshotRepository>
-      <id>fdio-snapshot</id>
-      <url>${nexusproxy}/repositories/fd.io.snapshot/</url>
-    </snapshotRepository>
-  </distributionManagement>
-</project>
diff --git a/common/features-parent/src/main/features/features.xml b/common/features-parent/src/main/features/features.xml
deleted file mode 100644
index 7d78e78a0..000000000
--- a/common/features-parent/src/main/features/features.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
- Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<!--
-     This is a dummy feature file. It is just a placeholder to keep the
-     artifact working.
-  -->
-<features name="fdio-dummy-feature" 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"/>
diff --git a/common/karaf-parent/pom.xml b/common/karaf-parent/pom.xml
deleted file mode 100644
index d8091f1ff..000000000
--- a/common/karaf-parent/pom.xml
+++ /dev/null
@@ -1,81 +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>org.opendaylight.controller</groupId>
-    <artifactId>karaf-parent</artifactId>
-    <version>1.6.2-Beryllium-SR2</version>
-    <relativePath/>
-  </parent>
-
-  <properties>
-    <nexusproxy>http://nexus.fd.io/content</nexusproxy>
-  </properties>
-
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>io.fd.honeycomb.common</groupId>
-  <artifactId>karaf-parent</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
-  <packaging>pom</packaging>
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>${checkstyle.version}</version>
-        <executions>
-          <execution>
-            <id>check-license</id>
-            <goals>
-              <goal>check</goal>
-            </goals>
-            <phase>none</phase>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <version>2.10</version>
-        <executions>
-          <execution>
-            <id>unpack-license</id>
-            <phase>none</phase>
-            <goals><goal>unpack</goal></goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-  <distributionManagement>
-    <repository>
-      <id>fdio-release</id>
-      <url>${nexusproxy}/repositories/fd.io.release/</url>
-    </repository>
-    <snapshotRepository>
-      <id>fdio-snapshot</id>
-      <url>${nexusproxy}/repositories/fd.io.snapshot/</url>
-    </snapshotRepository>
-  </distributionManagement>
-</project>
diff --git a/common/pom.xml b/common/pom.xml
index 12f87b9ce..3a53456f2 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -27,9 +27,7 @@
   <modules>
     <module>checkstyle</module>
     <module>api-parent</module>
-    <module>features-parent</module>
     <module>impl-parent</module>
-    <module>karaf-parent</module>
     <module>minimal-assembly-descriptor</module>
     <module>minimal-distribution-parent</module>
 
-- 
cgit 1.2.3-korg