From 175197da8ea43335df3daeba4c6296fcd83a057c Mon Sep 17 00:00:00 2001
From: Maros Marsalek <mmarsale@cisco.com>
Date: Thu, 10 Nov 2016 13:31:25 +0100
Subject: Post split cleanup

- change groupIds
- change packages
- update poms

Change-Id: I343c5a292a67de1dd50687870ca4ab5b7276e93e
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
---
 vpp-integration/minimal-distribution/pom.xml | 27 +++++------
 vpp-integration/pom.xml                      | 72 ++++++++++++++--------------
 2 files changed, 49 insertions(+), 50 deletions(-)

(limited to 'vpp-integration')

diff --git a/vpp-integration/minimal-distribution/pom.xml b/vpp-integration/minimal-distribution/pom.xml
index 83fee5689..56e821a1a 100644
--- a/vpp-integration/minimal-distribution/pom.xml
+++ b/vpp-integration/minimal-distribution/pom.xml
@@ -19,11 +19,10 @@
     <groupId>io.fd.honeycomb.common</groupId>
     <artifactId>minimal-distribution-parent</artifactId>
     <version>1.16.12-SNAPSHOT</version>
-    <relativePath>../../common/minimal-distribution-parent</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
-  <groupId>io.fd.honeycomb.vpp.integration</groupId>
+  <groupId>io.fd.hc2vpp.integration</groupId>
   <artifactId>vpp-integration-distribution</artifactId>
   <name>${project.artifactId}</name>
   <version>1.16.12-SNAPSHOT</version>
@@ -38,13 +37,13 @@
     <ioam.version>1.16.12-SNAPSHOT</ioam.version>
 
     <distribution.modules>
-      io.fd.honeycomb.vpp.common.integration.VppCommonModule,
-      io.fd.honeycomb.lisp.LispModule,
-      io.fd.honeycomb.translate.v3po.V3poModule,
-      io.fd.honeycomb.nat.NatModule,
-      // io.fd.honeycomb.vppnsh.impl.VppNshModule,
+      io.fd.hc2vpp.common.integration.VppCommonModule,
+      io.fd.hc2vpp.lisp.LispModule,
+      io.fd.hc2vpp.v3po.V3poModule,
+      io.fd.hc2vpp.nat.NatModule,
+      // io.fd.hc2vpp.vppnsh.impl.VppNshModule,
       <!-- Nsh module by default disabled, because it needs vpp-nsh plugin, which is not part of vpp codebase.-->
-      //io.fd.honeycomb.vppioam.impl.VppIoamModule
+      // io.fd.hc2vpp.vppioam.impl.VppIoamModule
       <!-- iOAM module by default disabled, because it needs ioam plugin (not part of vpp codebase.)-->
     </distribution.modules>
   </properties>
@@ -74,32 +73,32 @@
 
   <dependencies>
     <dependency>
-      <groupId>io.fd.honeycomb.vpp</groupId>
+      <groupId>io.fd.hc2vpp.common</groupId>
       <artifactId>vpp-common-integration</artifactId>
       <version>${vpp.common.integration.version}</version>
     </dependency>
     <dependency>
-      <groupId>io.fd.honeycomb.v3po</groupId>
+      <groupId>io.fd.hc2vpp.v3po</groupId>
       <artifactId>v3po2vpp</artifactId>
       <version>${v3po.version}</version>
     </dependency>
     <dependency>
-      <groupId>io.fd.honeycomb.lisp</groupId>
+      <groupId>io.fd.hc2vpp.lisp</groupId>
       <artifactId>lisp2vpp</artifactId>
       <version>${lisp.version}</version>
     </dependency>
     <dependency>
-      <groupId>io.fd.honeycomb.vppnsh</groupId>
+      <groupId>io.fd.hc2vpp.nsh</groupId>
       <artifactId>vppnsh-impl</artifactId>
       <version>${vppnsh.version}</version>
     </dependency>
     <dependency>
-      <groupId>io.fd.honeycomb.nat</groupId>
+      <groupId>io.fd.hc2vpp.nat</groupId>
       <artifactId>nat2vpp</artifactId>
       <version>${nat.version}</version>
     </dependency>
     <dependency>
-      <groupId>io.fd.honeycomb.vppioam</groupId>
+      <groupId>io.fd.hc2vpp.ioam</groupId>
       <artifactId>vppioam-impl</artifactId>
       <version>${ioam.version}</version>
     </dependency>
diff --git a/vpp-integration/pom.xml b/vpp-integration/pom.xml
index 3cd5c09f4..a36064e4f 100644
--- a/vpp-integration/pom.xml
+++ b/vpp-integration/pom.xml
@@ -13,44 +13,44 @@
  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">
+<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>honeycomb-parent</artifactId>
-    <version>1.16.12-SNAPSHOT</version>
-    <relativePath>../common/honeycomb-parent</relativePath>
-  </parent>
+    <parent>
+        <groupId>io.fd.honeycomb.common</groupId>
+        <artifactId>honeycomb-parent</artifactId>
+        <version>1.16.12-SNAPSHOT</version>
+    </parent>
 
-  <groupId>io.fd.honeycomb.vpp.integration</groupId>
-  <artifactId>vpp-integration</artifactId>
-  <name>${project.artifactId}</name>
-  <version>1.16.12-SNAPSHOT</version>
-  <packaging>pom</packaging>
-  <modelVersion>4.0.0</modelVersion>
-  <description>Aggregator for Honeycomb's VPP distribution. Aggregating all VPP plugins.</description>
+    <groupId>io.fd.hc2vpp.integration</groupId>
+    <artifactId>vpp-integration</artifactId>
+    <name>${project.artifactId}</name>
+    <version>1.16.12-SNAPSHOT</version>
+    <packaging>pom</packaging>
+    <modelVersion>4.0.0</modelVersion>
+    <description>Aggregator for Honeycomb's VPP distribution. Aggregating all VPP plugins.</description>
 
-  <modules>
-    <module>minimal-distribution</module>
-  </modules>
+    <modules>
+        <module>minimal-distribution</module>
+    </modules>
 
-  <!-- DO NOT install or deploy the repo root pom as it's only needed to initiate a build -->
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-install-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+    <!-- DO NOT install or deploy the repo root pom as it's only needed to initiate a build -->
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-install-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
-- 
cgit 1.2.3-korg